Author: shane.bryzak(a)jboss.com Date: 2009-10-08 00:13:04 -0400 (Thu, 08 Oct 2009) New Revision: 3883 Added: ri/trunk/tests/src/test/java/org/jboss/weld/ ri/trunk/tests/src/test/java/org/jboss/weld/test/ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/ Removed: ri/trunk/tests/src/test/java/org/jboss/webbeans/ Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java Log: refactored test packages Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,8 +1,8 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import javax.enterprise.inject.Alternative; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/SentenceParser.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import java.util.Arrays; import java.util.List; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/SentenceTranslator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; public class SentenceTranslator implements Translator { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Translator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.examples; +package org.jboss.weld.test.examples; import javax.ejb.Local; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,301 @@ +package org.jboss.weld.test.unit.activities; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.bean.ForwardingBean; +import org.jboss.weld.literal.DefaultLiteral; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + + +/** + * + * Spec version: 20090519 + * + */ +@Artifact +public class ActivitiesTest extends AbstractWebBeansTest +{ + + private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(); + + static + { + DEFAULT_BINDINGS.add(new DefaultLiteral()); + } + + private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType) + { + final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>(); + final Set<Type> types = new HashSet<Type>(); + final Set<Annotation> bindings = new HashSet<Annotation>(); + bindings.add(new AnnotationLiteral<Tame>() {}); + types.add(Object.class); + final Bean<?> bean = new Bean<Object>() + { + + public Set<Annotation> getQualifiers() + { + return bindings; + } + + public Set<InjectionPoint> getInjectionPoints() + { + return injectionPoints; + } + + public String getName() + { + return null; + } + + public Class<? extends Annotation> getScope() + { + return Dependent.class; + } + + public Set<Type> getTypes() + { + return types; + } + + public boolean isNullable() + { + return false; + } + + public Object create(CreationalContext<Object> creationalContext) + { + return null; + } + + public void destroy(Object instance, CreationalContext<Object> creationalContext) + { + + } + + public Class<?> getBeanClass() + { + return Object.class; + } + + public boolean isAlternative() + { + return false; + } + + public Set<Class<? extends Annotation>> getStereotypes() + { + return Collections.emptySet(); + } + + }; + InjectionPoint injectionPoint = new InjectionPoint() + { + + public Bean<?> getBean() + { + return bean; + } + + public Set<Annotation> getQualifiers() + { + return DEFAULT_BINDINGS; + } + + public Member getMember() + { + return null; + } + + public Type getType() + { + return injectionPointType; + } + + public Annotated getAnnotated() + { + return null; + } + + public boolean isDelegate() + { + return false; + } + + public boolean isTransient() + { + return false; + } + + }; + injectionPoints.add(injectionPoint); + return bean; + } + + private static class DummyContext implements Context + { + + public <T> T get(Contextual<T> contextual) + { + return null; + } + + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) + { + return null; + } + + public Class<? extends Annotation> getScope() + { + return Dummy.class; + } + + public boolean isActive() + { + return false; + } + + } + + @Test + public void testBeanBelongingToParentActivityBelongsToChildActivity() + { + assert getBeans(Cow.class).size() == 1; + Contextual<?> bean = getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); + assert childActivity.getBeans(Cow.class).size() == 1; + assert childActivity.getBeans(Cow.class).iterator().next().equals(bean); + } + + @Test + public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean() + { + assert getBeans(Cow.class).size() == 1; + Contextual<?> bean = getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); + Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); + childActivity.addBean(dummyBean); + assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null; + } + +// @Test +// public void testObserverBelongingToParentActivityBelongsToChildActivity() +// { +// assert getCurrentManager().resolveObservers(new NightTime()).size() == 1; +// Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next(); +// BeanManager childActivity = getCurrentManager().createActivity(); +// assert childActivity.resolveObservers(new NightTime()).size() == 1; +// assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer); +// } + + @Test + public void testObserverBelongingToParentFiresForChildActivity() + { + Fox.setObserved(false); + BeanManager childActivity = getCurrentManager().createActivity(); + childActivity.fireEvent(new NightTime()); + assert Fox.isObserved(); + } + + @Test + public void testContextObjectBelongingToParentBelongsToChild() + { + Context context = new DummyContext() + { + + @Override + public boolean isActive() + { + return true; + } + + }; + getCurrentManager().addContext(context); + BeanManager childActivity = getCurrentManager().createActivity(); + assert childActivity.getContext(Dummy.class) != null; + } + + @Test + public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean() + { + assert getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); + Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); + childActivity.addBean(dummyBean); + assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0; + } + + @Test(expectedExceptions=UnsatisfiedResolutionException.class) + public void testInstanceProcessedByParentActivity() + { + Context dummyContext = new DummyContext(); + getCurrentManager().addContext(dummyContext); + assert getBeans(Cow.class).size() == 1; + final Bean<Cow> bean = getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); + final Set<Annotation> bindingTypes = new HashSet<Annotation>(); + bindingTypes.add(new AnnotationLiteral<Tame>() {}); + childActivity.addBean(new ForwardingBean<Cow>() + { + + @Override + protected Bean<Cow> delegate() + { + return bean; + } + + @Override + public Set<Annotation> getQualifiers() + { + return bindingTypes; + } + + @Override + public Set<Class<? extends Annotation>> getStereotypes() + { + return Collections.emptySet(); + } + + }); + createContextualInstance(Field.class).get(); + } + + @Test + public void testObserverBelongingToChildDoesNotFireForParentActivity() + { + +// BeanManager childActivity = getCurrentManager().createActivity(); +// ObserverMethod<NightTime> observer = new Observer<NightTime>() +// { +// +// public boolean notify(NightTime event) +// { +// assert false; +// return false; +// } +// +// }; +// //TODO Fix this test to use an observer method in a child activity +//// childActivity.addObserver(observer); +// getCurrentManager().fireEvent(new NightTime()); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.activities; + +class Cow +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.weld.test.unit.activities; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@Scope +@Inherited +@interface Dummy {} \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,16 @@ +package org.jboss.weld.test.unit.activities; + +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + +class Field +{ + + @Inject @Tame Instance<Cow> instance; + + public Cow get() + { + return instance.get(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,25 @@ +package org.jboss.weld.test.unit.activities; + +import javax.enterprise.event.Observes; + +class Fox +{ + + private static boolean observed = false; + + public void observe(@Observes NightTime nighttime) + { + observed = true; + } + + public static boolean isObserved() + { + return observed; + } + + public static void setObserved(boolean observed) + { + Fox.observed = observed; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.activities; + +class NightTime +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,22 @@ +package org.jboss.weld.test.unit.activities; + +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.Qualifier; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +@interface Tame +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/BeanWithInjection.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.child; +package org.jboss.weld.test.unit.activities.child; class BeanWithInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/MyBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.child; +package org.jboss.weld.test.unit.activities.child; @SpecialBindingType class MyBean Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.child; +package org.jboss.weld.test.unit.activities.child; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -15,9 +15,9 @@ import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.literal.DefaultLiteral; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.literal.DefaultLiteral; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.child; +package org.jboss.weld.test.unit.activities.child; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Cow.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; class Cow { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ /** * */ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -16,8 +16,8 @@ import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; @@ -7,7 +7,7 @@ import javax.enterprise.context.spi.CreationalContext; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import javax.enterprise.inject.Instance; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; @@ -8,8 +8,8 @@ import javax.enterprise.context.spi.CreationalContext; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; @@ -7,8 +7,8 @@ import javax.enterprise.context.spi.CreationalContext; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -16,8 +16,8 @@ import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; @@ -8,8 +8,8 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NightTime.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; class NightTime { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ /** * */ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import java.lang.annotation.Annotation; @@ -7,8 +7,8 @@ import javax.enterprise.context.spi.CreationalContext; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.manager.api.WebBeansManager; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.activities.current; +package org.jboss.weld.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Bean.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,43 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2006, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.weld.test.unit.annotated; + + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +public class Bean +{ + int field; + + public Bean(int i) + { + + } + + public void method(int i) + { + + } +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.annotated; + + +public class Child extends Parent + { + } \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,82 @@ +/* + * 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.weld.test.unit.annotated; + +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * @author kkahn + * + */ +@Artifact +public class DeclaringTypeTest extends AbstractWebBeansTest +{ + + @Test + public void testInheritance() + { + AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class); + assert type.getConstructors().size() == 1; + assert type.getFields().size() == 1; + for (AnnotatedField<? super Child> field : type.getFields()) + { + if (field.getJavaMember().getName().equals("parent")) + { + Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK + // - + // Returns + // Parent + Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL + // - + // Returns + // Child + } + else + { + Assert.fail("Unknown field " + field.getJavaMember()); + } + } + + assert type.getMethods().size() == 1; + for (AnnotatedMethod<? super Child> method : type.getMethods()) + { + if (method.getJavaMember().getName().equals("parentMethod")) + { + Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK + // - + // /Returns + // Parent + Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL + // - + // Returns + // Child + } + else + { + Assert.fail("Unknown method " + method.getJavaMember()); + } + } + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/ExampleTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,63 @@ +package org.jboss.weld.test.unit.annotated; + +import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.AnnotatedConstructor; +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedParameter; +import javax.enterprise.inject.spi.AnnotatedType; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +@Artifact +public class ExampleTest extends AbstractWebBeansTest +{ + @Test + public void testAnnotatedCallableGetParameters() throws Exception + { + AnnotatedType<Bean> type = getCurrentManager().createAnnotatedType(Bean.class); + + assertNoAnnotations(type); + + Assert.assertEquals(1, type.getConstructors().size()); + for (AnnotatedConstructor<Bean> ctor : type.getConstructors()) + { + assertNoAnnotations(ctor); + + for (AnnotatedParameter<Bean> param : ctor.getParameters()) + { + assertNoAnnotations(param); + } + } + + Assert.assertEquals(1, type.getMethods().size()); + for (AnnotatedMethod<? super Bean> method : type.getMethods()) + { + assertNoAnnotations(method); + + for (AnnotatedParameter<? super Bean> param : method.getParameters()) + { + assertNoAnnotations(param); + } + } + + Assert.assertEquals(1, type.getFields().size()); + for (AnnotatedField<? super Bean> field : type.getFields()) + { + assertNoAnnotations(field); + } + } + + private void assertNoAnnotations(Annotated annotated) + { + Assert.assertEquals(0, annotated.getAnnotations().size()); + } +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,11 @@ +package org.jboss.weld.test.unit.annotated; +public class Parent +{ + int parent; + + void parentMethod() + { + + } +} + Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -13,7 +13,7 @@ import javax.inject.Inject; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -29,7 +29,7 @@ import javax.enterprise.inject.spi.Annotated; import javax.inject.Inject; -import org.jboss.webbeans.literal.InjectLiteral; +import org.jboss.weld.literal.InjectLiteral; /** * Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.lang.annotation.Annotation; import java.util.ArrayList; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedConstructor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.lang.reflect.Constructor; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedField.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.lang.annotation.Annotation; import java.lang.reflect.Field; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedMember.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedMember; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedMethod.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.lang.reflect.Method; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedParameter.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedCallable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedType.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; import java.util.HashSet; import java.util.Set; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/NotAnnotated.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.annotated.decoration; +package org.jboss.weld.test.unit.annotated.decoration; /** Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Bar.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,26 @@ +/* + * 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.weld.test.unit.bootstrap; + +/** + * @author pmuir + * + */ +public class Bar +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/CheckableInjectionServices.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,84 @@ +/* + * 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.weld.test.unit.bootstrap; + +import org.jboss.weld.injection.spi.InjectionContext; +import org.jboss.weld.injection.spi.InjectionServices; + +/** + * @author pmuir + * + */ +public class CheckableInjectionServices implements InjectionServices +{ + + private boolean before = false; + private boolean after = false; + private boolean injectedAfter = false; + private boolean injectionTargetCorrect = false; + + public <T> void aroundInject(InjectionContext<T> injectionContext) + { + before = true; + if (injectionContext.getTarget() instanceof Foo) + { + ((Foo) injectionContext.getTarget()).message = "hi!"; + if (injectionContext.getInjectionTarget().getInjectionPoints().size() == 1) + { + injectionTargetCorrect = injectionContext.getInjectionTarget().getInjectionPoints().iterator().next().getType().equals(Bar.class); + } + } + injectionContext.proceed(); + after = true; + if (injectionContext.getTarget() instanceof Foo) + { + Foo foo = (Foo) injectionContext.getTarget(); + injectedAfter = foo.getBar() instanceof Bar && foo.getMessage().equals("hi!"); + } + } + + public void reset() + { + before = false; + after = false; + injectedAfter = false; + injectionTargetCorrect = false; + } + + public boolean isBefore() + { + return before; + } + + public boolean isAfter() + { + return after; + } + + public boolean isInjectedAfter() + { + return injectedAfter; + } + + public boolean isInjectionTargetCorrect() + { + return injectionTargetCorrect; + } + + public void cleanup() {} + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/DiscoverFailsBootstrapTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,19 @@ +package org.jboss.weld.test.unit.bootstrap; + +import org.jboss.weld.bootstrap.WebBeansBootstrap; +import org.jboss.weld.bootstrap.api.Bootstrap; +import org.jboss.weld.bootstrap.api.Environments; +import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore; +import org.testng.annotations.Test; + +public class DiscoverFailsBootstrapTest +{ + + @Test(groups="bootstrap", expectedExceptions=IllegalArgumentException.class) + public void testDiscoverFails() + { + Bootstrap bootstrap = new WebBeansBootstrap(); + bootstrap.startContainer(Environments.SE, null, new ConcurrentHashMapBeanStore()); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -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.weld.test.unit.bootstrap; + +import javax.inject.Inject; + +/** + * @author pmuir + * + */ +public class Foo +{ + + @Inject + private Bar bar; + + public String message; + + /** + * @return the bar + */ + public Bar getBar() + { + return bar; + } + + /** + * @return the message + */ + public String getMessage() + { + return message; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InjectionServicesTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,43 @@ +package org.jboss.weld.test.unit.bootstrap; + +import java.util.Arrays; + +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; + +import org.jboss.weld.injection.spi.InjectionServices; +import org.jboss.weld.mock.MockEELifecycle; +import org.jboss.weld.mock.TestContainer; +import org.testng.annotations.Test; + +public class InjectionServicesTest +{ + + @Test + public void testInjectionOfTarget() + { + TestContainer container = new TestContainer(new MockEELifecycle(), Arrays.asList(Foo.class, Bar.class), null); + CheckableInjectionServices ijs = new CheckableInjectionServices(); + container.getDeployment().getArchive().getServices().add(InjectionServices.class, ijs); + container.startContainer(); + container.ensureRequestActive(); + + BeanManager manager = container.getBeanManager(); + + Bean<? extends Object> bean = manager.resolve(manager.getBeans(Foo.class)); + ijs.reset(); + Foo foo = (Foo) manager.getReference(bean, Foo.class, manager.createCreationalContext(bean)); + + assert ijs.isBefore(); + assert ijs.isAfter(); + assert ijs.isInjectedAfter(); + assert ijs.isInjectionTargetCorrect(); + + assert foo.getBar() != null; + assert foo.getMessage().equals("hi!"); + + + container.stopContainer(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/WBStartupTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,53 @@ +/* + * 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.weld.test.unit.bootstrap; + +import java.util.Arrays; + +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; + +import org.jboss.weld.mock.MockEELifecycle; +import org.jboss.weld.mock.TestContainer; +import org.testng.annotations.Test; + +/** + * @author pmuir + * + */ +public class WBStartupTest +{ + + @Test + public void test() + { + TestContainer container = new TestContainer(new MockEELifecycle(), Arrays.asList(Foo.class, Bar.class), null); + container.startContainer(); + container.ensureRequestActive(); + + BeanManager manager = container.getBeanManager(); + + Bean<? extends Object> bean = manager.resolve(manager.getBeans(Foo.class)); + Foo foo = (Foo) manager.getReference(bean, Foo.class, manager.createCreationalContext(bean)); + + assert foo != null; + assert foo.getBar() != null; + + container.stopContainer(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import java.util.HashMap; import java.util.List; @@ -9,9 +9,9 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.bean.SessionBean; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.bean.SessionBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/PantherLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; public interface PantherLocal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/TigerLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; +package org.jboss.weld.test.unit.bootstrap.multipleEnterprise; import javax.ejb.Local; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import java.util.HashMap; import java.util.List; @@ -9,10 +9,10 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.bean.SessionBean; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.bean.SessionBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; public interface PantherLocal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; interface ScottishFish extends Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; +package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import java.util.HashMap; import java.util.List; @@ -7,9 +7,9 @@ import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; interface ScottishFish extends Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; +package org.jboss.weld.test.unit.bootstrap.multipleSimple; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; +package org.jboss.weld.test.unit.bootstrap.singleEnterprise; import java.util.HashMap; import java.util.List; @@ -9,8 +9,8 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; +package org.jboss.weld.test.unit.bootstrap.singleEnterprise; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; +package org.jboss.weld.test.unit.bootstrap.singleEnterprise; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; +package org.jboss.weld.test.unit.bootstrap.singleEnterprise; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; import java.util.HashMap; import java.util.List; @@ -9,10 +9,10 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.bean.ProducerMethod; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.ProducerMethod; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; interface DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; interface DeadlySpider extends DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; class DefangedTarantula extends Tarantula { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Spider.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; class Spider implements Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tarantula.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; +package org.jboss.weld.test.unit.bootstrap.singleProducerMethod; import javax.enterprise.inject.Produces; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleSimple; +package org.jboss.weld.test.unit.bootstrap.singleSimple; import java.util.HashMap; import java.util.List; @@ -7,8 +7,8 @@ import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.bootstrap.singleSimple; +package org.jboss.weld.test.unit.bootstrap.singleSimple; import javax.enterprise.context.RequestScoped; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Fodder.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Horse.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/NaiveClusterTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,13 +1,13 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.util.Arrays; import java.util.Collection; import javax.enterprise.inject.spi.Bean; -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.mock.TestContainer; -import org.jboss.webbeans.mock.cluster.AbstractClusterTest; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.mock.TestContainer; +import org.jboss.weld.mock.cluster.AbstractClusterTest; import org.testng.annotations.Test; public class NaiveClusterTest extends AbstractClusterTest Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Stable.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/SwitchableContainerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,14 +1,14 @@ -package org.jboss.webbeans.test.unit.cluster; +package org.jboss.weld.test.unit.cluster; import java.util.Arrays; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import org.jboss.webbeans.bootstrap.api.SingletonProvider; -import org.jboss.webbeans.mock.MockEELifecycle; -import org.jboss.webbeans.mock.TestContainer; -import org.jboss.webbeans.mock.cluster.SwitchableSingletonProvider; +import org.jboss.weld.bootstrap.api.SingletonProvider; +import org.jboss.weld.mock.MockEELifecycle; +import org.jboss.weld.mock.TestContainer; +import org.jboss.weld.mock.cluster.SwitchableSingletonProvider; import org.testng.annotations.Test; public class SwitchableContainerTest Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,9 +1,9 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import java.util.concurrent.CountDownLatch; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import java.util.concurrent.atomic.AtomicInteger; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,8 +1,8 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import java.util.Arrays; import java.util.List; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,9 +1,9 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import java.util.List; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ConversationScoped; @@ -6,11 +6,11 @@ import javax.enterprise.context.SessionScoped; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; +import org.jboss.weld.metadata.cache.MetaAnnotationStore; import org.testng.annotations.Test; @Artifact -public class PassivatingContextTest extends org.jboss.webbeans.test.AbstractWebBeansTest +public class PassivatingContextTest extends org.jboss.weld.test.AbstractWebBeansTest { /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.context; +package org.jboss.weld.test.unit.context; import java.util.List; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.decorator.simple; +package org.jboss.weld.test.unit.decorator.simple; /** * Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.decorator.simple; +package org.jboss.weld.test.unit.decorator.simple; /** * Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.decorator.simple; +package org.jboss.weld.test.unit.decorator.simple; import javax.decorator.Decorates; import javax.decorator.Decorator; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.decorator.simple; +package org.jboss.weld.test.unit.decorator.simple; import javax.decorator.Decorates; import javax.decorator.Decorator; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,8 +1,8 @@ -package org.jboss.webbeans.test.unit.decorator.simple; +package org.jboss.weld.test.unit.decorator.simple; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import javax.enterprise.inject.Produces; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import static org.testng.Assert.assertEquals; @@ -6,8 +6,8 @@ import javax.el.ExpressionFactory; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.mock.el.EL; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.mock.el.EL; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; class Order Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,12 +1,12 @@ -package org.jboss.webbeans.test.unit.definition; +package org.jboss.weld.test.unit.definition; import javax.enterprise.context.RequestScoped; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.metadata.TypeStore; -import org.jboss.webbeans.metadata.cache.StereotypeModel; -import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.metadata.TypeStore; +import org.jboss.weld.metadata.cache.StereotypeModel; +import org.jboss.weld.resources.ClassTransformer; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,22 +1,22 @@ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; import java.util.Set; import javax.enterprise.inject.spi.Bean; -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.ContextualStore; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; -import org.jboss.webbeans.bootstrap.api.ServiceRegistry; -import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry; -import org.jboss.webbeans.ejb.EjbDescriptors; -import org.jboss.webbeans.introspector.WBClass; -import org.jboss.webbeans.introspector.jlr.WBClassImpl; -import org.jboss.webbeans.metadata.TypeStore; -import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; -import org.jboss.webbeans.resources.ClassTransformer; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.ContextualStore; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.bootstrap.BeanDeployerEnvironment; +import org.jboss.weld.bootstrap.api.ServiceRegistry; +import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry; +import org.jboss.weld.ejb.EjbDescriptors; +import org.jboss.weld.introspector.WBClass; +import org.jboss.weld.introspector.jlr.WBClassImpl; +import org.jboss.weld.metadata.TypeStore; +import org.jboss.weld.metadata.cache.MetaAnnotationStore; +import org.jboss.weld.resources.ClassTransformer; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Cat.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Chicken.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Cow.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Horse.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Pig.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.deployment.structure; +package org.jboss.weld.test.unit.deployment.structure; /** * @author pmuir Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; interface DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; interface DeadlySpider extends DeadlyAnimal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; class DefangedTarantula extends Tarantula { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; interface ScottishFish extends Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import java.util.Arrays; import java.util.HashMap; @@ -8,11 +8,11 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.mock.MockServletLifecycle; -import org.jboss.webbeans.mock.TestContainer; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.RIBean; +import org.jboss.weld.mock.MockServletLifecycle; +import org.jboss.weld.mock.TestContainer; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.ejb.EJB; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; class Spider implements Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; class Tarantula extends Spider implements DeadlySpider { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import javax.enterprise.context.RequestScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.environments.servlet; +package org.jboss.weld.test.unit.environments.servlet; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,72 @@ +package org.jboss.weld.test.unit.implementation; + +import java.util.Set; + +import javax.enterprise.inject.New; +import javax.enterprise.inject.spi.Bean; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.weld.bean.NewSessionBean; +import org.jboss.weld.bean.SessionBean; +import org.jboss.weld.introspector.WBAnnotated; +import org.jboss.weld.literal.NewLiteral; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +public class NewEnterpriseBeanTest extends AbstractWebBeansTest +{ + + private static final New NEW_LITERAL = new NewLiteral() + { + + public java.lang.Class<?> value() + { + return WrappedEnterpriseBean.class; + } + + }; + + private SessionBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean; + private NewSessionBean<WrappedEnterpriseBeanLocal> newEnterpriseBean; + + public void initNewBean() + { + Set<Bean<?>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class); + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof SessionBean; + wrappedEnterpriseBean = (SessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next(); + + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewSessionBean; + newEnterpriseBean = (NewSessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next(); + + } + + @Test(groups = { "new", "broken" }) + public void testNewBeanHasImplementationClassOfInjectionPointType() + { + initNewBean(); + assert newEnterpriseBean.getType().equals(WrappedEnterpriseBean.class); + } + + @Test(groups = { "new" }) + public void testNewBeanHasSameInitializerMethodsAsWrappedBean() + { + initNewBean(); + assert newEnterpriseBean.getInitializerMethods().equals(wrappedEnterpriseBean.getInitializerMethods()); + } + + @Test(groups = { "new" }) + public void testNewBeanHasSameInjectedFieldsAsWrappedBean() + { + initNewBean(); + Set<? extends WBAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints(); + Set<? extends WBAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints(); + assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,14 @@ +package org.jboss.weld.test.unit.implementation; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; + +@SessionScoped +@Stateful +class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal +{ + @Remove + public void bye() { + } +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBeanLocal.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,9 @@ +package org.jboss.weld.test.unit.implementation; + +import javax.ejb.Local; + +@Local +public interface WrappedEnterpriseBeanLocal +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Animal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; +package org.jboss.weld.test.unit.implementation.annotatedItem; interface Animal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Antelope.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; +package org.jboss.weld.test.unit.implementation.annotatedItem; class Antelope implements Animal Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; +package org.jboss.weld.test.unit.implementation.annotatedItem; import java.lang.annotation.Annotation; import java.util.Iterator; @@ -8,11 +8,11 @@ import javax.inject.Qualifier; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.introspector.WBClass; -import org.jboss.webbeans.introspector.jlr.WBClassImpl; -import org.jboss.webbeans.metadata.TypeStore; -import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.introspector.WBClass; +import org.jboss.weld.introspector.jlr.WBClassImpl; +import org.jboss.weld.metadata.TypeStore; +import org.jboss.weld.resources.ClassTransformer; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; +package org.jboss.weld.test.unit.implementation.annotatedItem; @Random Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; +package org.jboss.weld.test.unit.implementation.annotatedItem; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/BowlerHatException.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,26 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +public class BowlerHatException extends RuntimeException +{ + + public BowlerHatException() + { + super(); + } + + public BowlerHatException(String message, Throwable cause) + { + super(message, cause); + } + + public BowlerHatException(String message) + { + super(message); + } + + public BowlerHatException(Throwable cause) + { + super(cause); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,40 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +public class EnterpriseBeanTest extends AbstractWebBeansTest +{ + + @Test(description="WBRI-179") + public void testSFSBWithOnlyRemoteInterfacesDeploys() + { + + } + + @Test(description="WBRI-275") + public void testSLSBBusinessMethodThrowsRuntimeException() + { + try + { + getCurrentManager().getInstanceByType(Fedora.class).causeRuntimeException(); + } + catch (Throwable t) + { + if (isExceptionInHierarchy(t, BowlerHatException.class)) + { + return; + } + } + assert false : "Expected a BowlerHatException to be in the cause stack"; + } + + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Fedora.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,12 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +import javax.ejb.Local; + +@Local +public interface Fedora +{ + + public void causeRuntimeException(); + + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/FedoraImpl.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,14 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +import javax.ejb.Stateless; + +@Stateless +public class FedoraImpl implements Fedora +{ + + public void causeRuntimeException() + { + throw new BowlerHatException(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,9 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class Hat implements HatRemote +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,9 @@ +package org.jboss.weld.test.unit.implementation.enterprise; + +import javax.ejb.Remote; + +@Remote +public interface HatRemote +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/BeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Stateless; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/BeanLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; public interface BeanLocal { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import java.util.Arrays; import java.util.HashSet; @@ -14,7 +14,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; public class Giessen implements NeueStadt, GeschichtslosStadt { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; public class GutenbergMuseum { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; class IntermediateOrderProcessor extends OrderProcessor { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PreDestroy; import javax.ejb.Remove; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.ejb.Stateless; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.enterprise.context.spi.CreationalContext; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; class RoemerPassage { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; +package org.jboss.weld.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Foo.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.implementation.event; + +public class Foo +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/NormalScopedBean.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,16 @@ + +package org.jboss.weld.test.unit.implementation.event; + +import java.io.Serializable; + +import javax.enterprise.context.SessionScoped; +import javax.enterprise.event.Event; +import javax.enterprise.inject.Any; + +@SessionScoped +public class NormalScopedBean implements Serializable +{ + + @Any Event<Foo> event; + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,141 @@ +package org.jboss.weld.test.unit.implementation.event; + +import javax.enterprise.event.Event; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Any; +import javax.inject.Inject; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class SimpleEventTest extends AbstractWebBeansTest +{ + private static boolean RECEIVE_1_OBSERVED; + private static boolean RECEIVE_2_OBSERVED; + private static boolean RECEIVE_3_OBSERVED; + + private static void initFlags() { + RECEIVE_1_OBSERVED = false; + RECEIVE_2_OBSERVED = false; + RECEIVE_3_OBSERVED = false; + } + + @Test + public void testFireEventOnManager() + { + BeanManagerImpl manager = getCurrentManager(); + + initFlags(); + + manager.fireEvent("Fired using Manager Interface with AnnotationLiteral.", new AnnotationLiteral<Updated>(){}); + + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_1_OBSERVED == true; + assert RECEIVE_3_OBSERVED == false; + + initFlags(); + + manager.fireEvent("Fired using Manager Interface."); + + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_1_OBSERVED == false; // not called + assert RECEIVE_3_OBSERVED == true; + } + + @Test + public void testFireEventOnEvent() + { + BeanManagerImpl manager = getCurrentManager(); + + App app = createContextualInstance(App.class); + + initFlags(); + + app.fireEventByBindingDeclaredAtInjectionPoint(); + + assert RECEIVE_1_OBSERVED == true; + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_3_OBSERVED == false; + + initFlags(); + + app.fireEventByAnnotationLiteral(); + + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_1_OBSERVED == true; + assert RECEIVE_3_OBSERVED == false; + + initFlags(); + + app.fireEventViaAny(); + + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_1_OBSERVED == false; // not called + assert RECEIVE_3_OBSERVED == false; + + initFlags(); + + app.fireEventViaCurrent(); + + assert RECEIVE_2_OBSERVED == true; + assert RECEIVE_1_OBSERVED == false; // not called + assert RECEIVE_3_OBSERVED == true; + } + + public static class App + { + @Inject @Any + Event<String> event1; + + @Inject @Updated + Event<String> event2; + + @Inject @Any + Event<String> event3; + + @Inject + Event<String> event4; + + public void fireEventByAnnotationLiteral() + { + event1.select(new AnnotationLiteral<Updated>(){}).fire("Fired using Event Interface with AnnotationLiteral."); + } + + public void fireEventByBindingDeclaredAtInjectionPoint() + { + event2.fire("Fired using Event Interface with Binding Declared."); + } + + public void fireEventViaAny() + { + event3.fire("Fired using Event Interface with Non-BindingType."); + } + + public void fireEventViaCurrent() + { + event4.fire("Fired using Event Interface with @Current"); + } + } + + public static class Receiver + { + public void receive1(@Observes @Updated String s) + { + RECEIVE_1_OBSERVED = true; + } + + public void receive2(@Any @Observes String s) + { + RECEIVE_2_OBSERVED = true; + } + + public void receive3(@Observes String s) + { + RECEIVE_3_OBSERVED = true; + } + } +} \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,22 @@ +package org.jboss.weld.test.unit.implementation.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.Qualifier; + +@Qualifier +@Retention(RUNTIME) +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@interface Updated +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,9 +1,9 @@ -package org.jboss.webbeans.test.unit.implementation.event.tx; +package org.jboss.weld.test.unit.implementation.event.tx; import java.util.HashSet; import java.util.Set; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.event.tx; +package org.jboss.weld.test.unit.implementation.event.tx; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/TxEventTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.event.tx; +package org.jboss.weld.test.unit.implementation.event.tx; import org.jboss.testharness.impl.packaging.Artifact; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/Updated.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.event.tx; +package org.jboss.weld.test.unit.implementation.event.tx; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,10 +1,10 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.CreationException; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/FooException.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; public class FooException extends Exception { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Lorry_Broken.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; class Lorry_Broken { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Ship.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; class Ship { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.exceptions; +package org.jboss.weld.test.unit.implementation.exceptions; import javax.enterprise.inject.Produces; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.named; +package org.jboss.weld.test.unit.implementation.named; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.named; +package org.jboss.weld.test.unit.implementation.named; import javax.enterprise.context.RequestScoped; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBindingTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,9 +1,9 @@ -package org.jboss.webbeans.test.unit.implementation.named; +package org.jboss.weld.test.unit.implementation.named; import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,15 +1,15 @@ -package org.jboss.webbeans.test.unit.implementation.newsimple; +package org.jboss.weld.test.unit.implementation.newsimple; import java.util.Set; import javax.enterprise.inject.New; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.bean.NewManagedBean; -import org.jboss.webbeans.bean.ManagedBean; -import org.jboss.webbeans.introspector.WBAnnotated; -import org.jboss.webbeans.literal.NewLiteral; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.ManagedBean; +import org.jboss.weld.bean.NewManagedBean; +import org.jboss.weld.introspector.WBAnnotated; +import org.jboss.weld.literal.NewLiteral; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.newsimple; +package org.jboss.weld.test.unit.implementation.newsimple; import java.io.Serializable; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.Collection; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.List; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.List; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.Collection; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.List; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.ArrayList; import java.util.Arrays; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,10 +1,10 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.Collection; import java.util.List; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field; +package org.jboss.weld.test.unit.implementation.producer.field; import java.util.Collection; import java.util.List; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Car.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/CarFactory.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,10 +1,10 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; /** * @author pmuir Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooDisposer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.Any; import javax.enterprise.inject.Disposes; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Government.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.BeanManager; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.Produces; import javax.inject.Named; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,9 +1,9 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import java.util.Date; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import static org.testng.Assert.assertNotNull; @@ -7,7 +7,7 @@ import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NullProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ -package org.jboss.webbeans.test.unit.implementation.producer.method; +package org.jboss.weld.test.unit.implementation.producer.method; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,18 @@ +package org.jboss.weld.test.unit.implementation.proxy; + +import java.io.Serializable; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; + +@Named +@RequestScoped +class Foo implements Serializable +{ + + public String getMsg() + { + return "Hi"; + } + +} \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,20 @@ +package org.jboss.weld.test.unit.implementation.proxy; + +import javax.enterprise.inject.spi.Bean; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class ProxyTest extends AbstractWebBeansTest +{ + + @Test(description="WBRI-122") + public void testImplementationClassImplementsSerializable() + { + Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo")); + getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean)); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,11 +1,11 @@ -package org.jboss.webbeans.test.unit.implementation.proxy.enterprise; +package org.jboss.weld.test.unit.implementation.proxy.enterprise; import javassist.util.proxy.ProxyObject; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/Mouse.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.proxy.enterprise; +package org.jboss.weld.test.unit.implementation.proxy.enterprise; import javax.ejb.Stateless; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/MouseLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.implementation.proxy.enterprise; +package org.jboss.weld.test.unit.implementation.proxy.enterprise; import javax.ejb.Local; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Ball.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/BallImpl.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import javax.ejb.Stateless; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Defender.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import javax.interceptor.Interceptor; import javax.interceptor.AroundInvoke; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import java.util.ArrayList; import java.util.List; @@ -11,8 +11,8 @@ import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.webbeans.bean.SessionBean; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.SessionBean; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Goalkeeper.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import javax.interceptor.Interceptor; import javax.interceptor.AroundInvoke; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Pass.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import java.lang.annotation.Retention; import java.lang.annotation.Target; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Shot.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb; +package org.jboss.weld.test.unit.interceptor.ejb; import java.lang.annotation.Retention; import java.lang.annotation.Target; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Ball.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb3model; +package org.jboss.weld.test.unit.interceptor.ejb3model; import javax.interceptor.Interceptors; import javax.interceptor.ExcludeClassInterceptors; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Defender.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb3model; +package org.jboss.weld.test.unit.interceptor.ejb3model; import javax.interceptor.Interceptor; import javax.interceptor.AroundInvoke; import javax.interceptor.InvocationContext; -import org.jboss.webbeans.test.unit.interceptor.ejb.Pass; +import org.jboss.weld.test.unit.interceptor.ejb.Pass; /** * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a> Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb3model; +package org.jboss.weld.test.unit.interceptor.ejb3model; import javax.enterprise.inject.spi.Bean; import javax.enterprise.context.spi.CreationalContext; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; import org.testng.annotations.BeforeTest; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Goalkeeper.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.ejb3model; +package org.jboss.weld.test.unit.interceptor.ejb3model; import javax.interceptor.AroundInvoke; import javax.interceptor.InvocationContext; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/PrimaryInterceptionBinding.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.interceptor.InterceptorBinding; import java.lang.annotation.*; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SecondaryInterceptionBinding.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.interceptor.InterceptorBinding; import java.lang.annotation.Documented; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; /** * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a> Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.annotation.PostConstruct; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBeanWithStereotype.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.annotation.PostConstruct; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; -import org.jboss.webbeans.test.unit.interceptor.simple.SimpleBean; +import org.jboss.weld.test.unit.interceptor.simple.SimpleBean; import javax.decorator.Decorates; import javax.decorator.Decorator; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.interceptor.Interceptor; import javax.interceptor.AroundInvoke; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.enterprise.inject.stereotype.Stereotype; import static java.lang.annotation.ElementType.TYPE; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptorTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.jboss.webbeans.metadata.cache.InterceptorBindingModel; -import org.jboss.webbeans.metadata.TypeStore; -import org.jboss.webbeans.resources.ClassTransformer; +import org.jboss.weld.metadata.TypeStore; +import org.jboss.weld.metadata.cache.InterceptorBindingModel; +import org.jboss.weld.resources.ClassTransformer; +import org.jboss.weld.test.AbstractWebBeansTest; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/TwoBindingsInterceptor.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.webbeans.test.unit.interceptor.simple; +package org.jboss.weld.test.unit.interceptor.simple; import javax.interceptor.AroundInvoke; import javax.interceptor.InvocationContext; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Bar.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.lookup; + +public class Bar +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Baz.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,6 @@ +package org.jboss.weld.test.unit.lookup; + +public class Baz +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Foo.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,11 @@ +package org.jboss.weld.test.unit.lookup; + +public class Foo extends FooBase<Bar> +{ + + public String getName() + { + return "foo"; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/FooBase.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,11 @@ +package org.jboss.weld.test.unit.lookup; + +public class FooBase<T> +{ + + public String getName() + { + return "foobase"; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/FooProducer.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,14 @@ +package org.jboss.weld.test.unit.lookup; + +import javax.enterprise.inject.Produces; + +public class FooProducer +{ + + @Produces @Special + public FooBase<Baz> produce() + { + return new FooBase<Baz>(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,22 @@ +package org.jboss.weld.test.unit.lookup; + +import javax.inject.Inject; + +public class LookupFoo +{ + + @Inject Foo foo; + + @Inject @Special FooBase<Baz> foobaz; + + public Foo getFoo() + { + return foo; + } + + public FooBase<Baz> getFoobaz() + { + return foobaz; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,24 @@ +package org.jboss.weld.test.unit.lookup; + +import java.util.List; + +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.TypeLiteral; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.literal.DefaultLiteral; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class LookupInstanceTest extends AbstractWebBeansTest +{ + + + @Test + public void testLookupInstance() throws Exception + { + assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,20 @@ +package org.jboss.weld.test.unit.lookup; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +@Qualifier +(a)Retention(RetentionPolicy.RUNTIME) +@Target({FIELD, METHOD, TYPE, PARAMETER}) +public @interface Special +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Wbri256Test.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -0,0 +1,19 @@ +package org.jboss.weld.test.unit.lookup; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.weld.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class Wbri256Test extends AbstractWebBeansTest +{ + + @Test + public void testParameterizedInjection() + { + LookupFoo lookupFoo = getCurrentManager().getInstanceByType(LookupFoo.class); + assert lookupFoo.getFoo().getName().equals("foo"); + assert lookupFoo.getFoobaz().getName().equals("foobase"); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,7 +1,7 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.annotation.PostConstruct; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Violation.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import java.io.Serializable; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.circular; +package org.jboss.weld.test.unit.lookup.circular; import javax.inject.Inject; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279 (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; public abstract class AbstractFactory<T> { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; public class DummyParent { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; @IntFactory public class IntegerFactory extends AbstractFactory<Integer> Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.lookup.wbri279; +package org.jboss.weld.test.unit.lookup.wbri279; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293 (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293/ContextualReferenceTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.lookup.wbri293; +package org.jboss.weld.test.unit.lookup.wbri293; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293/Sheep.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.lookup.wbri293; +package org.jboss.weld.test.unit.lookup.wbri293; import javax.enterprise.context.RequestScoped; Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/Cat.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.manager; +package org.jboss.weld.test.unit.manager; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/CatLocal.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.manager; +package org.jboss.weld.test.unit.manager; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/EjbDescriptorLookupTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.manager; +package org.jboss.weld.test.unit.manager; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionTarget; @@ -22,10 +22,10 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.webbeans.bean.SessionBean; -import org.jboss.webbeans.ejb.InternalEjbDescriptor; -import org.jboss.webbeans.ejb.spi.EjbDescriptor; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.bean.SessionBean; +import org.jboss.weld.ejb.InternalEjbDescriptor; +import org.jboss.weld.ejb.spi.EjbDescriptor; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; /** Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/Foo.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.manager; +package org.jboss.weld.test.unit.manager; public class Foo { Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.manager; +package org.jboss.weld.test.unit.manager; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -13,9 +13,9 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.literal.DefaultLiteral; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.literal.DefaultLiteral; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.annotations.Test; @Artifact Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.noncontextual; +package org.jboss.weld.test.unit.noncontextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.AnnotatedType; @@ -8,7 +8,7 @@ import org.jboss.metadata.validation.ValidationException; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.weld.test.AbstractWebBeansTest; import org.testng.Assert; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.webbeans.test.unit.noncontextual; +package org.jboss.weld.test.unit.noncontextual; import javax.inject.Inject; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.noncontextual; +package org.jboss.weld.test.unit.noncontextual; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.test.unit.noncontextual; +package org.jboss.weld.test.unit.noncontextual; public class WebBean { Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/security) Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/security/SecurityTest.java 2009-10-07 21:43:49 UTC (rev 3872) +++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java 2009-10-08 04:13:04 UTC (rev 3883) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.test.unit.security; +package org.jboss.weld.test.unit.security; import java.lang.reflect.Field;