[weld-commits] Weld SVN: r6828 - in core/trunk/tests: src/main/java/org/jboss/weld/mock and 130 other directories.

[weld-commits at lists.jboss.org]

Author: aslak
Date: 2010-07-28 15:55:56 -0400 (Wed, 28 Jul 2010)
New Revision: 6828

Added:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedObject.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ContextTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScoped.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScopedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/PassivatingContextTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/StringHolder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/EventQualifierTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/NormalScopedBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/SimpleEventTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Updated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Capercaillie.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Woodland.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/WoodlandExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Clothes.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Coins.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/EcoFriendlyWashingMachine.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/FastWashingMachine.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/HotAir.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/InjectLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Laundry.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Original.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Plug.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/RunningTime.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SerialNumber.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SpecialLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/TumbleDryer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/WashingMachine.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/IntegerCollectionInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListInstance.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListStringInstance.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedCollectionInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedListInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ProducerBeanInvocationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Qux.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/QuxProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Target.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Temp.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Useless.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml
Removed:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml
Modified:
   core/trunk/tests/pom.xml
   core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java
Log:
WELD-493 Revert test delete. Lost history on move from tests-arquillian

Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml	2010-07-28 18:04:45 UTC (rev 6827)
+++ core/trunk/tests/pom.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -53,13 +53,6 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.spec.javax.servlet</groupId> 
-         <artifactId>jboss-servlet-api_3.0_spec</artifactId> 
-         <version>1.0.0.Beta2</version> 
-      </dependency>
-
-
-      <dependency>
          <groupId>javax.el</groupId>
          <artifactId>el-api</artifactId>
       </dependency>

Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java	2010-07-28 18:04:45 UTC (rev 6827)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -25,25 +25,17 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.EventListener;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.FilterRegistration.Dynamic;
-import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * Mock implementation of the servlet context for testing purposes. This implementation supports all
@@ -563,142 +555,4 @@
 	{
 		return "";
 	}
-
-	public Dynamic addFilter(String arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Dynamic addFilter(String arg0, Filter arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void addListener(String arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public <T extends EventListener> void addListener(T arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void addListener(Class<? extends EventListener> arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			Servlet arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			Class<? extends Servlet> arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public <T extends Filter> T createFilter(Class<T> arg0)
-			throws ServletException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public <T extends EventListener> T createListener(Class<T> arg0)
-			throws ServletException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public <T extends Servlet> T createServlet(Class<T> arg0)
-			throws ServletException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void declareRoles(String... arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public ClassLoader getClassLoader() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public int getEffectiveMajorVersion() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public int getEffectiveMinorVersion() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public FilterRegistration getFilterRegistration(String arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public JspConfigDescriptor getJspConfigDescriptor() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public ServletRegistration getServletRegistration(String arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public SessionCookieConfig getSessionCookieConfig() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean setInitParameter(String arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	
 }

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,347 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-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 javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.bean.ForwardingBean;
-import org.jboss.weld.literal.AnyLiteral;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.util.collections.Arrays2;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- * 
- */
- at Artifact
-public class ActivitiesTest extends AbstractWeldTest
-{
-
-   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation> singleton(DefaultLiteral.INSTANCE);
-
-   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_QUALIFIERS;
-         }
-
-         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();
-      BeanManagerImpl 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().resolveObserverMethods(new NightTime()).size() == 1;
-      ObserverMethod<?> observer = getCurrentManager().resolveObserverMethods(new NightTime()).iterator().next();
-      BeanManager childActivity = getCurrentManager().createActivity();
-      assert childActivity.resolveObserverMethods(new NightTime()).size() == 1;
-      assert childActivity.resolveObserverMethods(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;
-      BeanManagerImpl 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();
-      BeanManagerImpl 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();
-         }
-
-      });
-      getReference(Field.class).get();
-   }
-
-   @Test
-   public void testObserverBelongingToChildDoesNotFireForParentActivity()
-   {
-
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      ObserverMethod<NightTime> observer = new ObserverMethod<NightTime>()
-      {
-
-         public void notify(NightTime event)
-         {
-            assert false;
-         }
-
-         public Class<?> getBeanClass()
-         {
-            return NightTime.class;
-         }
-
-         public Set<Annotation> getObservedQualifiers()
-         {
-            return Arrays2.asSet(AnyLiteral.INSTANCE, DefaultLiteral.INSTANCE);
-         }
-
-         public Type getObservedType()
-         {
-            return NightTime.class;
-         }
-
-         public Reception getReception()
-         {
-            return Reception.ALWAYS;
-         }
-
-         public TransactionPhase getTransactionPhase()
-         {
-            return TransactionPhase.IN_PROGRESS;
-         }
-
-      };
-      // TODO Fix this test to use an observer method in a child activity
-      childActivity.addObserver(observer);
-      getCurrentManager().fireEvent(new NightTime());
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,347 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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.event.Reception;
+import javax.enterprise.event.TransactionPhase;
+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 javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.bean.ForwardingBean;
+import org.jboss.weld.literal.AnyLiteral;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.util.collections.Arrays2;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ * 
+ */
+ at Artifact
+public class ActivitiesTest extends AbstractWeldTest
+{
+
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation> singleton(DefaultLiteral.INSTANCE);
+
+   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_QUALIFIERS;
+         }
+
+         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();
+      BeanManagerImpl 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().resolveObserverMethods(new NightTime()).size() == 1;
+      ObserverMethod<?> observer = getCurrentManager().resolveObserverMethods(new NightTime()).iterator().next();
+      BeanManager childActivity = getCurrentManager().createActivity();
+      assert childActivity.resolveObserverMethods(new NightTime()).size() == 1;
+      assert childActivity.resolveObserverMethods(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;
+      BeanManagerImpl 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();
+      BeanManagerImpl 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();
+         }
+
+      });
+      getReference(Field.class).get();
+   }
+
+   @Test
+   public void testObserverBelongingToChildDoesNotFireForParentActivity()
+   {
+
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      ObserverMethod<NightTime> observer = new ObserverMethod<NightTime>()
+      {
+
+         public void notify(NightTime event)
+         {
+            assert false;
+         }
+
+         public Class<?> getBeanClass()
+         {
+            return NightTime.class;
+         }
+
+         public Set<Annotation> getObservedQualifiers()
+         {
+            return Arrays2.asSet(AnyLiteral.INSTANCE, DefaultLiteral.INSTANCE);
+         }
+
+         public Type getObservedType()
+         {
+            return NightTime.class;
+         }
+
+         public Reception getReception()
+         {
+            return Reception.ALWAYS;
+         }
+
+         public TransactionPhase getTransactionPhase()
+         {
+            return TransactionPhase.IN_PROGRESS;
+         }
+
+      };
+      // TODO Fix this test to use an observer method in a child activity
+      childActivity.addObserver(observer);
+      getCurrentManager().fireEvent(new NightTime());
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities;
-
-class Cow
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities;
+
+class Cow
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Scope
- at Inherited
- at interface Dummy {}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Dummy.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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;
+
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Scope
+ at Inherited
+ at interface Dummy {}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-class Field
-{
-   
-   @Inject @Tame Instance<Cow> instance;
-   
-   public Cow get()
-   {
-      return instance.get();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+class Field
+{
+   
+   @Inject @Tame Instance<Cow> instance;
+   
+   public Cow get()
+   {
+      return instance.get();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Fox.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities;
-
-class NightTime
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/NightTime.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities;
+
+class NightTime
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
-
-class BeanWithInjection
-{
-   @SpecialBindingType
-   protected MyBean myBean;
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/BeanWithInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
+
+class BeanWithInjection
+{
+   @SpecialBindingType
+   protected MyBean myBean;
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
-
- at SpecialBindingType
-class MyBean
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/MyBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
+
+ at SpecialBindingType
+class MyBean
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
-
-import java.lang.annotation.Annotation;
-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.CreationalContext;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
-public class SameBeanTypeInChildActivityTest extends AbstractWeldTest
-{
-   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
-
-   private Bean<?> createDummyBean(BeanManager beanManager)
-   {
-      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<SpecialBindingType>() {});
-      types.add(Object.class);
-      final Bean<?> bean = new Bean<MyBean>()
-      {
-
-         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 MyBean create(CreationalContext<MyBean> creationalContext)
-         {
-            return null;
-         }
-
-         public void destroy(MyBean instance, CreationalContext<MyBean> creationalContext)
-         {
-
-         }
-
-         public Class<?> getBeanClass()
-         {
-            return MyBean.class;
-         }
-
-         public boolean isAlternative()
-         {
-            return false;
-         }
-
-         public Set<Class<? extends Annotation>> getStereotypes()
-         {
-            return Collections.emptySet();
-         }
-
-      };
-      return bean;
-   }
-
-   @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
-   public void testSameBeanTypeInChildAsParentInjection()
-   {
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      Bean<?> anotherMyBean = createDummyBean(childActivity);
-      childActivity.addBean(anotherMyBean);
-   }
-
-   @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
-   public void testSameBeanTypeInChildAsIndirectParentInjection()
-   {
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      BeanManagerImpl grandChildActivity = childActivity.createActivity();
-      Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
-      grandChildActivity.addBean(anotherMyBean);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
+
+import java.lang.annotation.Annotation;
+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.CreationalContext;
+import javax.enterprise.inject.InjectionException;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class SameBeanTypeInChildActivityTest extends AbstractWeldTest
+{
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
+
+   private Bean<?> createDummyBean(BeanManager beanManager)
+   {
+      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<SpecialBindingType>() {});
+      types.add(Object.class);
+      final Bean<?> bean = new Bean<MyBean>()
+      {
+
+         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 MyBean create(CreationalContext<MyBean> creationalContext)
+         {
+            return null;
+         }
+
+         public void destroy(MyBean instance, CreationalContext<MyBean> creationalContext)
+         {
+
+         }
+
+         public Class<?> getBeanClass()
+         {
+            return MyBean.class;
+         }
+
+         public boolean isAlternative()
+         {
+            return false;
+         }
+
+         public Set<Class<? extends Annotation>> getStereotypes()
+         {
+            return Collections.emptySet();
+         }
+
+      };
+      return bean;
+   }
+
+   @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
+   public void testSameBeanTypeInChildAsParentInjection()
+   {
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      Bean<?> anotherMyBean = createDummyBean(childActivity);
+      childActivity.addBean(anotherMyBean);
+   }
+
+   @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
+   public void testSameBeanTypeInChildAsIndirectParentInjection()
+   {
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl grandChildActivity = childActivity.createActivity();
+      Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
+      grandChildActivity.addBean(anotherMyBean);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
-
-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.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Retention(RUNTIME)
- at Target({TYPE, METHOD, FIELD, PARAMETER})
- at Qualifier
- at interface SpecialBindingType
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SpecialBindingType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.child;
+
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Retention(RUNTIME)
+ at Target({TYPE, METHOD, FIELD, PARAMETER})
+ at Qualifier
+ at interface SpecialBindingType
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-class Cow
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+class Cow
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-class Donkey
-{
-   
-   BeanManager beanManager;
-   
-   public Donkey() throws NamingException
-   {
-      beanManager = (BeanManager) new InitialContext().lookup("java:comp/BeanManager");
-   }
-   
-   public BeanManager getManager()
-   {
-      return beanManager;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+class Donkey
+{
+   
+   BeanManager beanManager;
+   
+   public Donkey() throws NamingException
+   {
+      beanManager = (BeanManager) new InitialContext().lookup("java:comp/BeanManager");
+   }
+   
+   public BeanManager getManager()
+   {
+      return beanManager;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-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.enterprise.context.NormalScope;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at NormalScope
- at Inherited
- at interface Dummy {}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dummy.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+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.enterprise.context.NormalScope;
+
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at NormalScope
+ at Inherited
+ at interface Dummy {}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-
-class Dusk
-{
-   
-   @Inject
-   public Dusk(@Any Event<NightTime> event)
-   {
-      event.fire(new NightTime());
-   }
-   
-   public void ping() {}
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Dusk.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+class Dusk
+{
+   
+   @Inject
+   public Dusk(@Any Event<NightTime> event)
+   {
+      event.fire(new NightTime());
+   }
+   
+   public void ping() {}
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,175 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-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.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
-public class ELCurrentActivityTest extends AbstractWeldTest
-{
-
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   private static class Daisy implements Bean<Cow>
-   {
-
-      private static final Set<Type> TYPES = new HashSet<Type>();
-
-      private final static Set<Annotation> BINDING_TYPES = new HashSet<Annotation>();
-
-
-      static
-      {
-         TYPES.add(Cow.class);
-         TYPES.add(Object.class);
-         BINDING_TYPES.add(new AnnotationLiteral<Tame>() {});
-      }
-
-      public Daisy(BeanManager beanManager)
-      {
-      }
-
-      public Set<Annotation> getQualifiers()
-      {
-         return BINDING_TYPES;
-      }
-
-      public Set<InjectionPoint> getInjectionPoints()
-      {
-         return Collections.emptySet();
-      }
-
-      public String getName()
-      {
-         return "daisy";
-      }
-
-      public Class<? extends Annotation> getScope()
-      {
-         return Dependent.class;
-      }
-
-      public Set<Type> getTypes()
-      {
-         return TYPES;
-      }
-
-      public boolean isNullable()
-      {
-         return true;
-      }
-
-      public boolean isSerializable()
-      {
-         return false;
-      }
-
-      public Cow create(CreationalContext<Cow> creationalContext)
-      {
-         return new Cow();
-      }
-
-      public void destroy(Cow instance, CreationalContext<Cow> creationalContext)
-      {
-         // TODO Auto-generated method stub
-
-      }
-
-      public Class<?> getBeanClass()
-      {
-         return Cow.class;
-      }
-
-      public boolean isAlternative()
-      {
-         return false;
-      }
-
-      public Set<Class<? extends Annotation>> getStereotypes()
-      {
-         return Collections.emptySet();
-      }
-
-   }
-
-   @Test
-   public void testELEvaluationProcessedByCurrentActivty()
-   {
-      Context dummyContext = new DummyContext();
-      getCurrentManager().addContext(dummyContext);
-      assert getBeans(Cow.class).size() == 1;
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      childActivity.addBean(new Daisy(childActivity));
-      childActivity.setCurrent(dummyContext.getScope());
-      assert evaluateValueExpression("#{daisy}", Cow.class) != null;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,175 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+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.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class ELCurrentActivityTest extends AbstractWeldTest
+{
+
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   private static class Daisy implements Bean<Cow>
+   {
+
+      private static final Set<Type> TYPES = new HashSet<Type>();
+
+      private final static Set<Annotation> BINDING_TYPES = new HashSet<Annotation>();
+
+
+      static
+      {
+         TYPES.add(Cow.class);
+         TYPES.add(Object.class);
+         BINDING_TYPES.add(new AnnotationLiteral<Tame>() {});
+      }
+
+      public Daisy(BeanManager beanManager)
+      {
+      }
+
+      public Set<Annotation> getQualifiers()
+      {
+         return BINDING_TYPES;
+      }
+
+      public Set<InjectionPoint> getInjectionPoints()
+      {
+         return Collections.emptySet();
+      }
+
+      public String getName()
+      {
+         return "daisy";
+      }
+
+      public Class<? extends Annotation> getScope()
+      {
+         return Dependent.class;
+      }
+
+      public Set<Type> getTypes()
+      {
+         return TYPES;
+      }
+
+      public boolean isNullable()
+      {
+         return true;
+      }
+
+      public boolean isSerializable()
+      {
+         return false;
+      }
+
+      public Cow create(CreationalContext<Cow> creationalContext)
+      {
+         return new Cow();
+      }
+
+      public void destroy(Cow instance, CreationalContext<Cow> creationalContext)
+      {
+         // TODO Auto-generated method stub
+
+      }
+
+      public Class<?> getBeanClass()
+      {
+         return Cow.class;
+      }
+
+      public boolean isAlternative()
+      {
+         return false;
+      }
+
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
+
+   }
+
+   @Test
+   public void testELEvaluationProcessedByCurrentActivty()
+   {
+      Context dummyContext = new DummyContext();
+      getCurrentManager().addContext(dummyContext);
+      assert getBeans(Cow.class).size() == 1;
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      childActivity.addBean(new Daisy(childActivity));
+      childActivity.setCurrent(dummyContext.getScope());
+      assert evaluateValueExpression("#{daisy}", Cow.class) != null;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.literal.AnyLiteral;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- * 
- */
- at Artifact
-public class EventCurrentActivityTest extends AbstractWeldTest
-{
-
-   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 true;
-      }
-
-   }
-
-
-   @Test(groups = "broken")
-   public void testEventProcessedByCurrentActivity()
-   {
-      DummyContext dummyContext = new DummyContext();
-      getCurrentManager().addContext(dummyContext);
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      TestableObserverMethod<NightTime> observer = new TestableObserverMethod<NightTime>()
-      {
-
-         boolean observed = false;
-
-         public void notify(NightTime event)
-         {
-            observed = true;
-         }
-
-         public boolean isObserved()
-         {
-            return observed;
-         }
-
-         public Class<?> getBeanClass()
-         {
-            return NightTime.class;
-         }
-
-         public Set<Annotation> getObservedQualifiers()
-         {
-            return Collections.<Annotation>singleton(AnyLiteral.INSTANCE);
-         }
-
-         public Type getObservedType()
-         {
-            return NightTime.class;
-         }
-
-         public Reception getReception()
-         {
-            return Reception.ALWAYS;
-         }
-
-         public TransactionPhase getTransactionPhase()
-         {
-            return TransactionPhase.IN_PROGRESS;
-         }
-         
-      };
-      childActivity.addObserver(observer);
-      childActivity.setCurrent(dummyContext.getScope());
-      getReference(Dusk.class).ping();
-      assert observer.isObserved();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Reception;
+import javax.enterprise.event.TransactionPhase;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.literal.AnyLiteral;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ * 
+ */
+ at Artifact
+public class EventCurrentActivityTest extends AbstractWeldTest
+{
+
+   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 true;
+      }
+
+   }
+
+
+   @Test(groups = "broken")
+   public void testEventProcessedByCurrentActivity()
+   {
+      DummyContext dummyContext = new DummyContext();
+      getCurrentManager().addContext(dummyContext);
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      TestableObserverMethod<NightTime> observer = new TestableObserverMethod<NightTime>()
+      {
+
+         boolean observed = false;
+
+         public void notify(NightTime event)
+         {
+            observed = true;
+         }
+
+         public boolean isObserved()
+         {
+            return observed;
+         }
+
+         public Class<?> getBeanClass()
+         {
+            return NightTime.class;
+         }
+
+         public Set<Annotation> getObservedQualifiers()
+         {
+            return Collections.<Annotation>singleton(AnyLiteral.INSTANCE);
+         }
+
+         public Type getObservedType()
+         {
+            return NightTime.class;
+         }
+
+         public Reception getReception()
+         {
+            return Reception.ALWAYS;
+         }
+
+         public TransactionPhase getTransactionPhase()
+         {
+            return TransactionPhase.IN_PROGRESS;
+         }
+         
+      };
+      childActivity.addObserver(observer);
+      childActivity.setCurrent(dummyContext.getScope());
+      getReference(Dusk.class).ping();
+      assert observer.isObserved();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-class Field
-{
-   
-   @Inject @Tame Instance<Cow> instance;
-   
-   public Cow get()
-   {
-      return instance.get();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+class Field
+{
+   
+   @Inject @Tame Instance<Cow> instance;
+   
+   public Cow get()
+   {
+      return instance.get();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-
-class Horse
-{
-   
-   @Inject BeanManager beanManager;
-   
-   public BeanManager getManager()
-   {
-      return beanManager;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+class Horse
+{
+   
+   @Inject BeanManager beanManager;
+   
+   public BeanManager getManager()
+   {
+      return beanManager;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
-public class InactiveScopeTest extends AbstractWeldTest
-{
-
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   @Test(expectedExceptions=ContextNotActiveException.class)
-   public void testInactiveScope()
-   {
-      DummyContext dummyContext = new DummyContext();
-      dummyContext.setActive(false);
-      getCurrentManager().addContext(dummyContext);
-      WeldManager childActivity = getCurrentManager().createActivity();
-      childActivity.setCurrent(dummyContext.getScope());
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InactiveScopeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class InactiveScopeTest extends AbstractWeldTest
+{
+
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   @Test(expectedExceptions=ContextNotActiveException.class)
+   public void testInactiveScope()
+   {
+      DummyContext dummyContext = new DummyContext();
+      dummyContext.setActive(false);
+      getCurrentManager().addContext(dummyContext);
+      WeldManager childActivity = getCurrentManager().createActivity();
+      childActivity.setCurrent(dummyContext.getScope());
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
-public class InjectedManagerCurrentActivityTest extends AbstractWeldTest
-{
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   @Test
-   public void testInjectedManagerIsCurrentActivity()
-   {
-      Context dummyContext = new DummyContext();
-      getCurrentManager().addContext(dummyContext);
-      assert getBeans(Cow.class).size() == 1;
-      WeldManager childActivity = getCurrentManager().createActivity();
-      childActivity.setCurrent(dummyContext.getScope());
-      assert getReference(Horse.class).getManager().equals(childActivity);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InjectedManagerCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class InjectedManagerCurrentActivityTest extends AbstractWeldTest
+{
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   @Test
+   public void testInjectedManagerIsCurrentActivity()
+   {
+      Context dummyContext = new DummyContext();
+      getCurrentManager().addContext(dummyContext);
+      assert getBeans(Cow.class).size() == 1;
+      WeldManager childActivity = getCurrentManager().createActivity();
+      childActivity.setCurrent(dummyContext.getScope());
+      assert getReference(Horse.class).getManager().equals(childActivity);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,183 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-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.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
-public class InstanceCurrentActivityTest extends AbstractWeldTest
-{
-
-   public static class TameLiteral extends AnnotationLiteral<Tame> implements Tame {}
-
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   private static class NonNormalContext extends DummyContext
-   {
-
-      @Override
-      public Class<? extends Annotation> getScope()
-      {
-         return NonNormalScope.class;
-      }
-
-   }
-
-   private static class Daisy implements Bean<Cow>
-   {
-
-      private static final Set<Type> TYPES = new HashSet<Type>();
-
-      private final static Set<Annotation> BINDING_TYPES = new HashSet<Annotation>();
-
-
-      static
-      {
-         TYPES.add(Cow.class);
-         TYPES.add(Object.class);
-         BINDING_TYPES.add(new TameLiteral());
-      }
-
-      public Daisy(BeanManager beanManager)
-      {
-      }
-
-      public Set<Annotation> getQualifiers()
-      {
-         return BINDING_TYPES;
-      }
-
-      public Set<InjectionPoint> getInjectionPoints()
-      {
-         return Collections.emptySet();
-      }
-
-      public String getName()
-      {
-         return "daisy";
-      }
-
-      public Class<? extends Annotation> getScope()
-      {
-         return Dependent.class;
-      }
-
-      public Set<Type> getTypes()
-      {
-         return TYPES;
-      }
-
-      public boolean isNullable()
-      {
-         return true;
-      }
-
-      public Cow create(CreationalContext<Cow> creationalContext)
-      {
-         return new Cow();
-      }
-
-      public void destroy(Cow instance, CreationalContext<Cow> creationalContext)
-      {
-         // TODO Auto-generated method stub
-
-      }
-
-      public Class<?> getBeanClass()
-      {
-         return Cow.class;
-      }
-
-      public boolean isAlternative()
-      {
-         return false;
-      }
-
-      public Set<Class<? extends Annotation>> getStereotypes()
-      {
-         return Collections.emptySet();
-      }
-
-   }
-
-   @Test
-   public void testInstanceProcessedByCurrentActivity()
-   {
-      Context dummyContext = new DummyContext();
-      getCurrentManager().addContext(dummyContext);
-      assert getBeans(Cow.class).size() == 1;
-      BeanManagerImpl childActivity = getCurrentManager().createActivity();
-      childActivity.addBean(new Daisy(childActivity));
-      childActivity.setCurrent(dummyContext.getScope());
-      assert getReference(Field.class).get() != null;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/InstanceCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,183 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+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.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class InstanceCurrentActivityTest extends AbstractWeldTest
+{
+
+   public static class TameLiteral extends AnnotationLiteral<Tame> implements Tame {}
+
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   private static class NonNormalContext extends DummyContext
+   {
+
+      @Override
+      public Class<? extends Annotation> getScope()
+      {
+         return NonNormalScope.class;
+      }
+
+   }
+
+   private static class Daisy implements Bean<Cow>
+   {
+
+      private static final Set<Type> TYPES = new HashSet<Type>();
+
+      private final static Set<Annotation> BINDING_TYPES = new HashSet<Annotation>();
+
+
+      static
+      {
+         TYPES.add(Cow.class);
+         TYPES.add(Object.class);
+         BINDING_TYPES.add(new TameLiteral());
+      }
+
+      public Daisy(BeanManager beanManager)
+      {
+      }
+
+      public Set<Annotation> getQualifiers()
+      {
+         return BINDING_TYPES;
+      }
+
+      public Set<InjectionPoint> getInjectionPoints()
+      {
+         return Collections.emptySet();
+      }
+
+      public String getName()
+      {
+         return "daisy";
+      }
+
+      public Class<? extends Annotation> getScope()
+      {
+         return Dependent.class;
+      }
+
+      public Set<Type> getTypes()
+      {
+         return TYPES;
+      }
+
+      public boolean isNullable()
+      {
+         return true;
+      }
+
+      public Cow create(CreationalContext<Cow> creationalContext)
+      {
+         return new Cow();
+      }
+
+      public void destroy(Cow instance, CreationalContext<Cow> creationalContext)
+      {
+         // TODO Auto-generated method stub
+
+      }
+
+      public Class<?> getBeanClass()
+      {
+         return Cow.class;
+      }
+
+      public boolean isAlternative()
+      {
+         return false;
+      }
+
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
+
+   }
+
+   @Test
+   public void testInstanceProcessedByCurrentActivity()
+   {
+      Context dummyContext = new DummyContext();
+      getCurrentManager().addContext(dummyContext);
+      assert getBeans(Cow.class).size() == 1;
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      childActivity.addBean(new Daisy(childActivity));
+      childActivity.setCurrent(dummyContext.getScope());
+      assert getReference(Field.class).get() != null;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.weld.manager.api.WeldManager;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * Spec version: 20090519
- *
- */
- at Artifact
- at IntegrationTest
-public class JndiManagerCurrentActivityTest extends AbstractWeldTest
-{
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   @Test
-   public void testJndiManagerIsCurrentActivity()
-   {
-      Context dummyContext = new DummyContext();
-      getCurrentManager().addContext(dummyContext);
-      assert getBeans(Cow.class).size() == 1;
-      WeldManager childActivity = getCurrentManager().createActivity();
-      childActivity.setCurrent(dummyContext.getScope());
-      assert getReference(Donkey.class).getManager().equals(childActivity);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/JndiManagerCurrentActivityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+ at IntegrationTest
+public class JndiManagerCurrentActivityTest extends AbstractWeldTest
+{
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   @Test
+   public void testJndiManagerIsCurrentActivity()
+   {
+      Context dummyContext = new DummyContext();
+      getCurrentManager().addContext(dummyContext);
+      assert getBeans(Cow.class).size() == 1;
+      WeldManager childActivity = getCurrentManager().createActivity();
+      childActivity.setCurrent(dummyContext.getScope());
+      assert getReference(Donkey.class).getManager().equals(childActivity);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-class NightTime
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NightTime.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+class NightTime
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-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;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Scope
- at Inherited
- at interface NonNormalScope {}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScope.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+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;
+
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Scope
+ at Inherited
+ at interface NonNormalScope {}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class NonNormalScopeTest extends AbstractWeldTest
-{
-
-   private static class DummyContext implements Context
-   {
-
-      private boolean active = true;
-
-      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 active;
-      }
-
-      public void setActive(boolean active)
-      {
-         this.active = active;
-      }
-
-   }
-
-   private static class NonNormalContext extends DummyContext
-   {
-
-      @Override
-      public Class<? extends Annotation> getScope()
-      {
-         return NonNormalScope.class;
-      }
-
-   }
-
-   @Test(expectedExceptions=IllegalArgumentException.class)
-   public void testNonNormalScope()
-   {
-      Context dummyContext = new NonNormalContext();
-      getCurrentManager().addContext(dummyContext);
-      WeldManager childActivity = getCurrentManager().createActivity();
-      childActivity.setCurrent(dummyContext.getScope());
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/NonNormalScopeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class NonNormalScopeTest extends AbstractWeldTest
+{
+
+   private static class DummyContext implements Context
+   {
+
+      private boolean active = true;
+
+      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 active;
+      }
+
+      public void setActive(boolean active)
+      {
+         this.active = active;
+      }
+
+   }
+
+   private static class NonNormalContext extends DummyContext
+   {
+
+      @Override
+      public Class<? extends Annotation> getScope()
+      {
+         return NonNormalScope.class;
+      }
+
+   }
+
+   @Test(expectedExceptions=IllegalArgumentException.class)
+   public void testNonNormalScope()
+   {
+      Context dummyContext = new NonNormalContext();
+      getCurrentManager().addContext(dummyContext);
+      WeldManager childActivity = getCurrentManager().createActivity();
+      childActivity.setCurrent(dummyContext.getScope());
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
-
-import javax.enterprise.inject.spi.ObserverMethod;
-
-public interface TestableObserverMethod<T> extends ObserverMethod<T>
-{
-   
-   public boolean isObserved();
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.activities.current;
+
+import javax.enterprise.inject.spi.ObserverMethod;
+
+public interface TestableObserverMethod<T> extends ObserverMethod<T>
+{
+   
+   public boolean isObserved();
+   
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class Alternatives2Test extends AbstractWeldTest
-{
-
-   @Test
-   public void testAlternativesOnProducers()
-   {
-      assert getReference(Consumer.class).getFoo().getName().equals("Normal");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class Alternatives2Test extends AbstractWeldTest
+{
+
+   @Test
+   public void testAlternativesOnProducers()
+   {
+      assert getReference(Consumer.class).getFoo().getName().equals("Normal");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at BeansXml("beans.xml")
-public class AlternativesTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testAlternativesOnProducers()
-   {
-      assert getReference(Consumer.class).getFoo().getName().equals("Test");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class AlternativesTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testAlternativesOnProducers()
+   {
+      assert getReference(Consumer.class).getFoo().getName().equals("Test");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-import javax.inject.Inject;
-
-public class Consumer
-{
-
-   @Inject Foo foo;
-   
-   public Foo getFoo()
-   {
-      return foo;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+import javax.inject.Inject;
+
+public class Consumer
+{
+
+   @Inject Foo foo;
+   
+   public Foo getFoo()
+   {
+      return foo;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-public class Foo
-{
-   
-   private final String name;
-   
-   public Foo(String name)
-   {
-      this.name = name;
-   }
-   
-   public String getName()
-   {
-      return name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+public class Foo
+{
+   
+   private final String name;
+   
+   public Foo(String name)
+   {
+      this.name = name;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-import javax.enterprise.inject.Produces;
-
-public class Producer
-{
-   
-   @Produces @Test 
-   public Foo getFoo() 
-   {
-      return new Foo("Test");
-   }
-   
-   @Produces
-   public Foo getManager() 
-   {
-      return new Foo("Normal");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Producer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+import javax.enterprise.inject.Produces;
+
+public class Producer
+{
+   
+   @Produces @Test 
+   public Foo getFoo() 
+   {
+      return new Foo("Test");
+   }
+   
+   @Produces
+   public Foo getManager() 
+   {
+      return new Foo("Normal");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Stereotype;
-
- at Stereotype
- at Alternative
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-public @interface Test {}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/alternatives/Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.alternatives;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Stereotype;
+
+ at Stereotype
+ at Alternative
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+public @interface Test {}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class Bean
-{
-   int field;
-   
-   public Bean(int i)
-   {
-      
-   }
-   
-   public void method(int i)
-   {
-      
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Bean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Bean
+{
+   int field;
+   
+   public Bean(int i)
+   {
+      
+   }
+   
+   public void method(int i)
+   {
+      
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
-
-
-public class Child extends Parent
-   {
-   }
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Child.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
+
+
+public class Child extends Parent
+   {
+   }
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
-
-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.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * @author kkahn
- * 
- */
- at Artifact
-public class DeclaringTypeTest extends AbstractWeldTest
-{
-
-   @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: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
+
+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.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author kkahn
+ * 
+ */
+ at Artifact
+public class DeclaringTypeTest extends AbstractWeldTest
+{
+
+   @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());
+         }
+      }
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
-
-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.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Artifact
-public class ExampleTest extends AbstractWeldTest
-{
-   @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: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
+
+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.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Artifact
+public class ExampleTest extends AbstractWeldTest
+{
+   @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());
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
-public class Parent
-{
-   int parent;
-
-   void parentMethod()
-   {
-
-   }
-}
-

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/Parent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType;
+public class Parent
+{
+   int parent;
+
+   void parentMethod()
+   {
+
+   }
+}
+

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Inject;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Artifact
-public class AnnotatedTypeDecoratorTest extends AbstractWeldTest
-{
-   @Test
-   public void testAnnotationDecorator() throws Exception 
-   {
-      NotAnnotated.reset();
-      AnnotatedType<NotAnnotated> type = getCurrentManager().createAnnotatedType(NotAnnotated.class);
-      checkAnnotations(type, new NoAnnotationsChecker());
-      
-      type = new MockAnnotatedType<NotAnnotated>(type);
-      checkAnnotations(type, new MockAnnotationsChecker());
-      
-      NonContextual<NotAnnotated> nonContextual = new NonContextual<NotAnnotated>(getCurrentManager(), type);
-      NotAnnotated instance = nonContextual.create();
-      assertNotNull(instance);
-      nonContextual.postConstruct(instance);
-      
-      assertNotNull(instance.getFromField());
-      assertNotNull(NotAnnotated.getFromConstructor());
-      assertNotNull(NotAnnotated.getFromInitializer());
-   }
-   
-   private void checkAnnotations(AnnotatedType<NotAnnotated> type, TypeChecker checker)
-   {
-      checker.assertAnnotations(type);
-      
-      assertEquals(1, type.getConstructors().size());
-      
-      checker.assertAnnotations(type.getConstructors().iterator().next());
-      checker.assertAnnotations(type.getConstructors().iterator().next().getParameters().get(0));
-      
-      assertEquals(3, type.getFields().size());
-      for (AnnotatedField<? super NotAnnotated> field : type.getFields())
-      {
-         if (field.getJavaMember().getName().equals("fromField"))
-         {
-            checker.assertAnnotations(field);
-         }
-         else
-         {
-            assertEquals(0, field.getAnnotations().size());
-         }
-      }
-      assertEquals(5, type.getMethods().size());
-      checker.assertAnnotations(type.getMethods().iterator().next());
-   }
-
-
-
-
-   interface TypeChecker
-   {
-      void assertAnnotations(Annotated annotated);
-   }
-   
-   class NoAnnotationsChecker implements TypeChecker
-   {
-
-      public void assertAnnotations(Annotated annotated)
-      {
-         assertEquals(0, annotated.getAnnotations().size());
-      }
-   }
-   
-   class MockAnnotationsChecker implements TypeChecker
-   {
-
-      public void assertAnnotations(Annotated annotated)
-      {
-         if (annotated instanceof MockAnnotatedCallable)
-         {
-            assertEquals(1, annotated.getAnnotations().size());
-            assertTrue(annotated.isAnnotationPresent(Inject.class));
-         }
-         else if (annotated instanceof MockAnnotatedField<?>)
-         {
-            assertEquals(1, annotated.getAnnotations().size());
-            assertTrue(annotated.isAnnotationPresent(Inject.class));
-         }
-      }
-   }
-   
-   public class NonContextual<T> {
-
-      final InjectionTarget<T> it;
-      final BeanManager manager;
-      CreationalContext<T> cc;
-
-      public NonContextual(BeanManager manager, AnnotatedType<T> type) {
-         this.manager = manager;
-         this.it = manager.createInjectionTarget(type);
-         cc = manager.createCreationalContext(null);
-      }
-
-      public T create()
-      {
-         return it.produce(cc);
-      }
-      
-      public CreationalContext<T> postConstruct(T instance) {
-         it.inject(instance, cc);
-         it.postConstruct(instance);
-         return cc;
-      }
-
-      public void preDestroy(T instance) {
-         it.preDestroy(instance);
-      }
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.inject.Inject;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Artifact
+public class AnnotatedTypeDecoratorTest extends AbstractWeldTest
+{
+   @Test
+   public void testAnnotationDecorator() throws Exception 
+   {
+      NotAnnotated.reset();
+      AnnotatedType<NotAnnotated> type = getCurrentManager().createAnnotatedType(NotAnnotated.class);
+      checkAnnotations(type, new NoAnnotationsChecker());
+      
+      type = new MockAnnotatedType<NotAnnotated>(type);
+      checkAnnotations(type, new MockAnnotationsChecker());
+      
+      NonContextual<NotAnnotated> nonContextual = new NonContextual<NotAnnotated>(getCurrentManager(), type);
+      NotAnnotated instance = nonContextual.create();
+      assertNotNull(instance);
+      nonContextual.postConstruct(instance);
+      
+      assertNotNull(instance.getFromField());
+      assertNotNull(NotAnnotated.getFromConstructor());
+      assertNotNull(NotAnnotated.getFromInitializer());
+   }
+   
+   private void checkAnnotations(AnnotatedType<NotAnnotated> type, TypeChecker checker)
+   {
+      checker.assertAnnotations(type);
+      
+      assertEquals(1, type.getConstructors().size());
+      
+      checker.assertAnnotations(type.getConstructors().iterator().next());
+      checker.assertAnnotations(type.getConstructors().iterator().next().getParameters().get(0));
+      
+      assertEquals(3, type.getFields().size());
+      for (AnnotatedField<? super NotAnnotated> field : type.getFields())
+      {
+         if (field.getJavaMember().getName().equals("fromField"))
+         {
+            checker.assertAnnotations(field);
+         }
+         else
+         {
+            assertEquals(0, field.getAnnotations().size());
+         }
+      }
+      assertEquals(5, type.getMethods().size());
+      checker.assertAnnotations(type.getMethods().iterator().next());
+   }
+
+
+
+
+   interface TypeChecker
+   {
+      void assertAnnotations(Annotated annotated);
+   }
+   
+   class NoAnnotationsChecker implements TypeChecker
+   {
+
+      public void assertAnnotations(Annotated annotated)
+      {
+         assertEquals(0, annotated.getAnnotations().size());
+      }
+   }
+   
+   class MockAnnotationsChecker implements TypeChecker
+   {
+
+      public void assertAnnotations(Annotated annotated)
+      {
+         if (annotated instanceof MockAnnotatedCallable)
+         {
+            assertEquals(1, annotated.getAnnotations().size());
+            assertTrue(annotated.isAnnotationPresent(Inject.class));
+         }
+         else if (annotated instanceof MockAnnotatedField<?>)
+         {
+            assertEquals(1, annotated.getAnnotations().size());
+            assertTrue(annotated.isAnnotationPresent(Inject.class));
+         }
+      }
+   }
+   
+   public class NonContextual<T> {
+
+      final InjectionTarget<T> it;
+      final BeanManager manager;
+      CreationalContext<T> cc;
+
+      public NonContextual(BeanManager manager, AnnotatedType<T> type) {
+         this.manager = manager;
+         this.it = manager.createInjectionTarget(type);
+         cc = manager.createCreationalContext(null);
+      }
+
+      public T create()
+      {
+         return it.produce(cc);
+      }
+      
+      public CreationalContext<T> postConstruct(T instance) {
+         it.inject(instance, cc);
+         it.postConstruct(instance);
+         return cc;
+      }
+
+      public void preDestroy(T instance) {
+         it.preDestroy(instance);
+      }
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-/**
- * @author pmuir
- *
- */
-public class Foo
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Foo
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MockAnnotated implements Annotated
-{
-
-   private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject 
-   {
-      
-      public static final Inject INSTANCE = new InjectLiteral();
-      
-   }
-   
-   private Annotated delegate;
-   
-   public MockAnnotated(Annotated delegate)
-   {
-      this.delegate = delegate;
-   }
-
-   Annotated getDelegate()
-   {
-      return delegate;
-   }
-   
-   public Type getBaseType()
-   {
-      return delegate.getBaseType();
-   }
-
-   public Set<Type> getTypeClosure()
-   {
-      return delegate.getTypeClosure();
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
-   {
-      if (annotationType == Inject.class)
-      {
-         return (T) InjectLiteral.INSTANCE;
-      }
-      return null;
-   }
-
-   public Set<Annotation> getAnnotations()
-   {
-      return Collections.singleton((Annotation) InjectLiteral.INSTANCE);
-   }
-
-   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
-   {
-      return annotationType == Inject.class;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockAnnotated implements Annotated
+{
+
+   private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject 
+   {
+      
+      public static final Inject INSTANCE = new InjectLiteral();
+      
+   }
+   
+   private Annotated delegate;
+   
+   public MockAnnotated(Annotated delegate)
+   {
+      this.delegate = delegate;
+   }
+
+   Annotated getDelegate()
+   {
+      return delegate;
+   }
+   
+   public Type getBaseType()
+   {
+      return delegate.getBaseType();
+   }
+
+   public Set<Type> getTypeClosure()
+   {
+      return delegate.getTypeClosure();
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      if (annotationType == Inject.class)
+      {
+         return (T) InjectLiteral.INSTANCE;
+      }
+      return null;
+   }
+
+   public Set<Annotation> getAnnotations()
+   {
+      return Collections.singleton((Annotation) InjectLiteral.INSTANCE);
+   }
+
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      return annotationType == Inject.class;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.inject.Inject;
-
-import org.jboss.annotation.factory.AnnotationCreator;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public abstract class MockAnnotatedCallable<X> extends MockAnnotatedMember<X> implements AnnotatedCallable<X>
-{
-   private final static Inject INITIALIZER;
-   static
-   {
-      try
-      {
-         INITIALIZER = (Inject)AnnotationCreator.createAnnotation("@" + Inject.class.getName(), Inject.class);
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   private final List<AnnotatedParameter<X>> parameters;
-
-   public MockAnnotatedCallable(Annotated delegate)
-   {
-      super(delegate);
-      parameters = initialiseParameters();
-   }
-
-   @Override
-   AnnotatedCallable<X> getDelegate()
-   {
-      return (AnnotatedCallable<X>) super.getDelegate();
-   }
-   
-   private List<AnnotatedParameter<X>> initialiseParameters()
-   {
-      int size = getDelegate().getParameters().size();
-      List<AnnotatedParameter<X>> params = new ArrayList<AnnotatedParameter<X>>(size);
-      if (size > 0)
-      {
-         for (AnnotatedParameter<X> param : getDelegate().getParameters())
-         {
-            params.add(new MockAnnotatedParameter<X>(param, this));
-         }
-      }
-      return params;
-   }
-
-   public List<AnnotatedParameter<X>> getParameters()
-   {
-      return parameters;
-   }
-   
-   @Override
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
-   {
-      if (annotationType == Inject.class)
-      {
-         return (T)INITIALIZER;
-      }
-      return null;
-   }
-
-   @Override
-   public Set<Annotation> getAnnotations()
-   {
-      return Collections.singleton((Annotation)INITIALIZER);
-   }
-
-   @Override
-   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
-   {
-      return annotationType == Inject.class;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedCallable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.inject.Inject;
+
+import org.jboss.annotation.factory.AnnotationCreator;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class MockAnnotatedCallable<X> extends MockAnnotatedMember<X> implements AnnotatedCallable<X>
+{
+   private final static Inject INITIALIZER;
+   static
+   {
+      try
+      {
+         INITIALIZER = (Inject)AnnotationCreator.createAnnotation("@" + Inject.class.getName(), Inject.class);
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   private final List<AnnotatedParameter<X>> parameters;
+
+   public MockAnnotatedCallable(Annotated delegate)
+   {
+      super(delegate);
+      parameters = initialiseParameters();
+   }
+
+   @Override
+   AnnotatedCallable<X> getDelegate()
+   {
+      return (AnnotatedCallable<X>) super.getDelegate();
+   }
+   
+   private List<AnnotatedParameter<X>> initialiseParameters()
+   {
+      int size = getDelegate().getParameters().size();
+      List<AnnotatedParameter<X>> params = new ArrayList<AnnotatedParameter<X>>(size);
+      if (size > 0)
+      {
+         for (AnnotatedParameter<X> param : getDelegate().getParameters())
+         {
+            params.add(new MockAnnotatedParameter<X>(param, this));
+         }
+      }
+      return params;
+   }
+
+   public List<AnnotatedParameter<X>> getParameters()
+   {
+      return parameters;
+   }
+   
+   @Override
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      if (annotationType == Inject.class)
+      {
+         return (T)INITIALIZER;
+      }
+      return null;
+   }
+
+   @Override
+   public Set<Annotation> getAnnotations()
+   {
+      return Collections.singleton((Annotation)INITIALIZER);
+   }
+
+   @Override
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      return annotationType == Inject.class;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.lang.reflect.Constructor;
-
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-class MockAnnotatedConstructor<X> extends MockAnnotatedCallable<X> implements AnnotatedConstructor<X>
-{
-   MockAnnotatedConstructor(AnnotatedConstructor<X> delegate)
-   {
-      super(delegate);
-   }
-
-   @Override
-   AnnotatedConstructor<X> getDelegate()
-   {
-      return (AnnotatedConstructor<X>)super.getDelegate();
-   }
-
-   public Constructor<X> getJavaMember()
-   {
-      return getDelegate().getJavaMember();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedConstructor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.lang.reflect.Constructor;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+class MockAnnotatedConstructor<X> extends MockAnnotatedCallable<X> implements AnnotatedConstructor<X>
+{
+   MockAnnotatedConstructor(AnnotatedConstructor<X> delegate)
+   {
+      super(delegate);
+   }
+
+   @Override
+   AnnotatedConstructor<X> getDelegate()
+   {
+      return (AnnotatedConstructor<X>)super.getDelegate();
+   }
+
+   public Constructor<X> getJavaMember()
+   {
+      return getDelegate().getJavaMember();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.AnnotatedField;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-class MockAnnotatedField<X> extends MockAnnotatedMember<X> implements AnnotatedField<X>
-{
-   MockAnnotatedField(AnnotatedField<? super X> delegate)
-   {
-      super(delegate);
-   }
-
-   @Override
-   AnnotatedField<X> getDelegate()
-   {
-      return (AnnotatedField<X>)super.getDelegate();
-   }
-
-   public Field getJavaMember()
-   {
-      return getDelegate().getJavaMember();
-   }
-
-   private boolean isDecoratedField()
-   {
-      return getJavaMember().getName().equals("fromField");
-   }
-   @Override
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
-   {
-      if (isDecoratedField())
-         return super.getAnnotation(annotationType);
-      return null;
-   }
-
-   @Override
-   public Set<Annotation> getAnnotations()
-   {
-      if (isDecoratedField())
-         return super.getAnnotations();
-      return Collections.emptySet();
-   }
-
-   @Override
-   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
-   {
-      if (isDecoratedField())
-         return super.isAnnotationPresent(annotationType);
-      return false;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+class MockAnnotatedField<X> extends MockAnnotatedMember<X> implements AnnotatedField<X>
+{
+   MockAnnotatedField(AnnotatedField<? super X> delegate)
+   {
+      super(delegate);
+   }
+
+   @Override
+   AnnotatedField<X> getDelegate()
+   {
+      return (AnnotatedField<X>)super.getDelegate();
+   }
+
+   public Field getJavaMember()
+   {
+      return getDelegate().getJavaMember();
+   }
+
+   private boolean isDecoratedField()
+   {
+      return getJavaMember().getName().equals("fromField");
+   }
+   @Override
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      if (isDecoratedField())
+         return super.getAnnotation(annotationType);
+      return null;
+   }
+
+   @Override
+   public Set<Annotation> getAnnotations()
+   {
+      if (isDecoratedField())
+         return super.getAnnotations();
+      return Collections.emptySet();
+   }
+
+   @Override
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      if (isDecoratedField())
+         return super.isAnnotationPresent(annotationType);
+      return false;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public abstract class MockAnnotatedMember<X> extends MockAnnotated implements AnnotatedMember<X>
-{
-   public MockAnnotatedMember(Annotated delegate)
-   {
-      super(delegate);
-   }
-
-   @Override
-   AnnotatedMember<X> getDelegate()
-   {
-      return (AnnotatedMember<X>)super.getDelegate();
-   }
-   
-   public AnnotatedType<X> getDeclaringType()
-   {
-      return getDelegate().getDeclaringType();
-   }
-
-   public boolean isStatic()
-   {
-      return getDelegate().isStatic();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMember.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedMember;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class MockAnnotatedMember<X> extends MockAnnotated implements AnnotatedMember<X>
+{
+   public MockAnnotatedMember(Annotated delegate)
+   {
+      super(delegate);
+   }
+
+   @Override
+   AnnotatedMember<X> getDelegate()
+   {
+      return (AnnotatedMember<X>)super.getDelegate();
+   }
+   
+   public AnnotatedType<X> getDeclaringType()
+   {
+      return getDelegate().getDeclaringType();
+   }
+
+   public boolean isStatic()
+   {
+      return getDelegate().isStatic();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.lang.reflect.Method;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MockAnnotatedMethod<X> extends MockAnnotatedCallable<X> implements AnnotatedMethod<X>
-{
-   public MockAnnotatedMethod(Annotated delegate)
-   {
-      // FIXME MDRAnnotatedMethod constructor
-      super(delegate);
-   }
-
-   @Override
-   public AnnotatedMethod<X> getDelegate()
-   {
-      return (AnnotatedMethod<X>)super.getDelegate();
-
-   }
-   
-   public Method getJavaMember()
-   {
-      return getDelegate().getJavaMember();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.lang.reflect.Method;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockAnnotatedMethod<X> extends MockAnnotatedCallable<X> implements AnnotatedMethod<X>
+{
+   public MockAnnotatedMethod(Annotated delegate)
+   {
+      // FIXME MDRAnnotatedMethod constructor
+      super(delegate);
+   }
+
+   @Override
+   public AnnotatedMethod<X> getDelegate()
+   {
+      return (AnnotatedMethod<X>)super.getDelegate();
+
+   }
+   
+   public Method getJavaMember()
+   {
+      return getDelegate().getJavaMember();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MockAnnotatedParameter<X> extends MockAnnotated implements AnnotatedParameter<X>
-{
-   private final AnnotatedCallable<X> callable;
-   
-   public MockAnnotatedParameter(Annotated delegate, AnnotatedCallable<X> callable)
-   {
-      super(delegate);
-      this.callable = callable;
-   }
-
-   @Override
-   AnnotatedParameter<X> getDelegate()
-   {
-      return (AnnotatedParameter<X>)super.getDelegate();
-   }
-
-   public AnnotatedCallable<X> getDeclaringCallable()
-   {
-      return callable;
-   }
-
-   public int getPosition()
-   {
-      return getDelegate().getPosition();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedParameter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockAnnotatedParameter<X> extends MockAnnotated implements AnnotatedParameter<X>
+{
+   private final AnnotatedCallable<X> callable;
+   
+   public MockAnnotatedParameter(Annotated delegate, AnnotatedCallable<X> callable)
+   {
+      super(delegate);
+      this.callable = callable;
+   }
+
+   @Override
+   AnnotatedParameter<X> getDelegate()
+   {
+      return (AnnotatedParameter<X>)super.getDelegate();
+   }
+
+   public AnnotatedCallable<X> getDeclaringCallable()
+   {
+      return callable;
+   }
+
+   public int getPosition()
+   {
+      return getDelegate().getPosition();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-class MockAnnotatedType<X> extends MockAnnotated implements AnnotatedType<X>
-{
-   private final Set<AnnotatedConstructor<X>> annotatedConstructors;
-   
-   private final Set<AnnotatedField<? super X>> annotatedFields;
-   
-   private final Set<AnnotatedMethod<? super X>> annotatedMethods;
-   
-   MockAnnotatedType(AnnotatedType<X> delegate)
-   {
-      super(delegate);
-      annotatedConstructors = initialiseConstructors();
-      annotatedFields = initialiseAnnotatedFields();
-      annotatedMethods = initialiseMethods();
-   }
-   
-   private Set<AnnotatedField<? super X>> initialiseAnnotatedFields()
-   {
-      Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>();
-      for (AnnotatedField<? super X> field : getDelegate().getFields())
-      {
-         if (field.isStatic())
-         {
-            fields.add(field);
-         }
-         else
-         {
-            fields.add(new MockAnnotatedField<X>(field));
-         }
-      }
-      return fields;
-   }
-   
-   private Set<AnnotatedConstructor<X>> initialiseConstructors()
-   {
-      Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>();
-      for (AnnotatedConstructor<X> constructor : getDelegate().getConstructors())
-      {
-         constructors.add(new MockAnnotatedConstructor<X>(constructor));
-      }
-      return constructors;
-   }
-   
-   private Set<AnnotatedMethod<? super X>> initialiseMethods()
-   {
-      Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>();
-      for (AnnotatedMethod<? super X> method : getDelegate().getMethods())
-      {
-         if (method.isStatic())
-         {
-            methods.add(method);
-         }
-         else
-         {
-            methods.add(new MockAnnotatedMethod<X>(method));
-         }
-      }
-      return methods;
-   }
-   
-   @Override
-   AnnotatedType<X> getDelegate()
-   {
-      return (AnnotatedType<X>)super.getDelegate();
-   }
-   
-   public Set<AnnotatedConstructor<X>> getConstructors()
-   {
-      return annotatedConstructors;
-   }
-
-   public Set<AnnotatedField<? super X>> getFields()
-   {
-      return annotatedFields;
-   }
-
-   public Set<AnnotatedMethod<? super X>> getMethods()
-   {
-      return annotatedMethods;
-   }
-
-   public Class<X> getJavaClass()
-   {
-      return getDelegate().getJavaClass();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotatedType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+class MockAnnotatedType<X> extends MockAnnotated implements AnnotatedType<X>
+{
+   private final Set<AnnotatedConstructor<X>> annotatedConstructors;
+   
+   private final Set<AnnotatedField<? super X>> annotatedFields;
+   
+   private final Set<AnnotatedMethod<? super X>> annotatedMethods;
+   
+   MockAnnotatedType(AnnotatedType<X> delegate)
+   {
+      super(delegate);
+      annotatedConstructors = initialiseConstructors();
+      annotatedFields = initialiseAnnotatedFields();
+      annotatedMethods = initialiseMethods();
+   }
+   
+   private Set<AnnotatedField<? super X>> initialiseAnnotatedFields()
+   {
+      Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>();
+      for (AnnotatedField<? super X> field : getDelegate().getFields())
+      {
+         if (field.isStatic())
+         {
+            fields.add(field);
+         }
+         else
+         {
+            fields.add(new MockAnnotatedField<X>(field));
+         }
+      }
+      return fields;
+   }
+   
+   private Set<AnnotatedConstructor<X>> initialiseConstructors()
+   {
+      Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>();
+      for (AnnotatedConstructor<X> constructor : getDelegate().getConstructors())
+      {
+         constructors.add(new MockAnnotatedConstructor<X>(constructor));
+      }
+      return constructors;
+   }
+   
+   private Set<AnnotatedMethod<? super X>> initialiseMethods()
+   {
+      Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>();
+      for (AnnotatedMethod<? super X> method : getDelegate().getMethods())
+      {
+         if (method.isStatic())
+         {
+            methods.add(method);
+         }
+         else
+         {
+            methods.add(new MockAnnotatedMethod<X>(method));
+         }
+      }
+      return methods;
+   }
+   
+   @Override
+   AnnotatedType<X> getDelegate()
+   {
+      return (AnnotatedType<X>)super.getDelegate();
+   }
+   
+   public Set<AnnotatedConstructor<X>> getConstructors()
+   {
+      return annotatedConstructors;
+   }
+
+   public Set<AnnotatedField<? super X>> getFields()
+   {
+      return annotatedFields;
+   }
+
+   public Set<AnnotatedMethod<? super X>> getMethods()
+   {
+      return annotatedMethods;
+   }
+
+   public Class<X> getJavaClass()
+   {
+      return getDelegate().getJavaClass();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class NotAnnotated
-{
-   private static Foo fromConstructor;
-   
-   private static Foo fromInitialize;
-   
-   private Foo fromField;
-   
-   public NotAnnotated(Foo foo)
-   {
-      fromConstructor = foo;
-   }
-   
-   public void initialize(Foo foo)
-   {
-      fromInitialize = foo;
-   }
-   
-   /**
-    * @return the beanFromConstructor
-    */
-   public static Foo getFromConstructor()
-   {
-      return fromConstructor;
-   }
-   
-   /**
-    * @return the beanFromInitialize
-    */
-   public static Foo getFromInitializer()
-   {
-      return fromInitialize;
-   }
-   
-   /**
-    * @return the fromField
-    */
-   public Foo getFromField()
-   {
-      return fromField;
-   }
-   
-   public static void reset()
-   {
-      fromConstructor = null;
-      fromInitialize = null;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/NotAnnotated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.annotatedType.decoration;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class NotAnnotated
+{
+   private static Foo fromConstructor;
+   
+   private static Foo fromInitialize;
+   
+   private Foo fromField;
+   
+   public NotAnnotated(Foo foo)
+   {
+      fromConstructor = foo;
+   }
+   
+   public void initialize(Foo foo)
+   {
+      fromInitialize = foo;
+   }
+   
+   /**
+    * @return the beanFromConstructor
+    */
+   public static Foo getFromConstructor()
+   {
+      return fromConstructor;
+   }
+   
+   /**
+    * @return the beanFromInitialize
+    */
+   public static Foo getFromInitializer()
+   {
+      return fromInitialize;
+   }
+   
+   /**
+    * @return the fromField
+    */
+   public Foo getFromField()
+   {
+      return fromField;
+   }
+   
+   public static void reset()
+   {
+      fromConstructor = null;
+      fromInitialize = null;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.bean.ManagedBean;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testMultipleSimpleBean()
-   {
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Tuna.class);
-      assert classes.containsKey(Salmon.class);
-      assert classes.containsKey(SeaBass.class);
-      assert classes.containsKey(Sole.class);
-      
-      assert classes.get(Tuna.class) instanceof ManagedBean;
-      assert classes.get(Salmon.class) instanceof ManagedBean;
-      assert classes.get(SeaBass.class) instanceof ManagedBean;
-      assert classes.get(Sole.class) instanceof ManagedBean;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testMultipleSimpleBean()
+   {
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Tuna.class);
+      assert classes.containsKey(Salmon.class);
+      assert classes.containsKey(SeaBass.class);
+      assert classes.containsKey(Sole.class);
+      
+      assert classes.get(Tuna.class) instanceof ManagedBean;
+      assert classes.get(Salmon.class) instanceof ManagedBean;
+      assert classes.get(SeaBass.class) instanceof ManagedBean;
+      assert classes.get(Sole.class) instanceof ManagedBean;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-import javax.inject.Named;
-
- at Named
-class Salmon implements ScottishFish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+import javax.inject.Named;
+
+ at Named
+class Salmon implements ScottishFish
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-interface ScottishFish extends Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+interface ScottishFish extends Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class SeaBass implements Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class SeaBass implements Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-import javax.inject.Named;
-
- at Whitefish
- at Named("whitefish")
-class Sole implements ScottishFish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+import javax.inject.Named;
+
+ at Whitefish
+ at Named("whitefish")
+class Sole implements ScottishFish
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Tuna
-{
-   
-   public String getName()
-   {
-      return "Ophir";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Tuna
+{
+   
+   public String getName()
+   {
+      return "Ophir";
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Whitefish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/multiple/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.multiple;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Whitefish
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.single;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testSingleSimpleBean()
-   {
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Tuna.class);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.single;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testSingleSimpleBean()
+   {
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Tuna.class);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.single;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Tuna
-{
-   
-   public String getName()
-   {
-      return "Ophir";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/managed/single/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.managed.single;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Tuna
+{
+   
+   public String getName()
+   {
+      return "Ophir";
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.ManagedBean;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testMultipleEnterpriseAndSimpleBean()
-   {
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Hound.class);
-      assert classes.containsKey(Elephant.class);
-      assert classes.containsKey(Panther.class);
-      assert classes.containsKey(Tiger.class);
-      assert classes.containsKey(Tuna.class);
-      assert classes.containsKey(Salmon.class);
-      assert classes.containsKey(SeaBass.class);
-      assert classes.containsKey(Sole.class);
-      
-      assert classes.get(Hound.class) instanceof SessionBean;
-      assert classes.get(Elephant.class) instanceof SessionBean;
-      assert classes.get(Panther.class) instanceof SessionBean;
-      assert classes.get(Tiger.class) instanceof SessionBean;
-      assert classes.get(Tuna.class) instanceof ManagedBean;
-      assert classes.get(Salmon.class) instanceof ManagedBean;
-      assert classes.get(SeaBass.class) instanceof ManagedBean;
-      assert classes.get(Sole.class) instanceof ManagedBean;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testMultipleEnterpriseAndSimpleBean()
+   {
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Hound.class);
+      assert classes.containsKey(Elephant.class);
+      assert classes.containsKey(Panther.class);
+      assert classes.containsKey(Tiger.class);
+      assert classes.containsKey(Tuna.class);
+      assert classes.containsKey(Salmon.class);
+      assert classes.containsKey(SeaBass.class);
+      assert classes.containsKey(Sole.class);
+      
+      assert classes.get(Hound.class) instanceof SessionBean;
+      assert classes.get(Elephant.class) instanceof SessionBean;
+      assert classes.get(Panther.class) instanceof SessionBean;
+      assert classes.get(Tiger.class) instanceof SessionBean;
+      assert classes.get(Tuna.class) instanceof ManagedBean;
+      assert classes.get(Salmon.class) instanceof ManagedBean;
+      assert classes.get(SeaBass.class) instanceof ManagedBean;
+      assert classes.get(Sole.class) instanceof ManagedBean;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-class Elephant implements ElephantLocal
-{
-   
-   @Remove
-   public void remove1()
-   {
-      
-   }
-   
-   @Remove
-   public void remove2()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Elephant.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+class Elephant implements ElephantLocal
+{
+   
+   @Remove
+   public void remove1()
+   {
+      
+   }
+   
+   @Remove
+   public void remove2()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Local;
-
- at Local
-public interface ElephantLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ElephantLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Local;
+
+ at Local
+public interface ElephantLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Named;
-
- at Stateful
- at Tame
- at Named("Pongo")
-class Hound implements HoundLocal
-{ 
-   @Remove
-   public void bye() {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Named;
+
+ at Stateful
+ at Tame
+ at Named("Pongo")
+class Hound implements HoundLocal
+{ 
+   @Remove
+   public void bye() {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Local;
-
- at Local
-public interface HoundLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HoundLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-class Panther implements PantherLocal
-{
-   
-   @Remove
-   public void remove(String foo)
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Panther.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+class Panther implements PantherLocal
+{
+   
+   @Remove
+   public void remove(String foo)
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-public interface PantherLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/PantherLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+public interface PantherLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.inject.Named;
-
- at Named
-class Salmon implements ScottishFish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.inject.Named;
+
+ at Named
+class Salmon implements ScottishFish
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-interface ScottishFish extends Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+interface ScottishFish extends Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class SeaBass implements Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class SeaBass implements Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.inject.Named;
-
- at Whitefish
- at Named("whitefish")
-class Sole implements ScottishFish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.inject.Named;
+
+ at Whitefish
+ at Named("whitefish")
+class Sole implements ScottishFish
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Synchronous
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Synchronous
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
- at Synchronous
-public class Tiger implements TigerLocal
-{
-   
-   @Remove
-   public void remove()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tiger.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+ at Synchronous
+public class Tiger implements TigerLocal
+{
+   
+   @Remove
+   public void remove()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.ejb.Local;
-
- at Local
-public interface TigerLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/TigerLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.ejb.Local;
+
+ at Local
+public interface TigerLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Tuna
-{
-   
-   public String getName()
-   {
-      return "Ophir";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Tuna
+{
+   
+   public String getName()
+   {
+      return "Ophir";
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Whitefish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.mixed;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Whitefish
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.ManagedBean;
-import org.jboss.weld.bean.ProducerMethod;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testProducerMethodBean()
-   {
-      //deployBeans(TarantulaProducer.class);
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean<?>)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(TarantulaProducer.class);
-      assert classes.containsKey(Tarantula.class);
-      
-      assert classes.get(TarantulaProducer.class) instanceof ManagedBean<?>;
-      assert classes.get(Tarantula.class) instanceof ProducerMethod<?, ?>;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.ManagedBean;
+import org.jboss.weld.bean.ProducerMethod;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testProducerMethodBean()
+   {
+      //deployBeans(TarantulaProducer.class);
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean<?>)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(TarantulaProducer.class);
+      assert classes.containsKey(Tarantula.class);
+      
+      assert classes.get(TarantulaProducer.class) instanceof ManagedBean<?>;
+      assert classes.get(Tarantula.class) instanceof ProducerMethod<?, ?>;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-interface DeadlyAnimal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+interface DeadlyAnimal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-interface DeadlySpider extends DeadlyAnimal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DeadlySpider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+interface DeadlySpider extends DeadlyAnimal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-class DefangedTarantula extends Tarantula
-{
-   
-   public DefangedTarantula()
-   {
-      super("defanged");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+class DefangedTarantula extends Tarantula
+{
+   
+   public DefangedTarantula()
+   {
+      super("defanged");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-class Spider implements Animal
-{
-
-   public final void layEggs()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Spider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+class Spider implements Animal
+{
+
+   public final void layEggs()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-
-
-class Tarantula extends Spider implements DeadlySpider
-{
-   
-   public Tarantula(String foo)
-   {
-      // TODO Auto-generated constructor stub
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/Tarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+
+
+class Tarantula extends Spider implements DeadlySpider
+{
+   
+   public Tarantula(String foo)
+   {
+      // TODO Auto-generated constructor stub
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
-
-import javax.enterprise.inject.Produces;
-
-public class TarantulaProducer
-{
-   
-   @Produces @Tame public Tarantula produceTameTarantula()
-   {
-      return new DefangedTarantula();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.producers.singleProducerMethod;
+
+import javax.enterprise.inject.Produces;
+
+public class TarantulaProducer
+{
+   
+   @Produces @Tame public Tarantula produceTameTarantula()
+   {
+      return new DefangedTarantula();
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.RIBean;
-import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testMultipleEnterpriseBean()
-   {
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Hound.class);
-      assert classes.containsKey(Elephant.class);
-      assert classes.containsKey(Panther.class);
-      assert classes.containsKey(Tiger.class);
-      
-      assert classes.get(Hound.class) instanceof SessionBean;
-      assert classes.get(Elephant.class) instanceof SessionBean;
-      assert classes.get(Panther.class) instanceof SessionBean;
-      assert classes.get(Tiger.class) instanceof SessionBean;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.RIBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testMultipleEnterpriseBean()
+   {
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Hound.class);
+      assert classes.containsKey(Elephant.class);
+      assert classes.containsKey(Panther.class);
+      assert classes.containsKey(Tiger.class);
+      
+      assert classes.get(Hound.class) instanceof SessionBean;
+      assert classes.get(Elephant.class) instanceof SessionBean;
+      assert classes.get(Panther.class) instanceof SessionBean;
+      assert classes.get(Tiger.class) instanceof SessionBean;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-class Elephant implements ElephantLocal
-{
-   
-   @Remove
-   public void remove1()
-   {
-      
-   }
-   
-   @Remove
-   public void remove2()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Elephant.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+class Elephant implements ElephantLocal
+{
+   
+   @Remove
+   public void remove1()
+   {
+      
+   }
+   
+   @Remove
+   public void remove2()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Local;
-
- at Local
-public interface ElephantLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/ElephantLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Local;
+
+ at Local
+public interface ElephantLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Named;
-
- at Stateful
- at Tame
- at Named("Pongo")
-class Hound implements HoundLocal
-{ 
-   @Remove
-   public void bye() {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Named;
+
+ at Stateful
+ at Tame
+ at Named("Pongo")
+class Hound implements HoundLocal
+{ 
+   @Remove
+   public void bye() {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Local;
-
- at Local
-public interface HoundLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HoundLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-class Panther implements PantherLocal
-{
-   
-   @Remove
-   public void remove(String foo)
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Panther.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+class Panther implements PantherLocal
+{
+   
+   @Remove
+   public void remove(String foo)
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-public interface PantherLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/PantherLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+public interface PantherLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Synchronous
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Synchronous
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
- at Synchronous
-public class Tiger implements TigerLocal
-{
-   
-   @Remove
-   public void remove()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/Tiger.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+ at Stateful
+ at Synchronous
+public class Tiger implements TigerLocal
+{
+   
+   @Remove
+   public void remove()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
-
-import javax.ejb.Local;
-
- at Local
-public interface TigerLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/TigerLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.multiple;
+
+import javax.ejb.Local;
+
+ at Local
+public interface TigerLocal
+{
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.RIBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class BootstrapTest extends AbstractWeldTest
-{
-   
-   @Test(groups="bootstrap")
-   public void testSingleEnterpriseBean()
-   {
-      List<Bean<?>> beans = getCurrentManager().getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Hound.class);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.RIBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class BootstrapTest extends AbstractWeldTest
+{
+   
+   @Test(groups="bootstrap")
+   public void testSingleEnterpriseBean()
+   {
+      List<Bean<?>> beans = getCurrentManager().getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Hound.class);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Named;
-
- at Stateful
- at Tame
- at Named("Pongo")
-class Hound implements HoundLocal
-{ 
-   @Remove
-   public void bye() {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Named;
+
+ at Stateful
+ at Tame
+ at Named("Pongo")
+class Hound implements HoundLocal
+{ 
+   @Remove
+   public void bye() {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
-
-import javax.ejb.Local;
-
- at Local
-public interface HoundLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HoundLocal
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanDeployment.session.single;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-package org.jboss.weld.tests.beanManager;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class BeanManagerTest extends AbstractWeldTest
-{
-   
-   @Test(expectedExceptions=IllegalArgumentException.class)
-   public void testNullBeanArgumentToGetReference()
-   {
-      Bean<Foo> bean = getBean(Foo.class);
-      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
-      getCurrentManager().getReference(null, Foo.class, cc);
-   }
-   
-   @Test(expectedExceptions=IllegalArgumentException.class)
-   public void testNullBeanTypeArgumentToGetReference()
-   {
-      Bean<Foo> bean = getBean(Foo.class);
-      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
-      getCurrentManager().getReference(bean, null, cc);
-   }
-   
-   @Test(expectedExceptions=IllegalArgumentException.class)
-   public void testNullCreationalContextArgumentToGetReference()
-   {
-      Bean<Foo> bean = getBean(Foo.class);
-      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
-      getCurrentManager().getReference(bean, Foo.class, null);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/BeanManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+package org.jboss.weld.tests.beanManager;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class BeanManagerTest extends AbstractWeldTest
+{
+   
+   @Test(expectedExceptions=IllegalArgumentException.class)
+   public void testNullBeanArgumentToGetReference()
+   {
+      Bean<Foo> bean = getBean(Foo.class);
+      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
+      getCurrentManager().getReference(null, Foo.class, cc);
+   }
+   
+   @Test(expectedExceptions=IllegalArgumentException.class)
+   public void testNullBeanTypeArgumentToGetReference()
+   {
+      Bean<Foo> bean = getBean(Foo.class);
+      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
+      getCurrentManager().getReference(bean, null, cc);
+   }
+   
+   @Test(expectedExceptions=IllegalArgumentException.class)
+   public void testNullCreationalContextArgumentToGetReference()
+   {
+      Bean<Foo> bean = getBean(Foo.class);
+      CreationalContext<Foo> cc = getCurrentManager().createCreationalContext(bean);
+      getCurrentManager().getReference(bean, Foo.class, null);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-package org.jboss.weld.tests.beanManager;
-
-public class Foo
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+package org.jboss.weld.tests.beanManager;
+
+public class Foo
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.annotation;
-
-import javax.persistence.PersistenceContext;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ManagerAnnotationTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-299")
-   public void testIsQualifier() throws Exception
-   {
-      assert !getCurrentManager().isQualifier(PersistenceContext.class);
-   }
-   
-   @Test(description="WELD-299")
-   public void testIsInterceptorBinding() throws Exception
-   {
-      assert !getCurrentManager().isInterceptorBinding(PersistenceContext.class);
-   }
-   
-   @Test(description="WELD-299")
-   public void testIsNormalScope() throws Exception
-   {
-      assert !getCurrentManager().isNormalScope(PersistenceContext.class);
-   }
-   
-   @Test(description="WELD-299")
-   public void testIsPassivatingScope() throws Exception
-   {
-      assert !getCurrentManager().isPassivatingScope(PersistenceContext.class);
-   }
-   
-   @Test(description="WELD-299")
-   public void testIsScope() throws Exception
-   {
-      assert !getCurrentManager().isScope(PersistenceContext.class);
-   }
-   
-   @Test(description="WELD-299")
-   public void testIsStereotype() throws Exception
-   {
-      assert !getCurrentManager().isStereotype(PersistenceContext.class);
-   }
-   
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/annotation/ManagerAnnotationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.annotation;
+
+import javax.persistence.PersistenceContext;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ManagerAnnotationTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-299")
+   public void testIsQualifier() throws Exception
+   {
+      assert !getCurrentManager().isQualifier(PersistenceContext.class);
+   }
+   
+   @Test(description="WELD-299")
+   public void testIsInterceptorBinding() throws Exception
+   {
+      assert !getCurrentManager().isInterceptorBinding(PersistenceContext.class);
+   }
+   
+   @Test(description="WELD-299")
+   public void testIsNormalScope() throws Exception
+   {
+      assert !getCurrentManager().isNormalScope(PersistenceContext.class);
+   }
+   
+   @Test(description="WELD-299")
+   public void testIsPassivatingScope() throws Exception
+   {
+      assert !getCurrentManager().isPassivatingScope(PersistenceContext.class);
+   }
+   
+   @Test(description="WELD-299")
+   public void testIsScope() throws Exception
+   {
+      assert !getCurrentManager().isScope(PersistenceContext.class);
+   }
+   
+   @Test(description="WELD-299")
+   public void testIsStereotype() throws Exception
+   {
+      assert !getCurrentManager().isStereotype(PersistenceContext.class);
+   }
+   
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.serializability;
-
-public class Foo
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.serializability;
+
+public class Foo
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,142 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.serializability;
-
-import java.lang.annotation.Annotation;
-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.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging
-public class ManagerTest extends AbstractWeldTest
-{
-   
-   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
-   
-   private static interface Dummy {}
-   
-   private static class DummyBean implements Bean<Dummy>
-   {
-      
-      private static final Set<Type> TYPES = new HashSet<Type>();
-      
-      static
-      {
-         TYPES.add(Dummy.class);
-         TYPES.add(Object.class);
-      }
-
-      public Set<Annotation> getQualifiers()
-      {
-         return DEFAULT_QUALIFIERS;
-      }
-
-      public Set<InjectionPoint> getInjectionPoints()
-      {
-         return Collections.emptySet();
-      }
-
-      public String getName()
-      {
-         return null;
-      }
-
-      public Class<? extends Annotation> getScope()
-      {
-         return Dependent.class;
-      }
-
-      public Set<Type> getTypes()
-      {
-         return TYPES;
-      }
-
-      public boolean isNullable()
-      {
-         return true;
-      }
-
-      public Dummy create(CreationalContext<Dummy> creationalContext)
-      {
-         return null;
-      }
-
-      public void destroy(Dummy instance, CreationalContext<Dummy> creationalContext)
-      {
-         
-      }
-
-      public Class<?> getBeanClass()
-      {
-         return Dummy.class;
-      }
-
-      public boolean isAlternative()
-      {
-         return false;
-      }
-
-      public Set<Class<? extends Annotation>> getStereotypes()
-      {
-         return Collections.emptySet();
-      }
-      
-   }
-   
-   @Test
-   public void testRootManagerSerializability() throws Exception
-   {
-      String rootManagerId = getCurrentManager().getId();
-      BeanManagerImpl deserializedRootManager = (BeanManagerImpl) Utils.deserialize(Utils.serialize(getCurrentManager()));
-      assert deserializedRootManager.getId().equals(rootManagerId);
-      assert getCurrentManager().getBeans(Foo.class).size() == 1;
-      assert deserializedRootManager.getBeans(Foo.class).size() == 1;
-      assert getCurrentManager().getBeans(Foo.class).iterator().next().equals(deserializedRootManager.getBeans(Foo.class).iterator().next());
-   }
-   
-   @Test
-   public void testChildManagerSerializability() throws Exception
-   {
-      BeanManagerImpl childManager = getCurrentManager().createActivity();
-      Bean<?> dummyBean = new DummyBean();
-      childManager.addBean(dummyBean);
-      String childManagerId = childManager.getId();
-      BeanManagerImpl deserializedChildManager = (BeanManagerImpl) Utils.deserialize(Utils.serialize(childManager));
-      assert deserializedChildManager.getId().equals(childManagerId);
-      assert childManager.getBeans(Dummy.class).size() == 1;
-      assert deserializedChildManager.getBeans(Dummy.class).size() == 1;
-      assert childManager.getBeans(Dummy.class).iterator().next().equals(deserializedChildManager.getBeans(Dummy.class).iterator().next());
-   }
-   
-   
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.beanManager.serializability;
+
+import java.lang.annotation.Annotation;
+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.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging
+public class ManagerTest extends AbstractWeldTest
+{
+   
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
+   
+   private static interface Dummy {}
+   
+   private static class DummyBean implements Bean<Dummy>
+   {
+      
+      private static final Set<Type> TYPES = new HashSet<Type>();
+      
+      static
+      {
+         TYPES.add(Dummy.class);
+         TYPES.add(Object.class);
+      }
+
+      public Set<Annotation> getQualifiers()
+      {
+         return DEFAULT_QUALIFIERS;
+      }
+
+      public Set<InjectionPoint> getInjectionPoints()
+      {
+         return Collections.emptySet();
+      }
+
+      public String getName()
+      {
+         return null;
+      }
+
+      public Class<? extends Annotation> getScope()
+      {
+         return Dependent.class;
+      }
+
+      public Set<Type> getTypes()
+      {
+         return TYPES;
+      }
+
+      public boolean isNullable()
+      {
+         return true;
+      }
+
+      public Dummy create(CreationalContext<Dummy> creationalContext)
+      {
+         return null;
+      }
+
+      public void destroy(Dummy instance, CreationalContext<Dummy> creationalContext)
+      {
+         
+      }
+
+      public Class<?> getBeanClass()
+      {
+         return Dummy.class;
+      }
+
+      public boolean isAlternative()
+      {
+         return false;
+      }
+
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
+      
+   }
+   
+   @Test
+   public void testRootManagerSerializability() throws Exception
+   {
+      String rootManagerId = getCurrentManager().getId();
+      BeanManagerImpl deserializedRootManager = (BeanManagerImpl) Utils.deserialize(Utils.serialize(getCurrentManager()));
+      assert deserializedRootManager.getId().equals(rootManagerId);
+      assert getCurrentManager().getBeans(Foo.class).size() == 1;
+      assert deserializedRootManager.getBeans(Foo.class).size() == 1;
+      assert getCurrentManager().getBeans(Foo.class).iterator().next().equals(deserializedRootManager.getBeans(Foo.class).iterator().next());
+   }
+   
+   @Test
+   public void testChildManagerSerializability() throws Exception
+   {
+      BeanManagerImpl childManager = getCurrentManager().createActivity();
+      Bean<?> dummyBean = new DummyBean();
+      childManager.addBean(dummyBean);
+      String childManagerId = childManager.getId();
+      BeanManagerImpl deserializedChildManager = (BeanManagerImpl) Utils.deserialize(Utils.serialize(childManager));
+      assert deserializedChildManager.getId().equals(childManagerId);
+      assert childManager.getBeans(Dummy.class).size() == 1;
+      assert deserializedChildManager.getBeans(Dummy.class).size() == 1;
+      assert childManager.getBeans(Dummy.class).iterator().next().equals(deserializedChildManager.getBeans(Dummy.class).iterator().next());
+   }
+   
+   
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import static org.jboss.weld.tests.builtinBeans.Checker.checkBeanManager;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkEquality;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkEvent;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkInjectionPoint;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkInstance;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkPrincipal;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkUserTransaction;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkValidator;
-import static org.jboss.weld.tests.builtinBeans.Checker.checkValidatorFactory;
-
-import java.security.Principal;
-
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.transaction.UserTransaction;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
-public class BuiltInBeanPassivationCapableTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testDefaultValidatorBean() throws Throwable
-   {
-      Validator validator = getReference(Validator.class);
-      Validator validator1 = Utils.deserialize(Utils.serialize(validator));
-      assert checkValidator(validator1);
-   }
-
-   @Test
-   public void testDefaultValidatorFactoryBean() throws Throwable
-   {
-      ValidatorFactory validatorFactory = getReference(ValidatorFactory.class);
-      ValidatorFactory validatorFactory1 = Utils.deserialize(Utils.serialize(validatorFactory));
-      assert checkValidatorFactory(validatorFactory1);
-   }
-
-   @Test(groups="incontainer-broken")
-   public void testPrincipal() throws Throwable
-   {
-      Principal principal = getReference(Principal.class);
-      Principal principal1 = Utils.deserialize(Utils.serialize(principal));
-      assert checkPrincipal(principal1);
-   }
-
-   @Test
-   public void testUserTransactionBean() throws Throwable
-   {
-      UserTransaction userTransaction = getReference(UserTransaction.class);
-      UserTransaction userTransaction1 = Utils.deserialize(Utils.serialize(userTransaction));
-      assert checkUserTransaction(userTransaction1);
-   }
-   
-   @Test 
-   public void testBeanManagerBean() throws Throwable
-   {
-      BeanManager beanManager = getReference(BeanManager.class);
-      BeanManager beanManager1 = Utils.deserialize(Utils.serialize(beanManager));
-      assert checkBeanManager(beanManager1);
-      assert checkEquality(beanManager, beanManager1);
-   }
-   
-   @Test
-   public void testInstance() throws Throwable
-   {
-      Instance<Cow> instance = getReference(Consumer.class).getCow();
-      Instance<Cow> instance1 = Utils.deserialize(Utils.serialize(instance));
-      assert checkInstance(instance1);
-      assert checkEquality(instance, instance1);
-   }
-   
-   @Test
-   public void testEvent() throws Throwable
-   {
-      Event<Cow> event = getReference(Consumer.class).getEvent();
-      CowEventObserver observer = getReference(CowEventObserver.class);
-      Event<Cow> event1 = Utils.deserialize(Utils.serialize(event));
-      assert checkEvent(event1, observer);
-      assert checkEquality(event, event1);
-   }
-   
-   @Test
-   public void testFieldInjectionPoint() throws Throwable
-   {
-      Dog.reset();
-      getReference(FieldInjectionPointConsumer.class).ping();
-      InjectionPoint injectionPoint = Dog.getInjectionPoint();
-      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
-      assert checkInjectionPoint(injectionPoint1, FieldInjectionPointConsumer.class);
-      assert checkEquality(injectionPoint, injectionPoint1);
-   }
-   
-   @Test
-   public void testConstructorInjectionPoint() throws Throwable
-   {
-      Dog.reset();
-      getReference(ConstructorInjectionPointConsumer.class).ping();
-      InjectionPoint injectionPoint = Dog.getInjectionPoint();
-      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
-      assert checkInjectionPoint(injectionPoint1, ConstructorInjectionPointConsumer.class);
-      assert checkEquality(injectionPoint, injectionPoint1);
-   }
-   
-   @Test
-   public void testMethodInjectionPoint() throws Throwable
-   {
-      Dog.reset();
-      getReference(MethodInjectionPointConsumer.class).ping();
-      InjectionPoint injectionPoint = Dog.getInjectionPoint();
-      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
-      assert checkInjectionPoint(injectionPoint1, MethodInjectionPointConsumer.class);
-      assert checkEquality(injectionPoint, injectionPoint1);
-   }
-   
-   @Test
-   public void testAllOnBean() throws Throwable
-   {
-      Consumer consumer = getReference(Consumer.class);
-      consumer.check();
-      Consumer consumer1 = Utils.deserialize(Utils.serialize(consumer));
-      consumer1.check();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/BuiltInBeanPassivationCapableTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import static org.jboss.weld.tests.builtinBeans.Checker.checkBeanManager;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkEquality;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkEvent;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkInjectionPoint;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkInstance;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkPrincipal;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkUserTransaction;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkValidator;
+import static org.jboss.weld.tests.builtinBeans.Checker.checkValidatorFactory;
+
+import java.security.Principal;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.transaction.UserTransaction;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class BuiltInBeanPassivationCapableTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testDefaultValidatorBean() throws Throwable
+   {
+      Validator validator = getReference(Validator.class);
+      Validator validator1 = Utils.deserialize(Utils.serialize(validator));
+      assert checkValidator(validator1);
+   }
+
+   @Test
+   public void testDefaultValidatorFactoryBean() throws Throwable
+   {
+      ValidatorFactory validatorFactory = getReference(ValidatorFactory.class);
+      ValidatorFactory validatorFactory1 = Utils.deserialize(Utils.serialize(validatorFactory));
+      assert checkValidatorFactory(validatorFactory1);
+   }
+
+   @Test(groups="incontainer-broken")
+   public void testPrincipal() throws Throwable
+   {
+      Principal principal = getReference(Principal.class);
+      Principal principal1 = Utils.deserialize(Utils.serialize(principal));
+      assert checkPrincipal(principal1);
+   }
+
+   @Test
+   public void testUserTransactionBean() throws Throwable
+   {
+      UserTransaction userTransaction = getReference(UserTransaction.class);
+      UserTransaction userTransaction1 = Utils.deserialize(Utils.serialize(userTransaction));
+      assert checkUserTransaction(userTransaction1);
+   }
+   
+   @Test 
+   public void testBeanManagerBean() throws Throwable
+   {
+      BeanManager beanManager = getReference(BeanManager.class);
+      BeanManager beanManager1 = Utils.deserialize(Utils.serialize(beanManager));
+      assert checkBeanManager(beanManager1);
+      assert checkEquality(beanManager, beanManager1);
+   }
+   
+   @Test
+   public void testInstance() throws Throwable
+   {
+      Instance<Cow> instance = getReference(Consumer.class).getCow();
+      Instance<Cow> instance1 = Utils.deserialize(Utils.serialize(instance));
+      assert checkInstance(instance1);
+      assert checkEquality(instance, instance1);
+   }
+   
+   @Test
+   public void testEvent() throws Throwable
+   {
+      Event<Cow> event = getReference(Consumer.class).getEvent();
+      CowEventObserver observer = getReference(CowEventObserver.class);
+      Event<Cow> event1 = Utils.deserialize(Utils.serialize(event));
+      assert checkEvent(event1, observer);
+      assert checkEquality(event, event1);
+   }
+   
+   @Test
+   public void testFieldInjectionPoint() throws Throwable
+   {
+      Dog.reset();
+      getReference(FieldInjectionPointConsumer.class).ping();
+      InjectionPoint injectionPoint = Dog.getInjectionPoint();
+      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
+      assert checkInjectionPoint(injectionPoint1, FieldInjectionPointConsumer.class);
+      assert checkEquality(injectionPoint, injectionPoint1);
+   }
+   
+   @Test
+   public void testConstructorInjectionPoint() throws Throwable
+   {
+      Dog.reset();
+      getReference(ConstructorInjectionPointConsumer.class).ping();
+      InjectionPoint injectionPoint = Dog.getInjectionPoint();
+      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
+      assert checkInjectionPoint(injectionPoint1, ConstructorInjectionPointConsumer.class);
+      assert checkEquality(injectionPoint, injectionPoint1);
+   }
+   
+   @Test
+   public void testMethodInjectionPoint() throws Throwable
+   {
+      Dog.reset();
+      getReference(MethodInjectionPointConsumer.class).ping();
+      InjectionPoint injectionPoint = Dog.getInjectionPoint();
+      InjectionPoint injectionPoint1 = Utils.deserialize(Utils.serialize(injectionPoint));
+      assert checkInjectionPoint(injectionPoint1, MethodInjectionPointConsumer.class);
+      assert checkEquality(injectionPoint, injectionPoint1);
+   }
+   
+   @Test
+   public void testAllOnBean() throws Throwable
+   {
+      Consumer consumer = getReference(Consumer.class);
+      consumer.check();
+      Consumer consumer1 = Utils.deserialize(Utils.serialize(consumer));
+      consumer1.check();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.security.Principal;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-public class Checker
-{
-   
-   public static boolean checkPrincipal(Principal principal)
-   {
-      principal.getName();
-      return true;
-   }
-   
-   public static boolean checkBeanManager(BeanManager beanManager)
-   {
-      return beanManager != null && beanManager.isScope(ApplicationScoped.class);
-   }
-   
-   public static boolean checkUserTransaction(UserTransaction userTransaction)
-   {
-      try
-      {
-         if (userTransaction != null)
-         {
-            userTransaction.getStatus();
-            return true;
-         }
-      }
-      catch (SystemException e)
-      {
-         throw new RuntimeException(e);
-      }
-      return false;
-   }
-   
-   public static boolean checkValidator(Validator validator)
-   {
-      try
-      {
-         if (validator != null)
-         {
-            validator.unwrap(String.class);
-         }
-      }
-      catch (ValidationException e)
-      {
-         return true;
-      }
-      return false;
-   }
-
-   public static boolean checkValidatorFactory(ValidatorFactory validatorFactory)
-   {
-      try
-      {
-         if (validatorFactory != null)
-         {
-            validatorFactory.unwrap(String.class);
-         }
-      }
-      catch (ValidationException e)
-      {
-         return true;
-      }
-      return false;
-   }
-   
-   public static boolean checkInstance(Instance<Cow> cow)
-   {
-      if (cow != null && cow.get() != null)
-      {
-         return cow.get().getName().equals("Daisy");
-      }
-      else
-      {
-         return false;
-      }
-   }
-   
-   public static boolean checkEvent(Event<Cow> cowEvent, CowEventObserver observer)
-   {
-      observer.reset();
-      if (cowEvent != null)
-      {
-         cowEvent.fire(new Cow());
-         return observer.isObserved(); 
-      }
-      else
-      {
-         return false;
-      }
-   }
-
-   public static boolean checkInjectionPoint(InjectionPoint injectionPoint, Class<?> injectedClass)
-   {
-      if (injectionPoint != null)
-      {
-         return injectedClass.equals(injectionPoint.getBean().getBeanClass());
-      }
-      else
-      {
-         return false;
-      }
-   }
-   
-   public static boolean checkEquality(Object object1, Object object2)
-   {
-      return object1.equals(object2) && object1.hashCode() == object2.hashCode();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Checker.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.security.Principal;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+public class Checker
+{
+   
+   public static boolean checkPrincipal(Principal principal)
+   {
+      principal.getName();
+      return true;
+   }
+   
+   public static boolean checkBeanManager(BeanManager beanManager)
+   {
+      return beanManager != null && beanManager.isScope(ApplicationScoped.class);
+   }
+   
+   public static boolean checkUserTransaction(UserTransaction userTransaction)
+   {
+      try
+      {
+         if (userTransaction != null)
+         {
+            userTransaction.getStatus();
+            return true;
+         }
+      }
+      catch (SystemException e)
+      {
+         throw new RuntimeException(e);
+      }
+      return false;
+   }
+   
+   public static boolean checkValidator(Validator validator)
+   {
+      try
+      {
+         if (validator != null)
+         {
+            validator.unwrap(String.class);
+         }
+      }
+      catch (ValidationException e)
+      {
+         return true;
+      }
+      return false;
+   }
+
+   public static boolean checkValidatorFactory(ValidatorFactory validatorFactory)
+   {
+      try
+      {
+         if (validatorFactory != null)
+         {
+            validatorFactory.unwrap(String.class);
+         }
+      }
+      catch (ValidationException e)
+      {
+         return true;
+      }
+      return false;
+   }
+   
+   public static boolean checkInstance(Instance<Cow> cow)
+   {
+      if (cow != null && cow.get() != null)
+      {
+         return cow.get().getName().equals("Daisy");
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+   public static boolean checkEvent(Event<Cow> cowEvent, CowEventObserver observer)
+   {
+      observer.reset();
+      if (cowEvent != null)
+      {
+         cowEvent.fire(new Cow());
+         return observer.isObserved(); 
+      }
+      else
+      {
+         return false;
+      }
+   }
+
+   public static boolean checkInjectionPoint(InjectionPoint injectionPoint, Class<?> injectedClass)
+   {
+      if (injectionPoint != null)
+      {
+         return injectedClass.equals(injectionPoint.getBean().getBeanClass());
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+   public static boolean checkEquality(Object object1, Object object2)
+   {
+      return object1.equals(object2) && object1.hashCode() == object2.hashCode();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class ConstructorInjectionPointConsumer implements Serializable
-{
-   
-   public ConstructorInjectionPointConsumer() {}
-   
-   @Inject
-   public ConstructorInjectionPointConsumer(Dog dog) {}
-   
-   public void ping() {}
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ConstructorInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class ConstructorInjectionPointConsumer implements Serializable
+{
+   
+   public ConstructorInjectionPointConsumer() {}
+   
+   @Inject
+   public ConstructorInjectionPointConsumer(Dog dog) {}
+   
+   public void ping() {}
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.transaction.UserTransaction;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
- at SessionScoped
-public class Consumer implements Serializable
-{
-   
-   @Inject Validator validator;
-   @Inject ValidatorFactory validatorFactory;
-   // Not working incontainer as there is no principal
-   //@Inject Principal principal;
-   @Inject UserTransaction userTransaction;
-   @Inject BeanManager beanManager;
-   @Inject Instance<Cow> cow;
-   @Inject Event<Cow> event;
-   @Inject CowEventObserver observer;
-   
-   @PostConstruct
-   public void postConstruct()
-   {
-      cow.get().setName("Daisy");
-   }
-   
-   public Instance<Cow> getCow()
-   {
-      return cow;
-   }
-   
-   public Event<Cow> getEvent()
-   {
-      return event;
-   }
-   
-   public void check()
-   {
-      assert Checker.checkBeanManager(beanManager);
-
-      // Not working incontainer as there is no principal
-      //assert Checker.checkPrincipal(principal);
-      assert Checker.checkUserTransaction(userTransaction);
-      assert Checker.checkValidator(validator);
-      assert Checker.checkValidatorFactory(validatorFactory);
-      assert Checker.checkInstance(cow);
-      assert Checker.checkEvent(event, observer);
-   }
-   
-   
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.transaction.UserTransaction;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+ at SessionScoped
+public class Consumer implements Serializable
+{
+   
+   @Inject Validator validator;
+   @Inject ValidatorFactory validatorFactory;
+   // Not working incontainer as there is no principal
+   //@Inject Principal principal;
+   @Inject UserTransaction userTransaction;
+   @Inject BeanManager beanManager;
+   @Inject Instance<Cow> cow;
+   @Inject Event<Cow> event;
+   @Inject CowEventObserver observer;
+   
+   @PostConstruct
+   public void postConstruct()
+   {
+      cow.get().setName("Daisy");
+   }
+   
+   public Instance<Cow> getCow()
+   {
+      return cow;
+   }
+   
+   public Event<Cow> getEvent()
+   {
+      return event;
+   }
+   
+   public void check()
+   {
+      assert Checker.checkBeanManager(beanManager);
+
+      // Not working incontainer as there is no principal
+      //assert Checker.checkPrincipal(principal);
+      assert Checker.checkUserTransaction(userTransaction);
+      assert Checker.checkValidator(validator);
+      assert Checker.checkValidatorFactory(validatorFactory);
+      assert Checker.checkInstance(cow);
+      assert Checker.checkEvent(event, observer);
+   }
+   
+   
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-public class Cow
-{
-   
-   private String name;
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+public class Cow
+{
+   
+   private String name;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-
- at ApplicationScoped
-public class CowEventObserver implements Serializable
-{
-   
-   private boolean observed;
-   
-   public void observeEvent(@Observes Cow cow)
-   {
-      this.observed = true;
-   }
-   
-   public boolean isObserved()
-   {
-      return observed;
-   }
-   
-   public void reset()
-   {
-      this.observed = false;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/CowEventObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+ at ApplicationScoped
+public class CowEventObserver implements Serializable
+{
+   
+   private boolean observed;
+   
+   public void observeEvent(@Observes Cow cow)
+   {
+      this.observed = true;
+   }
+   
+   public boolean isObserved()
+   {
+      return observed;
+   }
+   
+   public void reset()
+   {
+      this.observed = false;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-
-public class Dog implements Serializable
-{
-   
-   private static InjectionPoint injectionPoint;
-   
-   @Inject
-   public Dog(InjectionPoint injectionPoint)
-   {
-      Dog.injectionPoint = injectionPoint;
-   }
-   
-   public static void reset()
-   {
-      Dog.injectionPoint = null;
-   }
-   
-   public static InjectionPoint getInjectionPoint()
-   {
-      return injectionPoint;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Dog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+public class Dog implements Serializable
+{
+   
+   private static InjectionPoint injectionPoint;
+   
+   @Inject
+   public Dog(InjectionPoint injectionPoint)
+   {
+      Dog.injectionPoint = injectionPoint;
+   }
+   
+   public static void reset()
+   {
+      Dog.injectionPoint = null;
+   }
+   
+   public static InjectionPoint getInjectionPoint()
+   {
+      return injectionPoint;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class FieldInjectionPointConsumer implements Serializable
-{
-   
-   @Inject Dog dogField;
-   
-   public void ping() {}
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/FieldInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class FieldInjectionPointConsumer implements Serializable
+{
+   
+   @Inject Dog dogField;
+   
+   public void ping() {}
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class MethodInjectionPointConsumer implements Serializable
-{
-   
-   @Inject
-   public void setDog(Dog dog) {}
-   
-   public void ping() {}
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/MethodInjectionPointConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class MethodInjectionPointConsumer implements Serializable
+{
+   
+   @Inject
+   public void setDog(Dog dog) {}
+   
+   public void ping() {}
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
-
-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;
-
- at Qualifier
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
- at interface Produced
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/Produced.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans;
+
+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;
+
+ at Qualifier
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+ at interface Produced
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-public class Checker
-{
-   
-   public static boolean checkUserTransaction(UserTransaction userTransaction)
-   {
-      try
-      {
-         if (userTransaction != null)
-         {
-            userTransaction.getStatus();
-            return true;
-         }
-      }
-      catch (SystemException e)
-      {
-         throw new RuntimeException(e);
-      }
-      return false;
-   }
-   
-   
-   public static boolean checkEntityManager(EntityManager entityManager)
-   {
-      if (entityManager != null)
-      {
-         return entityManager.isOpen();
-      }
-      else
-      {
-         return false;
-      }
-   }
-   
-   public static boolean checkEntityManagerFactory(EntityManagerFactory entityManagerFactory)
-   {
-      if (entityManagerFactory != null)
-      {
-         return entityManagerFactory.isOpen();
-      }
-      else
-      {
-         return false;
-      }
-   }
-   
-   public static boolean checkRemoteEjb(HorseRemote horse)
-   {
-      if (horse != null)
-      {
-         return horse.ping();
-      }
-      else
-      {
-         return false;
-      }
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Checker.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+public class Checker
+{
+   
+   public static boolean checkUserTransaction(UserTransaction userTransaction)
+   {
+      try
+      {
+         if (userTransaction != null)
+         {
+            userTransaction.getStatus();
+            return true;
+         }
+      }
+      catch (SystemException e)
+      {
+         throw new RuntimeException(e);
+      }
+      return false;
+   }
+   
+   
+   public static boolean checkEntityManager(EntityManager entityManager)
+   {
+      if (entityManager != null)
+      {
+         return entityManager.isOpen();
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+   public static boolean checkEntityManagerFactory(EntityManagerFactory entityManagerFactory)
+   {
+      if (entityManagerFactory != null)
+      {
+         return entityManagerFactory.isOpen();
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+   public static boolean checkRemoteEjb(HorseRemote horse)
+   {
+      if (horse != null)
+      {
+         return horse.ping();
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManager;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManagerFactory;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkRemoteEjb;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkUserTransaction;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.UserTransaction;
-
- at SessionScoped
-public class EEResourceConsumer implements Serializable
-{
-   
-   @Inject @Produced UserTransaction userTransaction;
-   @Inject @Produced EntityManager entityManager;
-   @Inject @Produced EntityManagerFactory entityManagerFactory;
-   @Inject @Produced HorseRemote horse;
-   
-   public void check()
-   {
-      assert checkUserTransaction(userTransaction);
-      assert checkEntityManager(entityManager);
-      assert checkEntityManagerFactory(entityManagerFactory);
-      assert checkRemoteEjb(horse);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManager;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManagerFactory;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkRemoteEjb;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkUserTransaction;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.transaction.UserTransaction;
+
+ at SessionScoped
+public class EEResourceConsumer implements Serializable
+{
+   
+   @Inject @Produced UserTransaction userTransaction;
+   @Inject @Produced EntityManager entityManager;
+   @Inject @Produced EntityManagerFactory entityManagerFactory;
+   @Inject @Produced HorseRemote horse;
+   
+   public void check()
+   {
+      assert checkUserTransaction(userTransaction);
+      assert checkEntityManager(entityManager);
+      assert checkEntityManagerFactory(entityManagerFactory);
+      assert checkRemoteEjb(horse);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import javax.transaction.UserTransaction;
-
-public class EEResourceProducer
-{
-   
-   @Resource(mappedName="java:comp/UserTransaction")
-   @Produced
-   @Produces
-   private UserTransaction transaction;
-   
-   @PersistenceContext
-   @Produces
-   @Produced
-   private EntityManager entityManager;
-   
-   @PersistenceUnit
-   @Produces
-   @Produced
-   private EntityManagerFactory entityManagerFactory;
-   
-   @EJB
-   @Produces
-   @Produced
-   private HorseRemote horse;
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.transaction.UserTransaction;
+
+public class EEResourceProducer
+{
+   
+   @Resource(mappedName="java:comp/UserTransaction")
+   @Produced
+   @Produces
+   private UserTransaction transaction;
+   
+   @PersistenceContext
+   @Produces
+   @Produced
+   private EntityManager entityManager;
+   
+   @PersistenceUnit
+   @Produces
+   @Produced
+   private EntityManagerFactory entityManagerFactory;
+   
+   @EJB
+   @Produces
+   @Produced
+   private HorseRemote horse;
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManager;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManagerFactory;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkRemoteEjb;
-import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkUserTransaction;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.util.AnnotationLiteral;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.UserTransaction;
-
-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.testharness.impl.packaging.Resource;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
- at Resource(source = "persistence.xml", destination = "META-INF/persistence.xml")
-public class EEResourceProducerFieldPassivationCapableTest extends AbstractWeldTest
-{
-   
-   private static final Annotation PRODUCED = new AnnotationLiteral<Produced>() {};
-   
-   @Test
-   public void testResource() throws Throwable
-   {
-      UserTransaction userTransaction = getReference(UserTransaction.class, PRODUCED);
-      UserTransaction userTransaction1 = Utils.deserialize(Utils.serialize(userTransaction));
-      assert checkUserTransaction(userTransaction1);
-   }
-   
-   @Test
-   public void testEntityManager() throws Throwable
-   {
-      EntityManager entityManager = getReference(EntityManager.class, PRODUCED);
-      EntityManager entityManager1 = Utils.deserialize(Utils.serialize(entityManager));
-      assert checkEntityManager(entityManager1);
-   }
-   
-   @Test
-   public void testEntityManagerFactory() throws Throwable
-   {
-      EntityManagerFactory entityManagerFactory = getReference(EntityManagerFactory.class, PRODUCED);
-      EntityManagerFactory entityManagerFactory1 = Utils.deserialize(Utils.serialize(entityManagerFactory));
-      assert checkEntityManagerFactory(entityManagerFactory1);
-   }
-   
-   @Test
-   public void testRemoteEjb() throws Throwable
-   {
-      HorseRemote horse = getReference(HorseRemote.class, PRODUCED);
-      HorseRemote horse1 = Utils.deserialize(Utils.serialize(horse));
-      assert checkRemoteEjb(horse1);
-   }
-   
-   @Test
-   public void testAllOnBean() throws Throwable
-   {
-      EEResourceConsumer consumer = getReference(EEResourceConsumer.class);
-      consumer.check();
-      EEResourceConsumer consumer1 = Utils.deserialize(Utils.serialize(consumer));
-      consumer1.check();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManager;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkEntityManagerFactory;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkRemoteEjb;
+import static org.jboss.weld.tests.builtinBeans.ee.Checker.checkUserTransaction;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.transaction.UserTransaction;
+
+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.testharness.impl.packaging.Resource;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at Resource(source = "persistence.xml", destination = "META-INF/persistence.xml")
+public class EEResourceProducerFieldPassivationCapableTest extends AbstractWeldTest
+{
+   
+   private static final Annotation PRODUCED = new AnnotationLiteral<Produced>() {};
+   
+   @Test
+   public void testResource() throws Throwable
+   {
+      UserTransaction userTransaction = getReference(UserTransaction.class, PRODUCED);
+      UserTransaction userTransaction1 = Utils.deserialize(Utils.serialize(userTransaction));
+      assert checkUserTransaction(userTransaction1);
+   }
+   
+   @Test
+   public void testEntityManager() throws Throwable
+   {
+      EntityManager entityManager = getReference(EntityManager.class, PRODUCED);
+      EntityManager entityManager1 = Utils.deserialize(Utils.serialize(entityManager));
+      assert checkEntityManager(entityManager1);
+   }
+   
+   @Test
+   public void testEntityManagerFactory() throws Throwable
+   {
+      EntityManagerFactory entityManagerFactory = getReference(EntityManagerFactory.class, PRODUCED);
+      EntityManagerFactory entityManagerFactory1 = Utils.deserialize(Utils.serialize(entityManagerFactory));
+      assert checkEntityManagerFactory(entityManagerFactory1);
+   }
+   
+   @Test
+   public void testRemoteEjb() throws Throwable
+   {
+      HorseRemote horse = getReference(HorseRemote.class, PRODUCED);
+      HorseRemote horse1 = Utils.deserialize(Utils.serialize(horse));
+      assert checkRemoteEjb(horse1);
+   }
+   
+   @Test
+   public void testAllOnBean() throws Throwable
+   {
+      EEResourceConsumer consumer = getReference(EEResourceConsumer.class);
+      consumer.check();
+      EEResourceConsumer consumer1 = Utils.deserialize(Utils.serialize(consumer));
+      consumer1.check();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import javax.ejb.Stateful;
-
-
- at Stateful
-public class Horse implements HorseRemote
-{
-   public boolean ping()
-   {
-      return true;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import javax.ejb.Stateful;
+
+
+ at Stateful
+public class Horse implements HorseRemote
+{
+   public boolean ping()
+   {
+      return true;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface HorseRemote
-{
-
-   public boolean ping();
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/HorseRemote.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface HorseRemote
+{
+
+   public boolean ping();
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
-
-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;
-
- at Qualifier
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
- at interface Produced
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/ee/Produced.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.ee;
+
+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;
+
+ at Qualifier
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+ at interface Produced
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471 (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.New;
-import javax.inject.Inject;
-
- at ApplicationScoped
-public class Bar {
-	@Inject @New private Instance<Foo> foo;
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+public class Bar {
+	@Inject @New private Instance<Foo> foo;
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
-
-import javax.enterprise.context.ApplicationScoped;
-
- at ApplicationScoped
-public class Foo {
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
+
+import javax.enterprise.context.ApplicationScoped;
+
+ at ApplicationScoped
+public class Foo {
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class InstanceTest extends AbstractWeldTest {
-
-	@Test
-	public void testNewInstance() {
-	}
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/builtinBeans/weld471/InstanceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.builtinBeans.weld471;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class InstanceTest extends AbstractWeldTest {
+
+	@Test
+	public void testNewInstance() {
+	}
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedObject.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedObject.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedObject.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedObject.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+ at ApplicationScoped
+public class ApplicationScopedObject
+{
+   private AtomicInteger counter = new AtomicInteger();
+
+   public void increment()
+   {
+      counter.incrementAndGet();
+   }
+   public int getValue()
+   {
+      return counter.get();
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ApplicationScopedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import java.util.concurrent.CountDownLatch;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ApplicationScopedTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testConcurrentInitilized() throws InterruptedException
+   {
+      final CountDownLatch latch = new CountDownLatch(10);
+      final ApplicationScopedObject applictionScopedObject = getReference(ApplicationScopedObject.class);
+      for (int i = 0; i < 10; i++)
+      {
+         new Thread(new Runnable()
+         {
+            public void run()
+            {
+               try
+               {
+                  applictionScopedObject.increment();
+               }
+               finally
+               {
+                  latch.countDown();
+               }
+            }
+         }).start();
+      }
+      latch.await();
+      int value = applictionScopedObject.getValue();
+      assert value == 10;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ContextTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ContextTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ContextTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ContextTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Conversation;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ContextTest extends AbstractWeldTest
+{
+
+   @Test(description = "WELD-348")
+   public void testCallToConversationWithContextNotActive()
+   {
+      boolean alreadyActive = false;
+      try
+      {
+         alreadyActive = Container.instance().services().get(ContextLifecycle.class).isConversationActive();
+         if (alreadyActive)
+         {
+            Container.instance().services().get(ContextLifecycle.class).getConversationContext().setActive(false);
+         }
+         try
+         {
+            getReference(Conversation.class).getId();
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).getTimeout();
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).begin();
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).begin("foo");
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).end();
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).isTransient();
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+         try
+         {
+            getReference(Conversation.class).setTimeout(0);
+            assert false;
+         }
+         catch (ContextNotActiveException e) 
+         {
+            // Expected
+         }
+         catch (Exception e) 
+         {
+            assert false;
+         }
+      }
+      finally
+      {
+         if (alreadyActive)
+         {
+            Container.instance().services().get(ContextLifecycle.class).getConversationContext().setActive(true);
+         }
+      }
+      
+   }
+   
+   
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScoped.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScoped.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScoped.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScoped.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+public class ParameterizedTypeScoped
+{
+
+   @RequestScoped
+   @Produces
+   public List<String> create()
+   {
+      return Arrays.asList("iemon", "houjitya");
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScopedTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScopedTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScopedTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/ParameterizedTypeScopedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import java.util.List;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ParameterizedTypeScopedTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testStringList()
+   {
+      List<String> str = getReference(StringHolder.class).getStrings();
+      assert str.size() == 2;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/PassivatingContextTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/PassivatingContextTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/PassivatingContextTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/PassivatingContextTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.metadata.cache.MetaAnnotationStore;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class PassivatingContextTest extends org.jboss.weld.test.AbstractWeldTest
+{
+   
+   /**
+    * The built-in session and conversation scopes are passivating. No other
+    * built-in scope is passivating.
+    */
+   @Test(groups = { "contexts", "passivation" })
+   public void testIsSessionScopePassivating()
+   {
+      assert getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(SessionScoped.class).isPassivating();
+   }
+
+   /**
+    * The built-in session and conversation scopes are passivating. No other
+    * built-in scope is passivating.
+    */
+   @Test(groups = { "contexts", "passivation" })
+   public void testIsConversationScopePassivating()
+   {
+      assert getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(ConversationScoped.class).isPassivating();
+   }
+
+   /**
+    * The built-in session and conversation scopes are passivating. No other
+    * built-in scope is passivating.
+    */
+   @Test(groups = { "contexts", "passivation" })
+   public void testIsApplicationScopeNonPassivating()
+   {
+      assert !getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(ApplicationScoped.class).isPassivating();
+   }
+
+   /**
+    * The built-in session and conversation scopes are passivating. No other
+    * built-in scope is passivating.
+    */
+   @Test(groups = { "contexts", "passivation" })
+   public void testIsRequestScopeNonPassivating()
+   {
+      assert !getCurrentManager().getServices().get(MetaAnnotationStore.class).getScopeModel(RequestScoped.class).isPassivating();
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/StringHolder.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/StringHolder.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/StringHolder.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/StringHolder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.contexts;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+
+public class StringHolder
+{
+
+   @Inject 
+   private List<String> strings;
+   
+   public List<String> getStrings()
+   {
+      return strings;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface SimpleBean
-{
-   int echo1(int i);
-   
-   int echo2(int i);
-   
-   int echo3(int i);
-   
-   int echo4(int i);
-
-   boolean isInvoked();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface SimpleBean
+{
+   int echo1(int i);
+   
+   int echo2(int i);
+   
+   int echo3(int i);
+   
+   int echo4(int i);
+
+   boolean isInvoked();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class SimpleBeanImpl implements SimpleBean
-{
-
-   private boolean invoked  = false;
-
-   public int echo1(int i)
-   {
-      invoked = true;
-      return i;
-   }
-
-   public int echo2(int i)
-   {
-      invoked = true;
-      return i;
-   }
-
-   public int echo3(int i)
-   {
-      invoked = true;
-      return i;
-   }
-
-   public int echo4(int i)
-   {
-      invoked = true;
-      return i;
-   }
-
-   public boolean isInvoked()
-   {
-      return invoked;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class SimpleBeanImpl implements SimpleBean
+{
+
+   private boolean invoked  = false;
+
+   public int echo1(int i)
+   {
+      invoked = true;
+      return i;
+   }
+
+   public int echo2(int i)
+   {
+      invoked = true;
+      return i;
+   }
+
+   public int echo3(int i)
+   {
+      invoked = true;
+      return i;
+   }
+
+   public int echo4(int i)
+   {
+      invoked = true;
+      return i;
+   }
+
+   public boolean isInvoked()
+   {
+      return invoked;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Decorator
-public abstract class SimpleDecorator1 implements SimpleBean
-{
-   @Inject @Delegate
-   SimpleBean delegate;
-   
-   public static boolean echo1;
-   public static boolean echo3;
-   
-   public static void reset()
-   {
-      echo1 = false;
-      echo3 = false;
-   }
-   
-   public int echo1(int i)
-   {
-      echo1 = true;
-      return delegate.echo1(i);
-   }
-
-   public int echo3(int i)
-   {
-      echo3 = true;
-      return delegate.echo3(i);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Decorator
+public abstract class SimpleDecorator1 implements SimpleBean
+{
+   @Inject @Delegate
+   SimpleBean delegate;
+   
+   public static boolean echo1;
+   public static boolean echo3;
+   
+   public static void reset()
+   {
+      echo1 = false;
+      echo3 = false;
+   }
+   
+   public int echo1(int i)
+   {
+      echo1 = true;
+      return delegate.echo1(i);
+   }
+
+   public int echo3(int i)
+   {
+      echo3 = true;
+      return delegate.echo3(i);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Decorator
-public abstract class SimpleDecorator2 implements SimpleBean
-{
-   @Inject  @Delegate
-   SimpleBean delegate;
-   
-   public static boolean echo2;
-   public static boolean echo3;
-   
-   public static void reset()
-   {
-      echo2 = false;
-      echo3 = false;
-   }
-
-   public int echo2(int i)
-   {
-      echo2 = true;
-      return delegate.echo2(i);
-   }
-
-   public int echo3(int i)
-   {
-      echo3 = true;
-      return delegate.echo3(i);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecorator2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Decorator
+public abstract class SimpleDecorator2 implements SimpleBean
+{
+   @Inject  @Delegate
+   SimpleBean delegate;
+   
+   public static boolean echo2;
+   public static boolean echo3;
+   
+   public static void reset()
+   {
+      echo2 = false;
+      echo3 = false;
+   }
+
+   public int echo2(int i)
+   {
+      echo2 = true;
+      return delegate.echo2(i);
+   }
+
+   public int echo3(int i)
+   {
+      echo3 = true;
+      return delegate.echo3(i);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Artifact
- at BeansXml("beans.xml")
-public class SimpleDecoratorTest extends AbstractWeldTest
-{
-   @Test
-   public void testSimpleDecorator()
-   {
-      SimpleBean simpleBean = getReference(SimpleBean.class);
-      
-      resetDecorators();
-      assert simpleBean.echo1(1) == 1;
-      assertDecorators(true, false, false);
-      assert simpleBean.isInvoked();
-      
-      resetDecorators();
-      assert simpleBean.echo2(2) == 2;
-      assertDecorators(false, true, false);
-      assert simpleBean.isInvoked();
-
-      //Only SimpleDecorator1 gets invoked, although I think SimpleDecorator2 should get invoked too
-      resetDecorators();
-      assert simpleBean.echo3(3) == 3;
-      assertDecorators(false, false, true);
-
-      assert simpleBean.isInvoked();
-
-      resetDecorators();
-      assert simpleBean.echo4(4) == 4; 
-      assertDecorators(false, false, false);
-
-      assert simpleBean.isInvoked();
-   }
-   
-   private void resetDecorators()
-   {
-      SimpleDecorator1.reset();
-      SimpleDecorator2.reset();
-   }
-   
-   private void assertDecorators(boolean echo1, boolean echo2, boolean echo3)
-   {
-      assert SimpleDecorator1.echo1 == echo1;
-      assert SimpleDecorator1.echo3 == echo3;
-      assert SimpleDecorator2.echo2 == echo2;
-      assert SimpleDecorator2.echo3 == echo3;
-   }
-}
-

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+public class SimpleDecoratorTest extends AbstractWeldTest
+{
+   @Test
+   public void testSimpleDecorator()
+   {
+      SimpleBean simpleBean = getReference(SimpleBean.class);
+      
+      resetDecorators();
+      assert simpleBean.echo1(1) == 1;
+      assertDecorators(true, false, false);
+      assert simpleBean.isInvoked();
+      
+      resetDecorators();
+      assert simpleBean.echo2(2) == 2;
+      assertDecorators(false, true, false);
+      assert simpleBean.isInvoked();
+
+      //Only SimpleDecorator1 gets invoked, although I think SimpleDecorator2 should get invoked too
+      resetDecorators();
+      assert simpleBean.echo3(3) == 3;
+      assertDecorators(false, false, true);
+
+      assert simpleBean.isInvoked();
+
+      resetDecorators();
+      assert simpleBean.echo4(4) == 4; 
+      assertDecorators(false, false, false);
+
+      assert simpleBean.isInvoked();
+   }
+   
+   private void resetDecorators()
+   {
+      SimpleDecorator1.reset();
+      SimpleDecorator2.reset();
+   }
+   
+   private void assertDecorators(boolean echo1, boolean echo2, boolean echo3)
+   {
+      assert SimpleDecorator1.echo1 == echo1;
+      assert SimpleDecorator1.echo3 == echo3;
+      assert SimpleDecorator2.echo2 == echo2;
+      assert SimpleDecorator2.echo3 == echo3;
+   }
+}
+

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
-public class AbstractDecoratorTestHelper
-{
-   static void resetAll()
-   {
-      WindowImpl.drawn = false;
-      WindowImpl.moved = false;
-      FrameWithFieldInjectedDelegate.drawn = false;
-      FrameWithFieldInjectedDelegateAndAbstractMethod.moved = false;
-      FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.moved = false;
-      FrameWithConstructorInjectedDelegate.drawn = false;
-      FrameWithConstructorInjectedDelegateAndAbstractMethod.moved = false;
-      FrameWithInitializerMethodInjectedDelegate.drawn = false;
-      FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved = false;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/AbstractDecoratorTestHelper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+public class AbstractDecoratorTestHelper
+{
+   static void resetAll()
+   {
+      WindowImpl.drawn = false;
+      WindowImpl.moved = false;
+      FrameWithFieldInjectedDelegate.drawn = false;
+      FrameWithFieldInjectedDelegateAndAbstractMethod.moved = false;
+      FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.moved = false;
+      FrameWithConstructorInjectedDelegate.drawn = false;
+      FrameWithConstructorInjectedDelegateAndAbstractMethod.moved = false;
+      FrameWithInitializerMethodInjectedDelegate.drawn = false;
+      FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved = false;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithConstructorInjectedDelegate implements Window
-{
-
-   static boolean drawn;
-
-   Window window;
-
-   @Inject
-   FrameWithConstructorInjectedDelegate(@Delegate Window window)
-   {
-      this.window = window;
-   }
-
-   public void draw()
-   {
-      drawn = true;
-      window.draw();
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithConstructorInjectedDelegate implements Window
+{
+
+   static boolean drawn;
+
+   Window window;
+
+   @Inject
+   FrameWithConstructorInjectedDelegate(@Delegate Window window)
+   {
+      this.window = window;
+   }
+
+   public void draw()
+   {
+      drawn = true;
+      window.draw();
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithConstructorInjectedDelegateAndAbstractMethod implements Window
-{
-
-   Window window;
-
-   static boolean moved = false;
-
-   @Inject
-   FrameWithConstructorInjectedDelegateAndAbstractMethod(@Delegate Window window)
-   {
-      this.window = window;
-   }
-
-   public abstract void draw();
-
-   public void move()
-   {
-     moved = true;
-     draw();
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithConstructorInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithConstructorInjectedDelegateAndAbstractMethod implements Window
+{
+
+   Window window;
+
+   static boolean moved = false;
+
+   @Inject
+   FrameWithConstructorInjectedDelegateAndAbstractMethod(@Delegate Window window)
+   {
+      this.window = window;
+   }
+
+   public abstract void draw();
+
+   public void move()
+   {
+     moved = true;
+     draw();
+   }
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithFieldInjectedDelegate implements Window
-{
-
-   static boolean drawn;
-
-   @Inject @Delegate
-   Window window;
-
-   public void draw()
-   {
-     drawn = true;
-     window.draw();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithFieldInjectedDelegate implements Window
+{
+
+   static boolean drawn;
+
+   @Inject @Delegate
+   Window window;
+
+   public void draw()
+   {
+     drawn = true;
+     window.draw();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithFieldInjectedDelegateAndAbstractMethod implements Window
-{
-
-   static boolean moved;
-
-   @Inject @Delegate
-   Window window;
-
-   public abstract void draw();
-
-   public void move()
-   {
-      moved = true;
-      window.move();
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithFieldInjectedDelegateAndAbstractMethod implements Window
+{
+
+   static boolean moved;
+
+   @Inject @Delegate
+   Window window;
+
+   public abstract void draw();
+
+   public void move()
+   {
+      moved = true;
+      window.move();
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod implements Window
-{
-
-   static boolean moved;
-
-   @Inject @Delegate
-   Window window;
-
-   public abstract void draw();
-
-   public void move()
-   {
-      moved = true;
-      draw();
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod implements Window
+{
+
+   static boolean moved;
+
+   @Inject @Delegate
+   Window window;
+
+   public abstract void draw();
+
+   public void move()
+   {
+      moved = true;
+      draw();
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithInitializerMethodInjectedDelegate implements Window
-{
-
-   static boolean drawn;
-
-   private Window window;
-
-   @Inject
-   void initWindow(@Delegate Window window){
-      this.window = window;
-   }
-
-   public void draw() {
-      drawn = true;
-      window.draw();
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithInitializerMethodInjectedDelegate implements Window
+{
+
+   static boolean drawn;
+
+   private Window window;
+
+   @Inject
+   void initWindow(@Delegate Window window){
+      this.window = window;
+   }
+
+   public void draw() {
+      drawn = true;
+      window.draw();
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class FrameWithInitializerMethodInjectedDelegateAndAbstractMethod implements Window
-{
-
-   static boolean moved;
-
-   private Window window;
-
-   @Inject
-   void initWindow(@Delegate Window window)
-   {
-      this.window = window;
-   }
-
-   public abstract void draw();
-
-   public void move()
-   {
-      moved = true;
-      window.move();
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class FrameWithInitializerMethodInjectedDelegateAndAbstractMethod implements Window
+{
+
+   static boolean moved;
+
+   private Window window;
+
+   @Inject
+   void initWindow(@Delegate Window window)
+   {
+      this.window = window;
+   }
+
+   public abstract void draw();
+
+   public void move()
+   {
+      moved = true;
+      window.move();
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-simple.xml")
-public class SimpleAbstractDecoratorTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      resetAll();
-
-      Window window = getReference(WindowImpl.class);
-      window.draw();
-      assert WindowImpl.drawn;
-      assert FrameWithFieldInjectedDelegate.drawn;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-simple.xml")
+public class SimpleAbstractDecoratorTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      resetAll();
+
+      Window window = getReference(WindowImpl.class);
+      window.draw();
+      assert WindowImpl.drawn;
+      assert FrameWithFieldInjectedDelegate.drawn;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withAbstractMethodAndInitializerMethod.xml")
-public class SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      Window window = getReference(WindowImpl.class);
-
-      resetAll();
-      window.draw();
-      assert WindowImpl.drawn;
-      assert FrameWithFieldInjectedDelegate.drawn;
-      assert !FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved;
-
-      resetAll();
-      window.move();
-      assert WindowImpl.moved;
-      assert !FrameWithFieldInjectedDelegate.drawn;
-      assert FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved;
-
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withAbstractMethodAndInitializerMethod.xml")
+public class SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      Window window = getReference(WindowImpl.class);
+
+      resetAll();
+      window.draw();
+      assert WindowImpl.drawn;
+      assert FrameWithFieldInjectedDelegate.drawn;
+      assert !FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved;
+
+      resetAll();
+      window.move();
+      assert WindowImpl.moved;
+      assert !FrameWithFieldInjectedDelegate.drawn;
+      assert FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.moved;
+
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withAbstractMethod.xml")
-public class SimpleAbstractDecoratorWithAbstractMethodTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      Window window = getReference(WindowImpl.class);
-
-      resetAll();
-      window.draw();
-      assert WindowImpl.drawn;
-      assert FrameWithFieldInjectedDelegate.drawn;
-      assert !FrameWithFieldInjectedDelegateAndAbstractMethod.moved;
-
-      resetAll();
-      window.move();
-      assert WindowImpl.moved;
-      assert !FrameWithFieldInjectedDelegate.drawn;
-      assert FrameWithFieldInjectedDelegateAndAbstractMethod.moved;
-
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withAbstractMethod.xml")
+public class SimpleAbstractDecoratorWithAbstractMethodTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      Window window = getReference(WindowImpl.class);
+
+      resetAll();
+      window.draw();
+      assert WindowImpl.drawn;
+      assert FrameWithFieldInjectedDelegate.drawn;
+      assert !FrameWithFieldInjectedDelegateAndAbstractMethod.moved;
+
+      resetAll();
+      window.move();
+      assert WindowImpl.moved;
+      assert !FrameWithFieldInjectedDelegate.drawn;
+      assert FrameWithFieldInjectedDelegateAndAbstractMethod.moved;
+
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withCallToItself.xml")
-public class SimpleAbstractDecoratorWithCallToItselfTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      Window window = getReference(WindowImpl.class);
-
-      resetAll();
-      window.move();
-      assert WindowImpl.drawn;
-      assert FrameWithFieldInjectedDelegate.drawn;
-      assert FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.moved;
-
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withCallToItself.xml")
+public class SimpleAbstractDecoratorWithCallToItselfTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      Window window = getReference(WindowImpl.class);
+
+      resetAll();
+      window.move();
+      assert WindowImpl.drawn;
+      assert FrameWithFieldInjectedDelegate.drawn;
+      assert FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.moved;
+
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.*;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withConstructor.xml")
-public class SimpleAbstractDecoratorWithConstructorTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      resetAll();
-
-      Window window = getReference(WindowImpl.class);
-      window.draw();
-      assert WindowImpl.drawn;
-      assert FrameWithConstructorInjectedDelegate.drawn;
-
-      resetAll();
-      window.move();
-      assert !WindowImpl.moved;
-      assert WindowImpl.drawn;
-      assert FrameWithConstructorInjectedDelegate.drawn;
-      assert FrameWithConstructorInjectedDelegateAndAbstractMethod.moved;
-
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.*;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withConstructor.xml")
+public class SimpleAbstractDecoratorWithConstructorTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      resetAll();
+
+      Window window = getReference(WindowImpl.class);
+      window.draw();
+      assert WindowImpl.drawn;
+      assert FrameWithConstructorInjectedDelegate.drawn;
+
+      resetAll();
+      window.move();
+      assert !WindowImpl.moved;
+      assert WindowImpl.drawn;
+      assert FrameWithConstructorInjectedDelegate.drawn;
+      assert FrameWithConstructorInjectedDelegateAndAbstractMethod.moved;
+
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withInitializerMethod.xml")
-public class SimpleAbstractDecoratorWithInitializerMethodTest extends AbstractWeldTest
-{
-   @Test
-   public void testAbstractDecoratorApplied()
-   {
-
-      resetAll();
-
-      Window window = getReference(WindowImpl.class);
-      window.draw();
-      assert WindowImpl.drawn;
-      assert FrameWithInitializerMethodInjectedDelegate.drawn;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withInitializerMethod.xml")
+public class SimpleAbstractDecoratorWithInitializerMethodTest extends AbstractWeldTest
+{
+   @Test
+   public void testAbstractDecoratorApplied()
+   {
+
+      resetAll();
+
+      Window window = getReference(WindowImpl.class);
+      window.draw();
+      assert WindowImpl.drawn;
+      assert FrameWithInitializerMethodInjectedDelegate.drawn;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-/**
- * @author Marius Bogoevici
- */
-public interface Window
-{
-   void draw();
-
-   void move();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface Window
+{
+   void draw();
+
+   void move();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
-
-/**
- *
- * @author Marius Bogoevici
- */
-public class WindowImpl implements Window
-{
-   static boolean drawn;
-
-   static boolean moved;
-
-   public void draw()
-   {
-      drawn = true;
-   }
-
-   public void move()
-   {
-      moved = true; 
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/WindowImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator;
+
+/**
+ *
+ * @author Marius Bogoevici
+ */
+public class WindowImpl implements Window
+{
+   static boolean drawn;
+
+   static boolean moved;
+
+   public void draw()
+   {
+      drawn = true;
+   }
+
+   public void move()
+   {
+      moved = true; 
+   }
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Decorator
-public abstract class Frame
-{
-
-   @Inject @Delegate
-   Window window;
-
-   public void draw()
-   {
-      window.draw();
-   }
-
-   public abstract void resize();
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Frame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Decorator
+public abstract class Frame
+{
+
+   @Inject @Delegate
+   Window window;
+
+   public void draw()
+   {
+      window.draw();
+   }
+
+   public abstract void resize();
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.exceptions.DefinitionException;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Artifact
- at BeansXml("beans-withInvalidAbstractMethod.xml")
- at ExpectedDeploymentException(DefinitionException.class)
-public class SimpleAbstractDecoratorWithInvalidAbstractMethodTest extends AbstractWeldTest
-{
-   @Test(groups = "broken")
-   // TODO: needs exception transformer to run in JBAS
-   public void testAbstractDecoratorApplied()
-   {
-      assert false;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.exceptions.DefinitionException;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Artifact
+ at BeansXml("beans-withInvalidAbstractMethod.xml")
+ at ExpectedDeploymentException(DefinitionException.class)
+public class SimpleAbstractDecoratorWithInvalidAbstractMethodTest extends AbstractWeldTest
+{
+   @Test(groups = "broken")
+   // TODO: needs exception transformer to run in JBAS
+   public void testAbstractDecoratorApplied()
+   {
+      assert false;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
-
-/**
- *
- * @author Marius Bogoevici
- */
-public class Window
-{
-   static boolean drawn;
-
-   static boolean moved;
-
-   public void draw()
-   {
-      drawn = true;
-   }
-
-   public void move()
-   {
-      moved = true;
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.abstractDecorator.broken;
+
+/**
+ *
+ * @author Marius Bogoevici
+ */
+public class Window
+{
+   static boolean drawn;
+
+   static boolean moved;
+
+   public void draw()
+   {
+      drawn = true;
+   }
+
+   public void move()
+   {
+      moved = true;
+   }
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,176 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.weld.introspector.WeldClass;
-import org.jboss.weld.introspector.WeldField;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-
-/**
- * @author Marius Bogoevici
- */
-public class CustomDecorator implements Decorator<Object>
-{
-   private final Set<InjectionPoint> injectionPoints;
-   private BeanManager beanManager;
-
-   public CustomDecorator(BeanManager beanManager)
-   {
-      this.beanManager = beanManager;
-      injectionPoints = Collections.singleton((InjectionPoint)new CustomInjectionPoint());
-   }
-
-   public Type getDelegateType()
-   {
-      return Window.class;
-   }
-
-   public Set<Annotation> getDelegateQualifiers()
-   {
-      return Collections.emptySet();
-   }
-
-   public Set<Type> getDecoratedTypes()
-   {
-      return Collections.singleton((Type) Window.class);
-   }
-
-   public Set<Type> getTypes()
-   {
-      return Collections.<Type>singleton(CustomWindowFrame.class);
-   }
-
-   public Set<Annotation> getQualifiers()
-   {
-      return Collections.emptySet();
-   }
-
-   public Class<? extends Annotation> getScope()
-   {
-      return Dependent.class;
-   }
-
-   public String getName()
-   {
-      return null;
-   }
-
-   public Set<Class<? extends Annotation>> getStereotypes()
-   {
-      return Collections.emptySet();
-
-   }
-
-   public Class<?> getBeanClass()
-   {
-      return CustomWindowFrame.class;
-   }
-
-   public boolean isAlternative()
-   {
-      return false;
-   }
-
-   public boolean isNullable()
-   {
-      return false;
-   }
-
-   public Set<InjectionPoint> getInjectionPoints()
-   {
-      return injectionPoints;
-   }
-
-   public Object create(CreationalContext<Object> creationalContext)
-   {
-      CustomWindowFrame customFrame = new CustomWindowFrame();
-      customFrame.window = (Window) beanManager.getInjectableReference(injectionPoints.iterator().next(), creationalContext);
-      return customFrame;
-   }
-
-   public void destroy(Object instance, CreationalContext<Object> creationalContext)
-   {
-      creationalContext.release();
-   }
-
-   class CustomInjectionPoint implements InjectionPoint
-   {
-      private final WeldClass<?> targetClass;
-      private final WeldField<CustomWindowFrame,?> windowField;
-
-      public CustomInjectionPoint()
-      {
-         ClassTransformer transformer = new ClassTransformer(new TypeStore());
-         targetClass = WeldClassImpl.of(CustomWindowFrame.class, transformer);
-         windowField = targetClass.getDeclaredWeldField("window");
-      }
-
-      public Type getType()
-      {
-         return Window.class;
-      }
-
-      public Set<Annotation> getQualifiers()
-      {
-         return Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
-      }
-
-      public Bean<?> getBean()
-      {
-         return CustomDecorator.this;
-      }
-
-      public Member getMember()
-      {
-         return ((AnnotatedField<?>)windowField).getJavaMember();
-      }
-
-      public Annotated getAnnotated()
-      {
-         return windowField;
-      }
-
-      public boolean isDelegate()
-      {
-         return true;
-      }
-
-      public boolean isTransient()
-      {
-         return false;
-      }
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,176 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.WeldField;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class CustomDecorator implements Decorator<Object>
+{
+   private final Set<InjectionPoint> injectionPoints;
+   private BeanManager beanManager;
+
+   public CustomDecorator(BeanManager beanManager)
+   {
+      this.beanManager = beanManager;
+      injectionPoints = Collections.singleton((InjectionPoint)new CustomInjectionPoint());
+   }
+
+   public Type getDelegateType()
+   {
+      return Window.class;
+   }
+
+   public Set<Annotation> getDelegateQualifiers()
+   {
+      return Collections.emptySet();
+   }
+
+   public Set<Type> getDecoratedTypes()
+   {
+      return Collections.singleton((Type) Window.class);
+   }
+
+   public Set<Type> getTypes()
+   {
+      return Collections.<Type>singleton(CustomWindowFrame.class);
+   }
+
+   public Set<Annotation> getQualifiers()
+   {
+      return Collections.emptySet();
+   }
+
+   public Class<? extends Annotation> getScope()
+   {
+      return Dependent.class;
+   }
+
+   public String getName()
+   {
+      return null;
+   }
+
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+
+   }
+
+   public Class<?> getBeanClass()
+   {
+      return CustomWindowFrame.class;
+   }
+
+   public boolean isAlternative()
+   {
+      return false;
+   }
+
+   public boolean isNullable()
+   {
+      return false;
+   }
+
+   public Set<InjectionPoint> getInjectionPoints()
+   {
+      return injectionPoints;
+   }
+
+   public Object create(CreationalContext<Object> creationalContext)
+   {
+      CustomWindowFrame customFrame = new CustomWindowFrame();
+      customFrame.window = (Window) beanManager.getInjectableReference(injectionPoints.iterator().next(), creationalContext);
+      return customFrame;
+   }
+
+   public void destroy(Object instance, CreationalContext<Object> creationalContext)
+   {
+      creationalContext.release();
+   }
+
+   class CustomInjectionPoint implements InjectionPoint
+   {
+      private final WeldClass<?> targetClass;
+      private final WeldField<CustomWindowFrame,?> windowField;
+
+      public CustomInjectionPoint()
+      {
+         ClassTransformer transformer = new ClassTransformer(new TypeStore());
+         targetClass = WeldClassImpl.of(CustomWindowFrame.class, transformer);
+         windowField = targetClass.getDeclaredWeldField("window");
+      }
+
+      public Type getType()
+      {
+         return Window.class;
+      }
+
+      public Set<Annotation> getQualifiers()
+      {
+         return Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
+      }
+
+      public Bean<?> getBean()
+      {
+         return CustomDecorator.this;
+      }
+
+      public Member getMember()
+      {
+         return ((AnnotatedField<?>)windowField).getJavaMember();
+      }
+
+      public Annotated getAnnotated()
+      {
+         return windowField;
+      }
+
+      public boolean isDelegate()
+      {
+         return true;
+      }
+
+      public boolean isTransient()
+      {
+         return false;
+      }
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-
-public class CustomDecoratorDeploymentObserver implements Extension
-{
-   public void addDecorators(@Observes AfterBeanDiscovery event, BeanManager beanManager)
-   {
-      event.addBean(new CustomDecorator(beanManager));
-   }
-
-   /**
-    * Must veto the custom decorator class, otherwise a bean will be created
-    */
-   public void vetoCustomDecorator(@Observes ProcessAnnotatedType event, BeanManager beanManager)
-   {
-      if (event.getAnnotatedType().getJavaClass().equals(CustomWindowFrame.class))
-         event.veto();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorDeploymentObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+
+
+public class CustomDecoratorDeploymentObserver implements Extension
+{
+   public void addDecorators(@Observes AfterBeanDiscovery event, BeanManager beanManager)
+   {
+      event.addBean(new CustomDecorator(beanManager));
+   }
+
+   /**
+    * Must veto the custom decorator class, otherwise a bean will be created
+    */
+   public void vetoCustomDecorator(@Observes ProcessAnnotatedType event, BeanManager beanManager)
+   {
+      if (event.getAnnotatedType().getJavaClass().equals(CustomWindowFrame.class))
+         event.veto();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-import java.util.Arrays;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.mock.MockServletLifecycle;
-import org.jboss.weld.mock.MockBeanDeploymentArchive;
-import org.jboss.weld.mock.MockDeployment;
-import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory;
-import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory;
-
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
-public class CustomDecoratorTest
-{
-
-   @Test
-   public void testCustomDecoratorAppliedByItself()
-   {
-      MockBeanDeploymentArchive beanDeploymentArchive = new MockBeanDeploymentArchive("1", WindowImpl.class, CustomWindowFrame.class, InnerWindowFrame.class, OuterWindowFrame.class );
-      beanDeploymentArchive.setBeansXmlFiles(Arrays.asList(CustomDecoratorTest.class.getResource("beans-custom-only.xml")));
-      TestContainer testContainer = new TestContainer(new MockServletLifecycle(new MockDeployment(beanDeploymentArchive), beanDeploymentArchive));
-      testContainer.getLifecycle().initialize();
-      testContainer.getDeployment().getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(CustomDecoratorTest.class.getPackage(), Extension.class));
-      testContainer.getLifecycle().beginApplication();
-
-      BeanManagerImpl beanManager = testContainer.getBeanManager();
-      Bean<Object> windowBean = (Bean<Object>) beanManager.getBeans(WindowImpl.class).iterator().next();
-      CreationalContext<Object> creationalContext = beanManager.createCreationalContext(windowBean);
-      WindowImpl window  = (WindowImpl) windowBean.create(creationalContext);
-      window.draw();
-
-      assert window.isDrawn();
-      assert CustomWindowFrame.drawn;
-      testContainer.stopContainer();
-   }
-
-   @Test
-   public void testCustomDecoratorAppliedWithWeldDecorators()
-   {
-      MockBeanDeploymentArchive beanDeploymentArchive = new MockBeanDeploymentArchive("1", WindowImpl.class, CustomWindowFrame.class, InnerWindowFrame.class, OuterWindowFrame.class );
-      beanDeploymentArchive.setBeansXmlFiles(Arrays.asList(CustomDecoratorTest.class.getResource("beans.xml")));
-      TestContainer testContainer = new TestContainer(new MockServletLifecycle(new MockDeployment(beanDeploymentArchive), beanDeploymentArchive));
-      testContainer.getLifecycle().initialize();
-      testContainer.getDeployment().getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(CustomDecoratorTest.class.getPackage(), Extension.class));      
-      testContainer.getLifecycle().beginApplication();
-
-      BeanManagerImpl beanManager = testContainer.getBeanManager();
-      Bean<Object> windowBean = (Bean<Object>) beanManager.getBeans(WindowImpl.class).iterator().next();
-      CreationalContext<Object> creationalContext = beanManager.createCreationalContext(windowBean);
-      WindowImpl window  = (WindowImpl) windowBean.create(creationalContext);
-      window.draw();
-
-      assert window.isDrawn();
-      assert OuterWindowFrame.drawn;
-      assert InnerWindowFrame.drawn;
-      assert CustomWindowFrame.drawn;
-
-      testContainer.stopContainer();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+import java.util.Arrays;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.MockBeanDeploymentArchive;
+import org.jboss.weld.mock.MockDeployment;
+import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory;
+import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class CustomDecoratorTest
+{
+
+   @Test
+   public void testCustomDecoratorAppliedByItself()
+   {
+      MockBeanDeploymentArchive beanDeploymentArchive = new MockBeanDeploymentArchive("1", WindowImpl.class, CustomWindowFrame.class, InnerWindowFrame.class, OuterWindowFrame.class );
+      beanDeploymentArchive.setBeansXmlFiles(Arrays.asList(CustomDecoratorTest.class.getResource("beans-custom-only.xml")));
+      TestContainer testContainer = new TestContainer(new MockServletLifecycle(new MockDeployment(beanDeploymentArchive), beanDeploymentArchive));
+      testContainer.getLifecycle().initialize();
+      testContainer.getDeployment().getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(CustomDecoratorTest.class.getPackage(), Extension.class));
+      testContainer.getLifecycle().beginApplication();
+
+      BeanManagerImpl beanManager = testContainer.getBeanManager();
+      Bean<Object> windowBean = (Bean<Object>) beanManager.getBeans(WindowImpl.class).iterator().next();
+      CreationalContext<Object> creationalContext = beanManager.createCreationalContext(windowBean);
+      WindowImpl window  = (WindowImpl) windowBean.create(creationalContext);
+      window.draw();
+
+      assert window.isDrawn();
+      assert CustomWindowFrame.drawn;
+      testContainer.stopContainer();
+   }
+
+   @Test
+   public void testCustomDecoratorAppliedWithWeldDecorators()
+   {
+      MockBeanDeploymentArchive beanDeploymentArchive = new MockBeanDeploymentArchive("1", WindowImpl.class, CustomWindowFrame.class, InnerWindowFrame.class, OuterWindowFrame.class );
+      beanDeploymentArchive.setBeansXmlFiles(Arrays.asList(CustomDecoratorTest.class.getResource("beans.xml")));
+      TestContainer testContainer = new TestContainer(new MockServletLifecycle(new MockDeployment(beanDeploymentArchive), beanDeploymentArchive));
+      testContainer.getLifecycle().initialize();
+      testContainer.getDeployment().getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(CustomDecoratorTest.class.getPackage(), Extension.class));      
+      testContainer.getLifecycle().beginApplication();
+
+      BeanManagerImpl beanManager = testContainer.getBeanManager();
+      Bean<Object> windowBean = (Bean<Object>) beanManager.getBeans(WindowImpl.class).iterator().next();
+      CreationalContext<Object> creationalContext = beanManager.createCreationalContext(windowBean);
+      WindowImpl window  = (WindowImpl) windowBean.create(creationalContext);
+      window.draw();
+
+      assert window.isDrawn();
+      assert OuterWindowFrame.drawn;
+      assert InnerWindowFrame.drawn;
+      assert CustomWindowFrame.drawn;
+
+      testContainer.stopContainer();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-/**
- * @author Marius Bogoevici
- */
-public class CustomWindowFrame implements Window
-{
-   public static boolean drawn;
-
-   Window window;
-
-   public void draw()
-   {
-      window.draw();
-      drawn = true;   
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class CustomWindowFrame implements Window
+{
+   public static boolean drawn;
+
+   Window window;
+
+   public void draw()
+   {
+      window.draw();
+      drawn = true;   
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class InnerWindowFrame implements Window
-{
-   static boolean drawn = false;
-
-   @Inject @Delegate
-   Window window;
-
-   public void draw()
-   {
-      window.draw();
-      drawn = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/InnerWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class InnerWindowFrame implements Window
+{
+   static boolean drawn = false;
+
+   @Inject @Delegate
+   Window window;
+
+   public void draw()
+   {
+      window.draw();
+      drawn = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class OuterWindowFrame implements Window
-{
-   static boolean drawn = false;
-
-   @Inject @Delegate
-   Window window;
-
-   public void draw()
-   {
-      window.draw();
-      drawn = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/OuterWindowFrame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class OuterWindowFrame implements Window
+{
+   static boolean drawn = false;
+
+   @Inject @Delegate
+   Window window;
+
+   public void draw()
+   {
+      window.draw();
+      drawn = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-/**
- * @author Marius Bogoevici
- */
-public interface Window
-{
-   void draw();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/Window.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface Window
+{
+   void draw();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
-
-/**
- * @author Marius Bogoevici
- */
-public class WindowImpl implements Window
-{
-   public boolean drawn = false;
-
-   public void draw()
-   {
-      drawn = true;
-   }
-
-   public boolean isDrawn()
-   {
-      return drawn;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/WindowImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.custom;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class WindowImpl implements Window
+{
+   public boolean drawn = false;
+
+   public void draw()
+   {
+      drawn = true;
+   }
+
+   public boolean isDrawn()
+   {
+      return drawn;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
-
-/**
- * @author Marius Bogoevici
- */
-public interface Decorated
-{
-   void decoratedMethod();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface Decorated
+{
+   void decoratedMethod();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
-
-/**
- * @author Marius Bogoevici
- */
-public interface NotDecorated
-{
-   void notDecoratedMethod();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/NotDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface NotDecorated
+{
+   void notDecoratedMethod();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class PartialDecorator implements Decorated
-{
-
-   @Inject @Delegate TestBean delegate;
-
-   static boolean decoratedInvoked;
-
-   static boolean notDecoratedInvoked;
-
-   public void decoratedMethod()
-   {
-      decoratedInvoked = true;
-      delegate.decoratedMethod();
-   }
-
-   /**
-    * Should not be invoked
-    */
-   public void notDecoratedMethod()
-   {
-      notDecoratedInvoked = true;
-      delegate.decoratedMethod();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class PartialDecorator implements Decorated
+{
+
+   @Inject @Delegate TestBean delegate;
+
+   static boolean decoratedInvoked;
+
+   static boolean notDecoratedInvoked;
+
+   public void decoratedMethod()
+   {
+      decoratedInvoked = true;
+      delegate.decoratedMethod();
+   }
+
+   /**
+    * Should not be invoked
+    */
+   public void notDecoratedMethod()
+   {
+      notDecoratedInvoked = true;
+      delegate.decoratedMethod();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
- at BeansXml("beans.xml")
-public class PartialDecoratorTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
-   {
-      TestBean testBean = getReference(TestBean.class);
-      testBean.decoratedMethod();
-      testBean.notDecoratedMethod();
-
-      assert PartialDecorator.decoratedInvoked;
-      assert !PartialDecorator.notDecoratedInvoked;
-      assert TestBean.decoratedInvoked;
-      assert TestBean.notDecoratedInvoked;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+public class PartialDecoratorTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
+   {
+      TestBean testBean = getReference(TestBean.class);
+      testBean.decoratedMethod();
+      testBean.notDecoratedMethod();
+
+      assert PartialDecorator.decoratedInvoked;
+      assert !PartialDecorator.notDecoratedInvoked;
+      assert TestBean.decoratedInvoked;
+      assert TestBean.notDecoratedInvoked;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
-
-/**
- * @author Marius Bogoevici
- */
-public class TestBean implements Decorated, NotDecorated
-{
-   static boolean decoratedInvoked;
-   static boolean notDecoratedInvoked;
-
-   public void decoratedMethod()
-   {
-      decoratedInvoked = true;
-   }
-
-   public void notDecoratedMethod()
-   {
-      notDecoratedInvoked = true;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.decoratedTypes;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class TestBean implements Decorated, NotDecorated
+{
+   static boolean decoratedInvoked;
+   static boolean notDecoratedInvoked;
+
+   public void decoratedMethod()
+   {
+      decoratedInvoked = true;
+   }
+
+   public void notDecoratedMethod()
+   {
+      notDecoratedInvoked = true;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public interface Decorated<T>
-{
-   T decoratedEcho(T parameter);
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface Decorated<T>
+{
+   T decoratedEcho(T parameter);
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public class GenericBean<T> implements Decorated<T>, NotDecorated<T>
-{
-   static boolean decoratedInvoked;
-   static boolean notDecoratedInvoked;
-
-   public T notDecoratedEcho(T parameter)
-   {
-      notDecoratedInvoked = true;
-      return parameter;
-   }
-
-   public T decoratedEcho(T parameter)
-   {
-      decoratedInvoked = true;
-      return parameter;
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/GenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class GenericBean<T> implements Decorated<T>, NotDecorated<T>
+{
+   static boolean decoratedInvoked;
+   static boolean notDecoratedInvoked;
+
+   public T notDecoratedEcho(T parameter)
+   {
+      notDecoratedInvoked = true;
+      return parameter;
+   }
+
+   public T decoratedEcho(T parameter)
+   {
+      decoratedInvoked = true;
+      return parameter;
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public interface NotDecorated<T>
-{
-   T notDecoratedEcho(T parameter);
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/NotDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface NotDecorated<T>
+{
+   T notDecoratedEcho(T parameter);
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class PartialDecorator<T> implements Decorated<T>
-{
-
-   @Inject @Delegate GenericBean<T> delegate;
-
-   static boolean decoratedInvoked = false;
-
-   static boolean notDecoratedInvoked = false;
-
-   public T decoratedEcho(T parameter)
-   {
-      decoratedInvoked = true;
-      return delegate.decoratedEcho(parameter);
-   }
-
-   /**
-    * Should not be invoked
-    */
-   public T notDecoratedEcho(T parameter)
-   {
-      notDecoratedInvoked = true;
-      return delegate.notDecoratedEcho(parameter);
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class PartialDecorator<T> implements Decorated<T>
+{
+
+   @Inject @Delegate GenericBean<T> delegate;
+
+   static boolean decoratedInvoked = false;
+
+   static boolean notDecoratedInvoked = false;
+
+   public T decoratedEcho(T parameter)
+   {
+      decoratedInvoked = true;
+      return delegate.decoratedEcho(parameter);
+   }
+
+   /**
+    * Should not be invoked
+    */
+   public T notDecoratedEcho(T parameter)
+   {
+      notDecoratedInvoked = true;
+      return delegate.notDecoratedEcho(parameter);
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
- at BeansXml("beans.xml")
-public class PartialDecoratorTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
-   {
-      TestBean testBean = getReference(TestBean.class);
-      testBean.invoke();
-
-      assert PartialDecorator.decoratedInvoked;
-      assert !PartialDecorator.notDecoratedInvoked;
-      assert StringPartialDecorator.invoked;
-      assert GenericBean.decoratedInvoked;
-      assert GenericBean.notDecoratedInvoked;
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+public class PartialDecoratorTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
+   {
+      TestBean testBean = getReference(TestBean.class);
+      testBean.invoke();
+
+      assert PartialDecorator.decoratedInvoked;
+      assert !PartialDecorator.notDecoratedInvoked;
+      assert StringPartialDecorator.invoked;
+      assert GenericBean.decoratedInvoked;
+      assert GenericBean.notDecoratedInvoked;
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class StringPartialDecorator implements Decorated<String>
-{
-   @Inject
-   @Delegate
-   GenericBean<String> delegate;
-
-   static boolean invoked = false;
-
-   public String decoratedEcho(String parameter)
-   {
-      invoked = true;
-      return delegate.decoratedEcho(parameter);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/StringPartialDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class StringPartialDecorator implements Decorated<String>
+{
+   @Inject
+   @Delegate
+   GenericBean<String> delegate;
+
+   static boolean invoked = false;
+
+   public String decoratedEcho(String parameter)
+   {
+      invoked = true;
+      return delegate.decoratedEcho(parameter);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
-public class TestBean
-{
-   @Inject @Dependent GenericBean<String> genericBean;
-
-   public void invoke()
-   {
-      genericBean.decoratedEcho("hello");
-      genericBean.notDecoratedEcho("hello");
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.generic;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class TestBean
+{
+   @Inject @Dependent GenericBean<String> genericBean;
+
+   public void invoke()
+   {
+      genericBean.decoratedEcho("hello");
+      genericBean.notDecoratedEcho("hello");
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
-
-/**
- * @author Marius Bogoevici
- */
-public interface Decorated<T>
-{
-   T decoratedEcho(T parameter);
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface Decorated<T>
+{
+   T decoratedEcho(T parameter);
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
- at BeansXml("beans.xml")
-public class ExtendDecoratorTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testExtendedDecorator()
-   {
-      ExtendsDecorated instance = getReference(ExtendsDecorated.class);
-
-      String result = instance.decoratedEcho("hello");
-      Assert.assertEquals(result, "decorated-hello-decorated");
-
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+public class ExtendDecoratorTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testExtendedDecorator()
+   {
+      ExtendsDecorated instance = getReference(ExtendsDecorated.class);
+
+      String result = instance.decoratedEcho("hello");
+      Assert.assertEquals(result, "decorated-hello-decorated");
+
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
-
-/**
- * @author Marius Bogoevici
- */
-public interface ExtendsDecorated extends Decorated<String>
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface ExtendsDecorated extends Decorated<String>
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class ExtendsDecoratedDecorator implements ExtendsDecorated
-{
-   @Inject @Delegate ExtendsDecorated delegate;
-
-   public String decoratedEcho(String parameter)
-   {
-      return "decorated-" + parameter + "-decorated";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class ExtendsDecoratedDecorator implements ExtendsDecorated
+{
+   @Inject @Delegate ExtendsDecorated delegate;
+
+   public String decoratedEcho(String parameter)
+   {
+      return "decorated-" + parameter + "-decorated";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
-
-/**
- * @author Marius Bogoevici
- */
-public class ExtendsDecoratedImpl implements ExtendsDecorated
-{
-   public String decoratedEcho(String parameter)
-   {
-      return parameter;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.generic.extend;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class ExtendsDecoratedImpl implements ExtendsDecorated
+{
+   public String decoratedEcho(String parameter)
+   {
+      return parameter;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.interceptor.InterceptorBinding;
-
- at Inherited
- at InterceptorBinding
- at Target({ElementType.TYPE, ElementType.METHOD})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface Intercepted
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+ at Inherited
+ at InterceptorBinding
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Intercepted
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-
-import org.testng.annotations.Test;
-
- at Artifact
- at BeansXml("beans.xml")
-public class InterceptorAndDecoratorTest extends AbstractWeldTest
-{
-
-   @Test(description="WELD-314")
-   public void test()
-   {
-      ServiceImpl.invocationCount = 0;
-      ServiceDecorator.invocationCount = 0;
-      ServiceInterceptor.invocationCount = 0;
-      getReference(Service.class).execute();
-      assert ServiceImpl.invocationCount == 1;
-      assert ServiceDecorator.invocationCount == 1;
-      assert ServiceInterceptor.invocationCount == 1;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class InterceptorAndDecoratorTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-314")
+   public void test()
+   {
+      ServiceImpl.invocationCount = 0;
+      ServiceDecorator.invocationCount = 0;
+      ServiceInterceptor.invocationCount = 0;
+      getReference(Service.class).execute();
+      assert ServiceImpl.invocationCount == 1;
+      assert ServiceDecorator.invocationCount == 1;
+      assert ServiceInterceptor.invocationCount == 1;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
-
-public interface Service
-{
-    void execute();
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
+
+public interface Service
+{
+    void execute();
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.
- */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.jboss.weld.tests.decorators.interceptor;
-
-import java.math.BigDecimal;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-/**
- * Secure PaymentService implemented by decator
- *
- * @author wayne
- */
- at Decorator
-class ServiceDecorator implements Service
-{
-
-   @Inject
-   @Delegate
-   private Service service;
-
-   public static int invocationCount = 0;
-
-   public void execute()
-   {
-      invocationCount++;
-      service.execute();
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.
+ */
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * Secure PaymentService implemented by decator
+ *
+ * @author wayne
+ */
+ at Decorator
+class ServiceDecorator implements Service
+{
+
+   @Inject
+   @Delegate
+   private Service service;
+
+   public static int invocationCount = 0;
+
+   public void execute()
+   {
+      invocationCount++;
+      service.execute();
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
-
-public class ServiceImpl implements Service
-{
-
-   public static int invocationCount = 0;
-
-   @Intercepted
-   public void execute()
-   {
-      invocationCount ++;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
+
+public class ServiceImpl implements Service
+{
+
+   public static int invocationCount = 0;
+
+   @Intercepted
+   public void execute()
+   {
+      invocationCount ++;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
- at Intercepted @Interceptor
-public class ServiceInterceptor
-{
-
-   public static int invocationCount = 0;
-
-   @AroundInvoke
-   public Object interceptService(InvocationContext invocationContext) throws Exception
-   {
-      this.invocationCount++;
-      return invocationContext.proceed();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.interceptor;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Intercepted @Interceptor
+public class ServiceInterceptor
+{
+
+   public static int invocationCount = 0;
+
+   @AroundInvoke
+   public Object interceptService(InvocationContext invocationContext) throws Exception
+   {
+      this.invocationCount++;
+      return invocationContext.proceed();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-public interface Account extends Serializable 
-{
-   
-   public String withdraw(BigDecimal amount);
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public interface Account extends Serializable 
+{
+   
+   public String withdraw(BigDecimal amount);
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
-
-import java.math.BigDecimal;
-
-public class Account1 implements Account {
-
-   public String withdraw(BigDecimal amount) {
-      return "Account1 withdraw";
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
+
+import java.math.BigDecimal;
+
+public class Account1 implements Account {
+
+   public String withdraw(BigDecimal amount) {
+      return "Account1 withdraw";
+   }
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
-
-import java.math.BigDecimal;
-
-public class Account2 implements Account {
-
-   public String withdraw(BigDecimal amount) {
-      return "Account2 withdraw";
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/Account2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
+
+import java.math.BigDecimal;
+
+public class Account2 implements Account {
+
+   public String withdraw(BigDecimal amount) {
+      return "Account2 withdraw";
+   }
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
-
-import java.math.BigDecimal;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-
- at Decorator
-public class AccountDecorator implements Account {
-   
-   @Inject @Delegate @Any Account account;
-
-   public String withdraw(BigDecimal amount) {
-      System.out.println("AccountDecorator withdraw " + account.toString());
-      return account.withdraw(amount);
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/AccountDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
+
+import java.math.BigDecimal;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+ at Decorator
+public class AccountDecorator implements Account {
+   
+   @Inject @Delegate @Any Account account;
+
+   public String withdraw(BigDecimal amount) {
+      System.out.println("AccountDecorator withdraw " + account.toString());
+      return account.withdraw(amount);
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at BeansXml("beans.xml")
-public class TestMultiDelegate extends AbstractWeldTest
-{
-   
-   @Test(description="http://seamframework.org/Community/SerializableDecorators")
-   public void go() {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.multidelegate;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class TestMultiDelegate extends AbstractWeldTest
+{
+   
+   @Test(description="http://seamframework.org/Community/SerializableDecorators")
+   public void go() {
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.util.AnnotationLiteral;
-
-import java.util.*;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
- at BeansXml("beans-basic.xml")
-public class BasicDecoratorResolutionTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testBasicDecoratorInvocation()
-   {
-      SimpleBean simpleBean = getReference(SimpleBean.class, new AnnotationLiteral<Simple>(){});
-      String result = simpleBean.hello("world");
-      assert "simple-Hello, world-simple".equals(result);
-   }
-
-   @Test
-   public void testComplexDecoratorInvocation()
-   {
-      ComplexBean complexBean = getReference(ComplexBean.class, new AnnotationLiteral<Complex>(){});
-      String result = complexBean.hello("world");
-      assert "simple-complex-Sophisticated Hello, world-complex-simple".equals(result);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.util.AnnotationLiteral;
+
+import java.util.*;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+ at BeansXml("beans-basic.xml")
+public class BasicDecoratorResolutionTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testBasicDecoratorInvocation()
+   {
+      SimpleBean simpleBean = getReference(SimpleBean.class, new AnnotationLiteral<Simple>(){});
+      String result = simpleBean.hello("world");
+      assert "simple-Hello, world-simple".equals(result);
+   }
+
+   @Test
+   public void testComplexDecoratorInvocation()
+   {
+      ComplexBean complexBean = getReference(ComplexBean.class, new AnnotationLiteral<Complex>(){});
+      String result = complexBean.hello("world");
+      assert "simple-complex-Sophisticated Hello, world-complex-simple".equals(result);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import javax.inject.Qualifier;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Marius Bogoevici
- */
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE, ElementType.FIELD})
- at Documented
-public @interface Complex
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Complex.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import javax.inject.Qualifier;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.TYPE, ElementType.FIELD})
+ at Documented
+public @interface Complex
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-/**
- * @author Marius Bogoevici
- */
- at Complex
-public class ComplexBean implements SomeBean
-{
-   public String hello(String name)
-   {
-      return "Sophisticated Hello, " + name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Complex
+public class ComplexBean implements SomeBean
+{
+   public String hello(String name)
+   {
+      return "Sophisticated Hello, " + name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class ComplexDecorator implements SomeBean
-{
-   @Inject @Delegate @Any ComplexBean delegate;
-
-   public String hello(String name)
-   {
-       return "complex-" +delegate.hello(name) +"-complex";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/ComplexDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class ComplexDecorator implements SomeBean
+{
+   @Inject @Delegate @Any ComplexBean delegate;
+
+   public String hello(String name)
+   {
+       return "complex-" +delegate.hello(name) +"-complex";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import javax.enterprise.inject.spi.Decorator;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Marius Bogoevici
- */
-public class DecoratorResolutionTestsHelper
-{
-   public static boolean decoratorClassesMatch(List<Decorator<?>> decoratorList, Collection<Class<?>> expectedDecoratorClasses)
-   {
-      if (decoratorList.size() != expectedDecoratorClasses.size())
-         return false;
-      Collection<Class<?>> expectedDecoratedClassesCopy = new ArrayList<Class<?>>(expectedDecoratorClasses);
-      for (Decorator<?> decorator: decoratorList)
-      {
-         if (!expectedDecoratedClassesCopy.remove(decorator.getBeanClass()))
-            return false;
-      }
-      return expectedDecoratedClassesCopy.size() == 0;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/DecoratorResolutionTestsHelper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import javax.enterprise.inject.spi.Decorator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class DecoratorResolutionTestsHelper
+{
+   public static boolean decoratorClassesMatch(List<Decorator<?>> decoratorList, Collection<Class<?>> expectedDecoratorClasses)
+   {
+      if (decoratorList.size() != expectedDecoratorClasses.size())
+         return false;
+      Collection<Class<?>> expectedDecoratedClassesCopy = new ArrayList<Class<?>>(expectedDecoratorClasses);
+      for (Decorator<?> decorator: decoratorList)
+      {
+         if (!expectedDecoratedClassesCopy.remove(decorator.getBeanClass()))
+            return false;
+      }
+      return expectedDecoratedClassesCopy.size() == 0;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import javax.inject.Qualifier;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Marius Bogoevici
- */
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE, ElementType.FIELD})
- at Documented
-public @interface Simple
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/Simple.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import javax.inject.Qualifier;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.TYPE, ElementType.FIELD})
+ at Documented
+public @interface Simple
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-/**
- * @author Marius Bogoevici
- */
- at Simple
-public class SimpleBean implements SomeBean
-{
-   public String hello(String name)
-   {
-      return "Hello, " + name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Simple
+public class SimpleBean implements SomeBean
+{
+   public String hello(String name)
+   {
+      return "Hello, " + name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
- at Decorator
-public class SimpleDecorator implements SomeBean
-{
-   @Inject @Delegate @Any SomeBean delegate;
-
-   public String hello(String name)
-   {
-      return "simple-" +delegate.hello(name) +"-simple";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SimpleDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Decorator
+public class SimpleDecorator implements SomeBean
+{
+   @Inject @Delegate @Any SomeBean delegate;
+
+   public String hello(String name)
+   {
+      return "simple-" +delegate.hello(name) +"-simple";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
-
-/**
- * @author Marius Bogoevici
- */
-public interface SomeBean
-{
-   String hello(String name);
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/resolution/SomeBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.decorators.resolution;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface SomeBean
+{
+   String hello(String name);
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Factory class that produces Logger for a given be to injected class
- *
- * @author wayne
- */
-public class LogFacatory {
-    @Produces
-    public Logger getLogger(InjectionPoint ip){
-        return LoggerFactory.getLogger(ip.getMember().getDeclaringClass());
-    }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/LogFacatory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Factory class that produces Logger for a given be to injected class
+ *
+ * @author wayne
+ */
+public class LogFacatory {
+    @Produces
+    public Logger getLogger(InjectionPoint ip){
+        return LoggerFactory.getLogger(ip.getMember().getDeclaringClass());
+    }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import java.math.BigDecimal;
-
-/**
- *
- * @author wayne
- */
-public interface PaymentService {
-    boolean pay(String account, BigDecimal amount);
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author wayne
+ */
+public interface PaymentService {
+    boolean pay(String account, BigDecimal amount);
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import java.math.BigDecimal;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-
-/**
- * Secure PaymentService implemented by decator
- * 
- * @author wayne
- */
- at Decorator
-class SecurePaymentService implements PaymentService
-{
-   @Inject
-   private Logger logger;
-
-   @Inject
-   @Delegate
-   @SimpleService
-   private PaymentService paymentService;
-
-   public boolean pay(String account, BigDecimal amount)
-   {
-      logger.info("I'm a secure payment service");
-
-      return paymentService.pay(account, amount);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import java.math.BigDecimal;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+
+/**
+ * Secure PaymentService implemented by decator
+ * 
+ * @author wayne
+ */
+ at Decorator
+class SecurePaymentService implements PaymentService
+{
+   @Inject
+   private Logger logger;
+
+   @Inject
+   @Delegate
+   @SimpleService
+   private PaymentService paymentService;
+
+   public boolean pay(String account, BigDecimal amount)
+   {
+      logger.info("I'm a secure payment service");
+
+      return paymentService.pay(account, amount);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import java.math.BigDecimal;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-
-/**
- * 
- * @author wayne
- */
- at SimpleService
- at ApplicationScoped
-public class SimplePaymentService implements PaymentService
-{
-   @Inject
-   Logger logger;
-
-   public boolean pay(String account, BigDecimal amount)
-   {
-      logger.info("Pay ${} for {}.", amount, account);
-
-      return true;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimplePaymentService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import java.math.BigDecimal;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+
+/**
+ * 
+ * @author wayne
+ */
+ at SimpleService
+ at ApplicationScoped
+public class SimplePaymentService implements PaymentService
+{
+   @Inject
+   Logger logger;
+
+   public boolean pay(String account, BigDecimal amount)
+   {
+      logger.info("Pay ${} for {}.", amount, account);
+
+      return true;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
-/**
- *
- * @author wayne
- */
- at Qualifier
- at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface SimpleService {
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SimpleService.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+/**
+ *
+ * @author wayne
+ */
+ at Qualifier
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface SimpleService {
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
-
-import java.math.BigDecimal;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at BeansXml("beans.xml")
-public class StackOverFlowTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-296")
-   public void test()
-   {
-      getReference(PaymentService.class, new AnnotationLiteral<SimpleService>() {}).pay("Pete", new BigDecimal(100));
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.decorators.stackoverflow;
+
+import java.math.BigDecimal;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class StackOverFlowTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-296")
+   public void test()
+   {
+      getReference(PaymentService.class, new AnnotationLiteral<SimpleService>() {}).pay("Pete", new BigDecimal(100));
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-public interface AbstractDAO<E>
-{
-   public boolean save(E entity);
-   
-   public boolean isSaved();
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+public interface AbstractDAO<E>
+{
+   public boolean save(E entity);
+   
+   public boolean isSaved();
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-
-public abstract class AbstractDAOImpl<E>
-{
-   
-   private boolean saved;
-
-   public boolean save(E entity)
-   {
-      this.saved = true;
-      return true;
-   }
-   
-   public boolean isSaved()
-   {
-      return saved;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/AbstractDAOImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+
+public abstract class AbstractDAOImpl<E>
+{
+   
+   private boolean saved;
+
+   public boolean save(E entity)
+   {
+      this.saved = true;
+      return true;
+   }
+   
+   public boolean isSaved()
+   {
+      return saved;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-public interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+public interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface Bird
-{
-
-   public void observe(Feed feed);
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Bird.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface Bird
+{
+
+   public void observe(Feed feed);
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/BowlerHatException.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateful;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
-
- at Stateful
- at RequestScoped
-public class Capercaillie implements Scottish, Bird
-{
-
-   private Feed feed;
-   
-   public void observe(@Observes Feed feed)
-   {
-      this.feed = feed;
-   }
-   
-   public Feed getFeed()
-   {
-      return feed;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Capercaillie.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+
+ at Stateful
+ at RequestScoped
+public class Capercaillie implements Scottish, Bird
+{
+
+   private Feed feed;
+   
+   public void observe(@Observes Feed feed)
+   {
+      this.feed = feed;
+   }
+   
+   public Feed getFeed()
+   {
+      return feed;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class Castle
-{
-   
-   private boolean pinged;
-   
-   public boolean isPinged()
-   {
-      return pinged;
-   }
-   
-   public void ping()
-   {
-      this.pinged = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class Castle
+{
+   
+   private boolean pinged;
+   
+   public boolean isPinged()
+   {
+      return pinged;
+   }
+   
+   public void ping()
+   {
+      this.pinged = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateful;
-
-/**
- * @author pmuir
- *
- */
- at Stateful
-public class Cat implements CatLocal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Cat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateful;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Stateful
+public class Cat implements CatLocal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
-/**
- * @author pmuir
- *
- */
- at Local
-public interface CatLocal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/CatLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Local
+public interface CatLocal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface DAO
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface DAO
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface Dog extends Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Dog extends Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateless;
-
-
- at Stateless
-public class DogBean implements Dog
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateless;
+
+
+ at Stateless
+public class DogBean implements Dog
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionTarget;
-
-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.SessionBean;
-import org.jboss.weld.ejb.InternalEjbDescriptor;
-import org.jboss.weld.ejb.spi.EjbDescriptor;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author pmuir
- *
- */
- at Artifact
- at Packaging(PackagingType.EAR)
-public class EjbDescriptorLookupTest extends AbstractWeldTest
-{
-   
-   @Test
-   public void testCorrectSubType()
-   {
-      EjbDescriptor<CatLocal> descriptor = getCurrentManager().getEjbDescriptor("Cat");
-      assert descriptor.getClass().equals(InternalEjbDescriptor.class);
-      Bean<CatLocal> bean = getCurrentManager().getBean(descriptor);
-      assert bean != null;
-      assert bean instanceof SessionBean;
-      assert bean.getBeanClass().equals(Cat.class);
-      InjectionTarget<CatLocal> it = getCurrentManager().createInjectionTarget(descriptor);
-      assert it != null;
-      assert it.getInjectionPoints().equals(bean.getInjectionPoints());
-      assert it.produce(getCurrentManager().createCreationalContext(bean)) instanceof CatLocal;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+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.SessionBean;
+import org.jboss.weld.ejb.InternalEjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class EjbDescriptorLookupTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testCorrectSubType()
+   {
+      EjbDescriptor<CatLocal> descriptor = getCurrentManager().getEjbDescriptor("Cat");
+      assert descriptor.getClass().equals(InternalEjbDescriptor.class);
+      Bean<CatLocal> bean = getCurrentManager().getBean(descriptor);
+      assert bean != null;
+      assert bean instanceof SessionBean;
+      assert bean.getBeanClass().equals(Cat.class);
+      InjectionTarget<CatLocal> it = getCurrentManager().createInjectionTarget(descriptor);
+      assert it != null;
+      assert it.getInjectionPoints().equals(bean.getInjectionPoints());
+      assert it.produce(getCurrentManager().createCreationalContext(bean)) instanceof CatLocal;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-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.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class EnterpriseBeanDefinitionTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-305")
-   public void testSuperInterfacesAreBeanTypes()
-   {
-      Bean<?> bean = getBean(Dog.class);
-      assert Utils.typeSetMatches(bean.getTypes(), Object.class, Dog.class, Animal.class);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+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.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class EnterpriseBeanDefinitionTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-305")
+   public void testSuperInterfacesAreBeanTypes()
+   {
+      Bean<?> bean = getBean(Dog.class);
+      assert Utils.typeSetMatches(bean.getTypes(), Object.class, Dog.class, Animal.class);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,111 +0,0 @@
-/*
-
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.EJBException;
-
-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.testharness.impl.packaging.ear.EjbJarXml;
-import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
- at EjbJarXml("ejb-jar.xml")
-public class EnterpriseBeanTest extends AbstractWeldTest
-{
-   
-   @Test(description="WBRI-179")
-   public void testSFSBWithOnlyRemoteInterfacesDeploys()
-   {
-      
-   }
-   
-   @Test(description="WELD-326")
-   public void testInvocationExceptionIsUnwrapped()
-   {
-      try
-      {
-         getReference(Fedora.class).causeRuntimeException();
-      }
-      catch (Throwable t)
-      {
-         if (t instanceof EJBException && t.getCause() instanceof BowlerHatException)
-         {
-            return;
-         }
-      }
-      assert false : "Expected a BowlerHatException to be thrown";
-   }   
-   
-   @Test(description="WBRI-275")
-   public void testSLSBBusinessMethodThrowsRuntimeException()
-   {
-      try
-      {
-         getReference(Fedora.class).causeRuntimeException();
-      }
-      catch (Throwable t) 
-      {
-         if (Utils.isExceptionInHierarchy(t, BowlerHatException.class))
-         {
-            return;
-         }
-      }
-      assert false : "Expected a BowlerHatException to be in the cause stack";
-   }
-   
-   @Test(description="WELD-364", groups = "broken")
-   public void testEJBRemoteInterfacesOkForObservers()
-   {
-      Feed feed = new Feed();
-      getCurrentManager().fireEvent(feed);
-      assert getReference(Scottish.class).getFeed().equals(feed);
-   }
-   
-   @Test(description = "WELD-381")
-   public void testGenericEJBWorks()
-   {
-      assert getReference(ResultClient.class).lookupPete().getUsername().equals("pete");
-   }
-   
-   @Test(description = "WELD-80", groups = "broken")
-   public void testPassivationOfEjbs()
-   {
-      HelloAction action = getReference(HelloAction.class);
-      action.executeRequest();
-      assert action.getHello().equals("hello");
-      assert action.getGoodBye().equals("goodbye");
-   }
-   
-   @Test(description = "Simple test for no-interface views", groups="broken")
-   public void testNoInterfaceView()
-   {
-      Castle castle = getReference(Castle.class);
-      castle.ping();
-      assert castle.isPinged();
-      assert getBean(Castle.class) instanceof SessionBean<?>;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,111 @@
+/*
+
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.EJBException;
+
+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.testharness.impl.packaging.ear.EjbJarXml;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at EjbJarXml("ejb-jar.xml")
+public class EnterpriseBeanTest extends AbstractWeldTest
+{
+   
+   @Test(description="WBRI-179")
+   public void testSFSBWithOnlyRemoteInterfacesDeploys()
+   {
+      
+   }
+   
+   @Test(description="WELD-326")
+   public void testInvocationExceptionIsUnwrapped()
+   {
+      try
+      {
+         getReference(Fedora.class).causeRuntimeException();
+      }
+      catch (Throwable t)
+      {
+         if (t instanceof EJBException && t.getCause() instanceof BowlerHatException)
+         {
+            return;
+         }
+      }
+      assert false : "Expected a BowlerHatException to be thrown";
+   }   
+   
+   @Test(description="WBRI-275")
+   public void testSLSBBusinessMethodThrowsRuntimeException()
+   {
+      try
+      {
+         getReference(Fedora.class).causeRuntimeException();
+      }
+      catch (Throwable t) 
+      {
+         if (Utils.isExceptionInHierarchy(t, BowlerHatException.class))
+         {
+            return;
+         }
+      }
+      assert false : "Expected a BowlerHatException to be in the cause stack";
+   }
+   
+   @Test(description="WELD-364", groups = "broken")
+   public void testEJBRemoteInterfacesOkForObservers()
+   {
+      Feed feed = new Feed();
+      getCurrentManager().fireEvent(feed);
+      assert getReference(Scottish.class).getFeed().equals(feed);
+   }
+   
+   @Test(description = "WELD-381")
+   public void testGenericEJBWorks()
+   {
+      assert getReference(ResultClient.class).lookupPete().getUsername().equals("pete");
+   }
+   
+   @Test(description = "WELD-80", groups = "broken")
+   public void testPassivationOfEjbs()
+   {
+      HelloAction action = getReference(HelloAction.class);
+      action.executeRequest();
+      assert action.getHello().equals("hello");
+      assert action.getGoodBye().equals("goodbye");
+   }
+   
+   @Test(description = "Simple test for no-interface views", groups="broken")
+   public void testNoInterfaceView()
+   {
+      Castle castle = getReference(Castle.class);
+      castle.ping();
+      assert castle.isPinged();
+      assert getBean(Castle.class) instanceof SessionBean<?>;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface Fedora
-{
-   
-   public void causeRuntimeException();
-   
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Fedora.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Fedora
+{
+   
+   public void causeRuntimeException();
+   
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class FedoraImpl implements Fedora
-{
-
-   public void causeRuntimeException()
-   {
-      throw new BowlerHatException();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/FedoraImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class FedoraImpl implements Fedora
+{
+
+   public void causeRuntimeException()
+   {
+      throw new BowlerHatException();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-public class Feed
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Feed.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+public class Feed
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateful;
-
- at Stateful
-public class Hat implements HatRemote
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Hat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+public class Hat implements HatRemote
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface HatRemote
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HatRemote.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface HatRemote
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.inject.Inject;
-
-public class HelloAction
-{
-   
-   public static long sleepDuration = 1000 * 2;
-   
-   @Inject
-   private IHelloBean helloBean;
-
-   private String hello;
-   private String goodBye;
-
-   public void executeRequest()
-   {
-      hello = helloBean.sayHello();
-      try
-      {
-         Thread.sleep(sleepDuration);
-      }
-      catch (InterruptedException e)
-      {
-         System.out.println("Caught Interruption.");
-      }
-      goodBye = helloBean.sayGoodbye();
-   }
-
-   public String getHello()
-   {
-      return hello;
-   }
-
-   public String getGoodBye()
-   {
-      return goodBye;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloAction.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.inject.Inject;
+
+public class HelloAction
+{
+   
+   public static long sleepDuration = 1000 * 2;
+   
+   @Inject
+   private IHelloBean helloBean;
+
+   private String hello;
+   private String goodBye;
+
+   public void executeRequest()
+   {
+      hello = helloBean.sayHello();
+      try
+      {
+         Thread.sleep(sleepDuration);
+      }
+      catch (InterruptedException e)
+      {
+         System.out.println("Caught Interruption.");
+      }
+      goodBye = helloBean.sayGoodbye();
+   }
+
+   public String getHello()
+   {
+      return hello;
+   }
+
+   public String getGoodBye()
+   {
+      return goodBye;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.annotation.Resource;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-
- at Stateful
- at SessionScoped
- at CacheConfig(idleTimeoutSeconds=1)
-public class HelloBean implements IHelloBean
-{
-   @Resource(mappedName = "java:comp/BeanManager")
-   private BeanManager beanManager;
-
-   public String sayHello()
-   {
-      return "hello";
-   }
-
-   public String sayGoodbye()
-   {
-      return beanManager.getELResolver() != null ? "goodbye" : "error";
-   }
-
-   @Remove
-   public void remove()
-   {
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.annotation.Resource;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+
+ at Stateful
+ at SessionScoped
+ at CacheConfig(idleTimeoutSeconds=1)
+public class HelloBean implements IHelloBean
+{
+   @Resource(mappedName = "java:comp/BeanManager")
+   private BeanManager beanManager;
+
+   public String sayHello()
+   {
+      return "hello";
+   }
+
+   public String sayGoodbye()
+   {
+      return beanManager.getELResolver() != null ? "goodbye" : "error";
+   }
+
+   @Remove
+   public void remove()
+   {
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface IHelloBean
-{
-
-   public abstract String sayHello();
-
-   public abstract String sayGoodbye();
-
-   public abstract void remove();
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/IHelloBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface IHelloBean
+{
+
+   public abstract String sayHello();
+
+   public abstract String sayGoodbye();
+
+   public abstract void remove();
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-public class Result
-{
-   
-   private final String username;
-   
-   public Result(String username)
-   {
-      this.username = username;
-   }
-
-   public String getUsername()
-   {
-      return username;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Result.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+public class Result
+{
+   
+   private final String username;
+   
+   public Result(String username)
+   {
+      this.username = username;
+   }
+
+   public String getUsername()
+   {
+      return username;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.inject.Inject;
-
-public class ResultClient
-{
-   
-   @Inject @DAO ResultDAO result;
-   
-   public Result lookupPete()
-   {
-      return result.findByUser("pete");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultClient.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.inject.Inject;
+
+public class ResultClient
+{
+   
+   @Inject @DAO ResultDAO result;
+   
+   public Result lookupPete()
+   {
+      return result.findByUser("pete");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface ResultDAO extends AbstractDAO<Result>
-{
-
-   public Result findByUser(String username);
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAO.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface ResultDAO extends AbstractDAO<Result>
+{
+
+   public Result findByUser(String username);
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Stateless;
-
- at DAO
- at Stateless
-public class ResultDAOImpl extends AbstractDAOImpl<Result> implements ResultDAO
-{
-   public Result findByUser(String username)
-   {
-      return new Result(username);
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/ResultDAOImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Stateless;
+
+ at DAO
+ at Stateless
+public class ResultDAOImpl extends AbstractDAOImpl<Result> implements ResultDAO
+{
+   public Result findByUser(String username)
+   {
+      return new Result(username);
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface Scottish
-{
-
-   public Feed getFeed();
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Scottish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Scottish
+{
+
+   public Feed getFeed();
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface AlteStadt
-{
-   public String getPlaceOfInterest();
-   
-   public void performPostConstructChecks();
-   
-   public void initializeBean(GutenbergMuseum pointOfInterest);
-   
-   public GutenbergMuseum getAnotherPlaceOfInterest();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlteStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface AlteStadt
+{
+   public String getPlaceOfInterest();
+   
+   public void performPostConstructChecks();
+   
+   public void initializeBean(GutenbergMuseum pointOfInterest);
+   
+   public GutenbergMuseum getAnotherPlaceOfInterest();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class BeanImpl implements BeanLocal
-{
-   
-   public void ping()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class BeanImpl implements BeanLocal
+{
+   
+   public void ping()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-public interface BeanLocal
-{
-   
-   public void ping();
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/BeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+public interface BeanLocal
+{
+   
+   public void ping();
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Stateful;
-
- at Stateful
-public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface DirectOrderProcessorLocal
-{
-   void order();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/DirectOrderProcessorLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface DirectOrderProcessorLocal
+{
+   void order();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-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.Container;
-import org.jboss.weld.context.ContextLifecycle;
-import org.jboss.weld.context.RequestContext;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * Sections
- * 
- * 6.5. Lifecycle of stateful session beans 
- * 6.6. Lifecycle of stateless session and singleton beans 
- * 6.11. Lifecycle of EJBs
- * 
- * Mostly overlapping with other tests...
- * 
- * @author Nicklas Karlsson
- * @author David Allen
- * 
- * Spec version: Public Release Draft 2
- * 
- */
- at Artifact
- at Packaging(PackagingType.EAR)
- at IntegrationTest
-public class EnterpriseBeanLifecycleTest extends AbstractWeldTest
-{
-
-   /**
-    * When the create() method of a Bean object that represents a stateful
-    * session bean that is called, the container creates and returns a session
-    * bean proxy, as defined in Section 3.3.9, "Session bean proxies".
-    */
-   @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
-   public void testCreateSFSB()
-   {
-      GrossStadt frankfurt = getReference(GrossStadt.class);
-      Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
-      assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
-      CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
-      KleinStadt stadtInstance = stadtBean.create(creationalContext);
-      assert stadtInstance != null : "Expected instance to be created by container";
-      assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked when bean instance is created";
-      frankfurt.resetCreatedFlags();
-      
-      // Create a second one to make sure create always does create a new session bean
-      KleinStadt anotherStadtInstance = stadtBean.create(creationalContext);
-      assert anotherStadtInstance != null : "Expected second instance of session bean";
-      assert frankfurt.isKleinStadtCreated();
-      assert anotherStadtInstance != stadtInstance : "create() should not return same bean as before";
-      
-      // Verify that the instance returned is a proxy by checking for all local interfaces
-      assert stadtInstance instanceof KleinStadt;
-      assert stadtInstance instanceof SchoeneStadt;
-   }
-
-   @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
-   public void testDestroyRemovesSFSB() throws Exception
-   {
-      GrossStadt frankfurt = getReference(GrossStadt.class);
-      Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
-      assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
-      RequestContext requestContext = Container.instance().services().get(ContextLifecycle.class).getRequestContext();
-      CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
-      KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
-      stadtBean.destroy(kassel, creationalContext);
-      
-      assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed";
-      requestContext.destroy();
-      kassel = requestContext.get(stadtBean);
-      assert kassel == null : "SFSB bean should not exist after being destroyed";
-   }
-   
-   @Test
-   public void testDestroyDoesntTryToRemoveSLSB()
-   {
-      Bean<BeanLocal> bean = getBean(BeanLocal.class);
-      assert bean != null : "Expected a bean for stateless session bean BeanLocal";
-      CreationalContext<BeanLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
-      BeanLocal instance = bean.create(creationalContext);
-      bean.destroy(instance, creationalContext);
-   }
- 
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+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.Container;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.RequestContext;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Sections
+ * 
+ * 6.5. Lifecycle of stateful session beans 
+ * 6.6. Lifecycle of stateless session and singleton beans 
+ * 6.11. Lifecycle of EJBs
+ * 
+ * Mostly overlapping with other tests...
+ * 
+ * @author Nicklas Karlsson
+ * @author David Allen
+ * 
+ * Spec version: Public Release Draft 2
+ * 
+ */
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at IntegrationTest
+public class EnterpriseBeanLifecycleTest extends AbstractWeldTest
+{
+
+   /**
+    * When the create() method of a Bean object that represents a stateful
+    * session bean that is called, the container creates and returns a session
+    * bean proxy, as defined in Section 3.3.9, "Session bean proxies".
+    */
+   @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+   public void testCreateSFSB()
+   {
+      GrossStadt frankfurt = getReference(GrossStadt.class);
+      Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
+      assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
+      CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
+      KleinStadt stadtInstance = stadtBean.create(creationalContext);
+      assert stadtInstance != null : "Expected instance to be created by container";
+      assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked when bean instance is created";
+      frankfurt.resetCreatedFlags();
+      
+      // Create a second one to make sure create always does create a new session bean
+      KleinStadt anotherStadtInstance = stadtBean.create(creationalContext);
+      assert anotherStadtInstance != null : "Expected second instance of session bean";
+      assert frankfurt.isKleinStadtCreated();
+      assert anotherStadtInstance != stadtInstance : "create() should not return same bean as before";
+      
+      // Verify that the instance returned is a proxy by checking for all local interfaces
+      assert stadtInstance instanceof KleinStadt;
+      assert stadtInstance instanceof SchoeneStadt;
+   }
+
+   @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+   public void testDestroyRemovesSFSB() throws Exception
+   {
+      GrossStadt frankfurt = getReference(GrossStadt.class);
+      Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
+      assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
+      RequestContext requestContext = Container.instance().services().get(ContextLifecycle.class).getRequestContext();
+      CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
+      KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
+      stadtBean.destroy(kassel, creationalContext);
+      
+      assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed";
+      requestContext.destroy();
+      kassel = requestContext.get(stadtBean);
+      assert kassel == null : "SFSB bean should not exist after being destroyed";
+   }
+   
+   @Test
+   public void testDestroyDoesntTryToRemoveSLSB()
+   {
+      Bean<BeanLocal> bean = getBean(BeanLocal.class);
+      assert bean != null : "Expected a bean for stateless session bean BeanLocal";
+      CreationalContext<BeanLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
+      BeanLocal instance = bean.create(creationalContext);
+      bean.destroy(instance, creationalContext);
+   }
+ 
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.RequestScoped;
-
- at Stateful
- at RequestScoped
-public class FrankfurtAmMain implements GrossStadt
-{
-
-   private boolean kleinStadtCreated = false;
-   private boolean kleinStadtDestroyed = false;
-   
-   public boolean isKleinStadtCreated()
-   {
-      return kleinStadtCreated;
-   }
-
-   public boolean isKleinStadtDestroyed()
-   {
-      return kleinStadtDestroyed;
-   }
-
-   public void kleinStadtCreated()
-   {
-      kleinStadtCreated = true;
-   }
-
-   public void kleinStadtDestroyed()
-   {
-      kleinStadtDestroyed = true;
-   }
-
-   public void resetCreatedFlags()
-   {
-      kleinStadtCreated = false;
-   }
-
-   public void resetDestroyedFlags()
-   {
-      kleinStadtDestroyed = false;
-   }
-
-   @Remove
-   public void dispose()
-   {
-   }
-
-   private boolean schlossDestroyed = false;
-
-   public boolean isSchlossDestroyed()
-   {
-      return schlossDestroyed;
-   }
-
-   public void schlossDestroyed()
-   {
-      schlossDestroyed = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/FrankfurtAmMain.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
+
+ at Stateful
+ at RequestScoped
+public class FrankfurtAmMain implements GrossStadt
+{
+
+   private boolean kleinStadtCreated = false;
+   private boolean kleinStadtDestroyed = false;
+   
+   public boolean isKleinStadtCreated()
+   {
+      return kleinStadtCreated;
+   }
+
+   public boolean isKleinStadtDestroyed()
+   {
+      return kleinStadtDestroyed;
+   }
+
+   public void kleinStadtCreated()
+   {
+      kleinStadtCreated = true;
+   }
+
+   public void kleinStadtDestroyed()
+   {
+      kleinStadtDestroyed = true;
+   }
+
+   public void resetCreatedFlags()
+   {
+      kleinStadtCreated = false;
+   }
+
+   public void resetDestroyedFlags()
+   {
+      kleinStadtDestroyed = false;
+   }
+
+   @Remove
+   public void dispose()
+   {
+   }
+
+   private boolean schlossDestroyed = false;
+
+   public boolean isSchlossDestroyed()
+   {
+      return schlossDestroyed;
+   }
+
+   public void schlossDestroyed()
+   {
+      schlossDestroyed = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface GeschichtslosStadt
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GeschichtslosStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface GeschichtslosStadt
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-public class Giessen implements NeueStadt, GeschichtslosStadt
-{
-
-   public void mehrBauen()
-   {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Giessen.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+public class Giessen implements NeueStadt, GeschichtslosStadt
+{
+
+   public void mehrBauen()
+   {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface GrossStadt
-{
-   public void kleinStadtCreated();
-   
-   public void kleinStadtDestroyed();
-   
-   public boolean isKleinStadtCreated();
-   
-   public boolean isKleinStadtDestroyed();
-   
-   public void resetCreatedFlags();
-   
-   public void resetDestroyedFlags();
-   
-   public void dispose();
-
-   public void schlossDestroyed();
-
-   public boolean isSchlossDestroyed();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GrossStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface GrossStadt
+{
+   public void kleinStadtCreated();
+   
+   public void kleinStadtDestroyed();
+   
+   public boolean isKleinStadtCreated();
+   
+   public boolean isKleinStadtDestroyed();
+   
+   public void resetCreatedFlags();
+   
+   public void resetDestroyedFlags();
+   
+   public void dispose();
+
+   public void schlossDestroyed();
+
+   public boolean isSchlossDestroyed();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-public class GutenbergMuseum
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/GutenbergMuseum.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+public class GutenbergMuseum
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Stateful;
-
- at Stateful
-public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal
-{
- 
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IndirectOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal
+{
+ 
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-class IntermediateOrderProcessor extends OrderProcessor
-{
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/IntermediateOrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+class IntermediateOrderProcessor extends OrderProcessor
+{
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
- at Stateful
- at RequestScoped
-public class Kassel implements KleinStadt, SchoeneStadt
-{
-   @Inject
-   private GrossStadt grossStadt;
-   
-   @PostConstruct
-   public void begruendet()
-   {
-      grossStadt.kleinStadtCreated();
-   }
-
-   @Remove
-   public void zustandVergessen()
-   {
-   }
-
-   @PreDestroy
-   public void zustandVerloren()
-   {
-      grossStadt.kleinStadtDestroyed();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Kassel.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+ at Stateful
+ at RequestScoped
+public class Kassel implements KleinStadt, SchoeneStadt
+{
+   @Inject
+   private GrossStadt grossStadt;
+   
+   @PostConstruct
+   public void begruendet()
+   {
+      grossStadt.kleinStadtCreated();
+   }
+
+   @Remove
+   public void zustandVergessen()
+   {
+   }
+
+   @PreDestroy
+   public void zustandVerloren()
+   {
+      grossStadt.kleinStadtDestroyed();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface KleinStadt
-{
-   public void begruendet();
-   
-   public void zustandVergessen();
-   
-   public void zustandVerloren();
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/KleinStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface KleinStadt
+{
+   public void begruendet();
+   
+   public void zustandVergessen();
+   
+   public void zustandVerloren();
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.annotation.PreDestroy;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
- at Stateful
- at Dependent
-public class LandgraffenSchloss implements Schloss
-{
-   @Inject
-   private GrossStadt biggerCity;
-
-   @PreDestroy
-   public void destructionCallback()
-   {
-      biggerCity.schlossDestroyed();
-   }
-
-   @Remove
-   public void remove()
-   {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/LandgraffenSchloss.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+ at Stateful
+ at Dependent
+public class LandgraffenSchloss implements Schloss
+{
+   @Inject
+   private GrossStadt biggerCity;
+
+   @PreDestroy
+   public void destructionCallback()
+   {
+      biggerCity.schlossDestroyed();
+   }
+
+   @Remove
+   public void remove()
+   {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
- at Stateless
-public class Mainz implements AlteStadt
-{
-   @Inject
-   private RoemerPassage placeOfInterest;
-   
-   private GutenbergMuseum anotherPlaceOfInterest;
-   
-   private String name;
-
-   public String getPlaceOfInterest()
-   {
-      return name;
-   }
-
-   @PostConstruct
-   public void performPostConstructChecks()
-   {
-      if ( placeOfInterest != null )
-         name = placeOfInterest.getName();
-   }
-   
-   @Inject
-   public void initializeBean(GutenbergMuseum pointOfInterest)
-   {
-      this.anotherPlaceOfInterest = pointOfInterest;
-   }
-
-   public GutenbergMuseum getAnotherPlaceOfInterest()
-   {
-      return anotherPlaceOfInterest;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Mainz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+ at Stateless
+public class Mainz implements AlteStadt
+{
+   @Inject
+   private RoemerPassage placeOfInterest;
+   
+   private GutenbergMuseum anotherPlaceOfInterest;
+   
+   private String name;
+
+   public String getPlaceOfInterest()
+   {
+      return name;
+   }
+
+   @PostConstruct
+   public void performPostConstructChecks()
+   {
+      if ( placeOfInterest != null )
+         name = placeOfInterest.getName();
+   }
+   
+   @Inject
+   public void initializeBean(GutenbergMuseum pointOfInterest)
+   {
+      this.anotherPlaceOfInterest = pointOfInterest;
+   }
+
+   public GutenbergMuseum getAnotherPlaceOfInterest()
+   {
+      return anotherPlaceOfInterest;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-
- at Stateful
-public class Marburg implements UniStadt
-{
-   @Inject
-   private Schloss theCastle;
-
-   @Remove
-   public void removeBean()
-   {
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Marburg.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Inject;
+
+ at Stateful
+public class Marburg implements UniStadt
+{
+   @Inject
+   private Schloss theCastle;
+
+   @Remove
+   public void removeBean()
+   {
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.enterprise.context.spi.CreationalContext;
-
-public class MockCreationalContext<T> implements CreationalContext<T>
-{
-
-   public void push(T incompleteInstance)
-   {
-
-   }
-   
-   public void release()
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MockCreationalContext.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.enterprise.context.spi.CreationalContext;
+
+public class MockCreationalContext<T> implements CreationalContext<T>
+{
+
+   public void push(T incompleteInstance)
+   {
+
+   }
+   
+   public void release()
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface NeueStadt
-{
-   public void mehrBauen();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/NeueStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface NeueStadt
+{
+   public void mehrBauen();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-public class OrderProcessor
-{   
-   public static boolean postConstructCalled = false;
-   
-   public static boolean preDestroyCalled = true;
-   
-   @PostConstruct
-   public void postConstruct()
-   {
-      postConstructCalled = true;
-   }
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      preDestroyCalled = true;
-   }
-   
-   public void order()
-   {
-      
-   }
-    
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+public class OrderProcessor
+{   
+   public static boolean postConstructCalled = false;
+   
+   public static boolean preDestroyCalled = true;
+   
+   @PostConstruct
+   public void postConstruct()
+   {
+      postConstructCalled = true;
+   }
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      preDestroyCalled = true;
+   }
+   
+   public void order()
+   {
+      
+   }
+    
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface OrderProcessorLocal
-{
-   void order();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/OrderProcessorLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface OrderProcessorLocal
+{
+   void order();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-class RoemerPassage
-{
-   public final static String name = "RoemerPassage";
-   
-   public String getName()
-   {
-      return name;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RoemerPassage.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+class RoemerPassage
+{
+   public final static String name = "RoemerPassage";
+   
+   public String getName()
+   {
+      return name;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface Schloss
-{
-   public void destructionCallback();
-   
-   public void remove();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/Schloss.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Schloss
+{
+   public void destructionCallback();
+   
+   public void remove();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface SchoeneStadt
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/SchoeneStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface SchoeneStadt
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
-
-import javax.ejb.Local;
-
- at Local
-public interface UniStadt
-{
-   public void removeBean();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/UniStadt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+ at Local
+public interface UniStadt
+{
+   public void removeBean();
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
-
-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.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
- at IntegrationTest
-public class EnterpriseBeanLifecycleTest extends AbstractWeldTest
-{
-
-   @Test(description="WELD-290")
-   public void testSLSBInjectedIntoPassivatingManagedBean()
-   {
-      SimpleBean bean = getReference(SimpleBean.class);
-      assert bean.getMessage().equals("This is my message from my stateless bean");
-      
-   }
- 
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
+
+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.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at IntegrationTest
+public class EnterpriseBeanLifecycleTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-290")
+   public void testSLSBInjectedIntoPassivatingManagedBean()
+   {
+      SimpleBean bean = getReference(SimpleBean.class);
+      assert bean.getMessage().equals("This is my message from my stateless bean");
+      
+   }
+ 
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
-
-import java.io.Serializable;
-
-import javax.ejb.Stateless;
-
-/**
- * Session Bean implementation class MyStatelessBean
- */
- at Stateless
-public class MyStatelessBean implements MyStatelessBeanLocal, Serializable
-{
-
-   public String getText()
-   {
-      return "This is my message from my stateless bean";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
+
+import java.io.Serializable;
+
+import javax.ejb.Stateless;
+
+/**
+ * Session Bean implementation class MyStatelessBean
+ */
+ at Stateless
+public class MyStatelessBean implements MyStatelessBeanLocal, Serializable
+{
+
+   public String getText()
+   {
+      return "This is my message from my stateless bean";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
-
-import javax.ejb.Local;
-
- at Local
-public interface MyStatelessBeanLocal
-{
-
-   String getText();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/MyStatelessBeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
+
+import javax.ejb.Local;
+
+ at Local
+public interface MyStatelessBeanLocal
+{
+
+   String getText();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class SimpleBean implements Serializable
-{
-
-   @Inject
-   private MyStatelessBeanLocal myStatelessBean;
-
-   public String getMessage()
-   {
-      return myStatelessBean.getText();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/proxyability/SimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.enterprise.proxyability;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class SimpleBean implements Serializable
+{
+
+   @Inject
+   private MyStatelessBeanLocal myStatelessBean;
+
+   public String getMessage()
+   {
+      return myStatelessBean.getText();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+ at RequestScoped
+public class Bar
+{
+
+   @Inject Event<String> event;
+   
+   @Inject @Updated Event<String> updatedEvent;
+   
+   @Inject BeanManager manager;
+   
+   private boolean unqualifiedObserved;
+   private boolean updatedObserved;
+
+   public void fireWithNoQualifiers()
+   {
+      event.fire("");
+   }
+   
+   public void fireWithUpdatedQualifierViaSelect()
+   {
+      event.select(new AnnotationLiteral<Updated>() {}).fire("");
+   }
+   
+   public void fireWithNoQualifiersViaManager()
+   {
+      manager.fireEvent("");
+   }
+   
+   public void fireWithUpdatedQualifierViaManager()
+   {
+      manager.fireEvent("", new AnnotationLiteral<Updated>() {});
+   }
+   
+   public void fireWithUpdatedQualifierViaAnnotation()
+   {
+      updatedEvent.fire("");
+   }
+   
+   public void reset()
+   {
+      unqualifiedObserved = false;
+      updatedObserved = false;
+   }
+
+   public void onEvent(@Observes String event)
+   {
+      unqualifiedObserved = true;
+   }
+
+   private void onUpdatedEvent(@Observes @Updated String event)
+   {
+      updatedObserved = true;
+   }
+   
+   public boolean isUnqualifiedObserved()
+   {
+      return unqualifiedObserved;
+   }
+   
+   public boolean isUpdatedObserved()
+   {
+      return updatedObserved;
+   }
+   
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/EventQualifierTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/EventQualifierTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/EventQualifierTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/EventQualifierTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class EventQualifierTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-226")
+   public void testDefaultQualifierNotRequired()
+   {
+      Bar bar = getReference(Bar.class);
+      bar.fireWithNoQualifiers();
+      assert bar.isUnqualifiedObserved();
+      assert !bar.isUpdatedObserved();
+      bar.reset();
+      bar.fireWithNoQualifiersViaManager();
+      assert bar.isUnqualifiedObserved();
+      assert !bar.isUpdatedObserved();
+      bar.reset();
+      bar.fireWithUpdatedQualifierViaAnnotation();
+      assert bar.isUnqualifiedObserved();
+      assert bar.isUpdatedObserved();
+      bar.reset();
+      bar.fireWithUpdatedQualifierViaManager();
+      assert bar.isUpdatedObserved();
+      assert bar.isUnqualifiedObserved();
+      bar.reset();
+      bar.fireWithUpdatedQualifierViaSelect();
+      assert bar.isUnqualifiedObserved();
+      assert bar.isUpdatedObserved();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+public class Foo
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/NormalScopedBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/NormalScopedBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/NormalScopedBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/NormalScopedBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+
+ at SessionScoped
+public class NormalScopedBean implements Serializable
+{
+
+   @Any Event<Foo> event;
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/SimpleEventTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/SimpleEventTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/SimpleEventTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/SimpleEventTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact 
+public class SimpleEventTest extends AbstractWeldTest
+{
+   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_1_OBSERVED == true;
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_3_OBSERVED == true;
+      
+      initFlags();
+      
+      manager.fireEvent("Fired using Manager Interface.");
+      
+      assert RECEIVE_1_OBSERVED == false; // not called
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_3_OBSERVED == true;
+   }
+   
+   @Test
+   public void testFireEventOnEvent()
+   {
+      App app = getReference(App.class);
+      
+      initFlags();
+      
+      app.fireEventByBindingDeclaredAtInjectionPoint();
+
+      assert RECEIVE_1_OBSERVED == true;
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_3_OBSERVED == true;
+      
+      initFlags();
+      
+      app.fireEventByAnnotationLiteral();
+      
+      assert RECEIVE_1_OBSERVED == true;
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_3_OBSERVED == true;
+      
+      initFlags();
+      
+      app.fireEventViaAny();
+      
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_1_OBSERVED == false; // not called
+      assert RECEIVE_3_OBSERVED == true;
+      
+      initFlags();
+      
+      app.fireEventViaWithNoQualifier();
+      
+      assert RECEIVE_1_OBSERVED == false; // not called
+      assert RECEIVE_2_OBSERVED == true;
+      assert RECEIVE_3_OBSERVED == true;
+   }
+
+   public static class App
+   {
+      @Inject @Any
+      Event<String> event1;
+      
+      @Inject @Updated
+      Event<String> event2;
+      
+      @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()
+      {
+         event1.fire("Fired using Event Interface");
+      }
+      
+      public void fireEventViaWithNoQualifier()
+      {
+         event4.fire("Fired using Event Interface with no qualifier");
+      }
+   }
+
+   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: core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Updated.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Updated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Updated.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/event/Updated.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.event;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+ at interface Updated
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ExampleTest extends AbstractWeldTest
-{
-   @Test
-   public void testGameGenerator() throws Exception 
-   {
-     Game game1 = getReference(Game.class);
-     Game game2 = getReference(Game.class);
-     assert game1!=game2;
-     assert game1.getNumber()!=game2.getNumber();
-     Generator gen1 = getReference(Generator.class);
-     Generator gen2 = getReference(Generator.class);
-     assert gen1.getRandom()!=null;
-     assert gen1.getRandom()==gen2.getRandom();
-   }
-
-   @Test
-   public void testSentenceTranslator() throws Exception 
-   {
-      
-      TextTranslator tt1 = getReference(TextTranslator.class);
-      try 
-      {
-         tt1.translate("hello world");
-         assert false;
-      }
-      catch (UnsupportedOperationException uoe)
-      {
-         //expected
-      }
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ExampleTest extends AbstractWeldTest
+{
+   @Test
+   public void testGameGenerator() throws Exception 
+   {
+     Game game1 = getReference(Game.class);
+     Game game2 = getReference(Game.class);
+     assert game1!=game2;
+     assert game1.getNumber()!=game2.getNumber();
+     Generator gen1 = getReference(Generator.class);
+     Generator gen2 = getReference(Generator.class);
+     assert gen1.getRandom()!=null;
+     assert gen1.getRandom()==gen2.getRandom();
+   }
+
+   @Test
+   public void testSentenceTranslator() throws Exception 
+   {
+      
+      TextTranslator tt1 = getReference(TextTranslator.class);
+      try 
+      {
+         tt1.translate("hello world");
+         assert false;
+      }
+      catch (UnsupportedOperationException uoe)
+      {
+         //expected
+      }
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import javax.inject.Inject;
-
-public class Game
-{
-   private final int number;
-   
-   @Inject
-   Game(@Random int number)
-   {
-      this.number = number;
-   }
-
-   public int getNumber()
-   {
-      return number;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Game.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import javax.inject.Inject;
+
+public class Game
+{
+   private final int number;
+   
+   @Inject
+   Game(@Random int number)
+   {
+      this.number = number;
+   }
+
+   public int getNumber()
+   {
+      return number;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
- at ApplicationScoped
-public class Generator {
-   
-   private int lastInt = 0;
-   private java.util.Random random = new java.util.Random( System.currentTimeMillis() ); 
-   
-   java.util.Random getRandom()
-   {
-      return random;
-   }
-   
-   @Produces @Random int next() {
-      int nextInt = getRandom().nextInt(100);
-      while (nextInt == lastInt)
-      {
-         nextInt = getRandom().nextInt(100);
-      }
-      lastInt = nextInt;      
-      return nextInt; 
-   }
-
-} 

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Generator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+
+ at ApplicationScoped
+public class Generator {
+   
+   private int lastInt = 0;
+   private java.util.Random random = new java.util.Random( System.currentTimeMillis() ); 
+   
+   java.util.Random getRandom()
+   {
+      return random;
+   }
+   
+   @Produces @Random int next() {
+      int nextInt = getRandom().nextInt(100);
+      while (nextInt == lastInt)
+      {
+         nextInt = getRandom().nextInt(100);
+      }
+      lastInt = nextInt;      
+      return nextInt; 
+   }
+
+} 

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at BeansXml("beans.xml")
-public class MockExampleTest extends AbstractWeldTest
-{
-   
-   @Test
-   public void testMockSentenceTranslator() throws Exception 
-   {   
-      TextTranslator tt2 = getReference(TextTranslator.class);
-      assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") );
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class MockExampleTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testMockSentenceTranslator() throws Exception 
+   {   
+      TextTranslator tt2 = getReference(TextTranslator.class);
+      assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") );
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import javax.enterprise.inject.Alternative;
-
- at Alternative
-public class MockSentenceTranslator implements Translator { 
-   public String translate(String sentence) { 
-      return "Lorem ipsum dolor sit amet"; 
-   }
-} 

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/MockSentenceTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import javax.enterprise.inject.Alternative;
+
+ at Alternative
+public class MockSentenceTranslator implements Translator { 
+   public String translate(String sentence) { 
+      return "Lorem ipsum dolor sit amet"; 
+   }
+} 

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Random
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Random
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class SentenceParser { 
-   public List<String> parse(String text) {
-      return Arrays.asList( text.split("[.?]") );
-   } 
-} 

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceParser.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SentenceParser { 
+   public List<String> parse(String text) {
+      return Arrays.asList( text.split("[.?]") );
+   } 
+} 

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-
-public class SentenceTranslator implements Translator { 
-public String translate(String sentence) { 
-   throw new UnsupportedOperationException();
-} 
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/SentenceTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+
+public class SentenceTranslator implements Translator { 
+public String translate(String sentence) { 
+   throw new UnsupportedOperationException();
+} 
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import javax.inject.Inject;
-
-public class TextTranslator { 
-   private SentenceParser sentenceParser; 
-   private Translator sentenceTranslator; 
-   
-   @Inject
-   TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) { 
-      this.sentenceParser = sentenceParser; 
-      this.sentenceTranslator = sentenceTranslator; 
-   }
-   
-   public String translate(String text) { 
-      StringBuilder sb = new StringBuilder(); 
-      for (String sentence: sentenceParser.parse(text)) { 
-         sb.append(sentenceTranslator.translate(sentence)).append(". "); 
-      } 
-      return sb.toString().trim(); 
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/TextTranslator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import javax.inject.Inject;
+
+public class TextTranslator { 
+   private SentenceParser sentenceParser; 
+   private Translator sentenceTranslator; 
+   
+   @Inject
+   TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) { 
+      this.sentenceParser = sentenceParser; 
+      this.sentenceTranslator = sentenceTranslator; 
+   }
+   
+   public String translate(String text) { 
+      StringBuilder sb = new StringBuilder(); 
+      for (String sentence: sentenceParser.parse(text)) { 
+         sb.append(sentenceTranslator.translate(sentence)).append(". "); 
+      } 
+      return sb.toString().trim(); 
+   }
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.examples;
-
-import javax.ejb.Local;
-
- at Local 
-public interface Translator { 
-   public String translate(String sentence); 
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/examples/Translator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.examples;
+
+import javax.ejb.Local;
+
+ at Local 
+public interface Translator { 
+   public String translate(String sentence); 
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-import javax.enterprise.inject.CreationException;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ExceptionHandlingTest extends AbstractWeldTest
-{
-
-   @Test(expectedExceptions=FooException.class)
-   public void testCreationExceptionWrapsRealExceptionForSimpleBean() throws Exception
-   {
-      try
-      {
-         getReference(Lorry_Broken.class);
-      }
-      catch (Exception e) 
-      {
-         if (e instanceof CreationException)
-         {
-            throw (Exception) e.getCause();
-         }
-      }
-   }
-   
-
-   @Test(expectedExceptions=FooException.class)
-   public void testCreationExceptionWrapsRealExceptionForProducerBean() throws Exception
-   {
-      try
-      {
-         getReference(Ship.class, new AnnotationLiteral<Large>() {});
-      }
-      catch (Exception e) 
-      {
-         if (e instanceof CreationException)
-         {
-            throw (Exception) e.getCause();
-         }
-      }
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ExceptionHandlingTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+import javax.enterprise.inject.CreationException;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ExceptionHandlingTest extends AbstractWeldTest
+{
+
+   @Test(expectedExceptions=FooException.class)
+   public void testCreationExceptionWrapsRealExceptionForSimpleBean() throws Exception
+   {
+      try
+      {
+         getReference(Lorry_Broken.class);
+      }
+      catch (Exception e) 
+      {
+         if (e instanceof CreationException)
+         {
+            throw (Exception) e.getCause();
+         }
+      }
+   }
+   
+
+   @Test(expectedExceptions=FooException.class)
+   public void testCreationExceptionWrapsRealExceptionForProducerBean() throws Exception
+   {
+      try
+      {
+         getReference(Ship.class, new AnnotationLiteral<Large>() {});
+      }
+      catch (Exception e) 
+      {
+         if (e instanceof CreationException)
+         {
+            throw (Exception) e.getCause();
+         }
+      }
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-public class FooException extends Exception
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/FooException.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+public class FooException extends Exception
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Large
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Large.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Large
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-class Lorry_Broken
-{
-   
-   public Lorry_Broken() throws Exception
-   {
-      throw new FooException();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Lorry_Broken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+class Lorry_Broken
+{
+   
+   public Lorry_Broken() throws Exception
+   {
+      throw new FooException();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-class Ship
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/Ship.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+class Ship
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
-
-import javax.enterprise.inject.Produces;
-
-public class ShipProducer_Broken
-{
-   
-   @Produces @Large
-   public Ship produceShip() throws FooException
-   {
-      throw new FooException();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/exceptions/ShipProducer_Broken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.exceptions;
+
+import javax.enterprise.inject.Produces;
+
+public class ShipProducer_Broken
+{
+   
+   @Produces @Large
+   public Ship produceShip() throws FooException
+   {
+      throw new FooException();
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Capercaillie.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Capercaillie.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Capercaillie.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Capercaillie.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+public class Capercaillie
+{
+
+   public Capercaillie(String name)
+   {
+      // TODO Auto-generated constructor stub
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class Cow implements CowLocal
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/CowLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.ejb.Local;
+
+ at Local
+public interface CowLocal
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,295 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+import javax.enterprise.inject.spi.ProcessObserverMethod;
+import javax.enterprise.inject.spi.ProcessProducer;
+import javax.enterprise.inject.spi.ProcessProducerField;
+import javax.enterprise.inject.spi.ProcessProducerMethod;
+import javax.enterprise.inject.spi.ProcessSessionBean;
+
+public class ExtensionObserver implements Extension
+{
+   
+   private boolean allBeforeBeanDiscovery;
+   private boolean allAfterBeanDiscovery;
+   private boolean allAfterDeploymentValidation;
+   private boolean allProcessBean;
+   private boolean allProcessInjectionTarget;
+   private boolean allProcessManagedBean;
+   private boolean allProcessObserverMethod;
+   private boolean allProcessProducer;
+   private boolean allProcessProducerField;
+   private boolean allProcessProducerMethod;
+   private boolean allProcessSessionBean;
+   private boolean allProcessAnnnotatedType;
+   
+   private boolean beforeBeanDiscovery;
+   private boolean afterBeanDiscovery;
+   private boolean afterDeploymentValidation;
+   private boolean processBean;
+   private boolean processInjectionTarget;
+   private boolean processManagedBean;
+   private boolean processObserverMethod;
+   private boolean processProducer;
+   private boolean processProducerField;
+   private boolean processProducerMethod;
+   private boolean processSessionBean;
+   private boolean processAnnotatedType;
+
+   public void observeAll(@Observes Object event)
+   {
+      if (event instanceof BeforeBeanDiscovery)
+      {
+         allBeforeBeanDiscovery = true;
+      }
+      if (event instanceof AfterBeanDiscovery)
+      {
+         allAfterBeanDiscovery = true;
+      }
+      if (event instanceof AfterDeploymentValidation)
+      {
+         allAfterDeploymentValidation = true;
+      }
+      if (event instanceof ProcessBean<?> && !(event instanceof ProcessProducerField<?, ?> || event instanceof ProcessProducerMethod<?, ?> || event instanceof ProcessManagedBean<?> || event instanceof ProcessSessionBean<?>))
+      {
+         allProcessBean = true;
+      }
+      if (event instanceof ProcessInjectionTarget<?>)
+      {
+         allProcessInjectionTarget = true;
+      }
+      if (event instanceof ProcessManagedBean<?>)
+      {
+         allProcessManagedBean = true;
+      }
+      if (event instanceof ProcessObserverMethod<?, ?>)
+      {
+         allProcessObserverMethod = true;
+      }
+      if (event instanceof ProcessProducer<?, ?>)
+      {
+         allProcessProducer = true;
+      }
+      if (event instanceof ProcessProducerField<?, ?>)
+      {
+         allProcessProducerField = true;
+      }
+      if (event instanceof ProcessProducerMethod<?, ?>)
+      {
+         allProcessProducerMethod = true;
+      }
+      if (event instanceof ProcessSessionBean<?>)
+      {
+         allProcessSessionBean = true;
+      }
+      if (event instanceof ProcessAnnotatedType<?>)
+      {
+         allProcessAnnnotatedType = true;
+      }
+   }
+   
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+   {
+      beforeBeanDiscovery = true;
+   }
+   
+   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
+   {
+      afterBeanDiscovery = true;
+   }
+   
+   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
+   {
+      afterDeploymentValidation = true;
+   }
+   
+   public void observeProcessBean(@Observes ProcessBean<?> event)
+   {
+      processBean = true;
+   }
+   
+   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<?> event)
+   {
+      processInjectionTarget = true;
+   }
+   
+   public void observeProcessProducer(@Observes ProcessProducer<?, ?> event)
+   {
+      processProducer = true;
+   }
+   
+   public void observeProcessProducerMethod(@Observes ProcessProducerMethod<?, ?> event)
+   {
+      processProducerMethod = true;
+   }
+   
+   public void observeProcessProducerField(@Observes ProcessProducerField<?, ?> event)
+   {
+      processProducerField = true;
+   }
+   
+   public void observeProcessObserverMethod(@Observes ProcessObserverMethod<?, ?> event)
+   {
+      processObserverMethod = true;
+   }
+   
+   public void observeProcessManagedBean(@Observes ProcessManagedBean<?> event)
+   {
+      processManagedBean = true;
+   }
+   
+   public void observeProcessSessionBean(@Observes ProcessSessionBean<?> event)
+   {
+      processSessionBean = true;
+   }
+   
+   public void observeProcessAnnotatedType(@Observes ProcessAnnotatedType<?> event)
+   {
+      processAnnotatedType = true;
+   }
+
+   public boolean isAllBeforeBeanDiscovery()
+   {
+      return allBeforeBeanDiscovery;
+   }
+
+   public boolean isAllAfterBeanDiscovery()
+   {
+      return allAfterBeanDiscovery;
+   }
+
+   public boolean isAllAfterDeploymentValidation()
+   {
+      return allAfterDeploymentValidation;
+   }
+
+   public boolean isAllProcessBean()
+   {
+      return allProcessBean;
+   }
+
+   public boolean isAllProcessInjectionTarget()
+   {
+      return allProcessInjectionTarget;
+   }
+
+   public boolean isAllProcessManagedBean()
+   {
+      return allProcessManagedBean;
+   }
+
+   public boolean isAllProcessObserverMethod()
+   {
+      return allProcessObserverMethod;
+   }
+
+   public boolean isAllProcessProducer()
+   {
+      return allProcessProducer;
+   }
+
+   public boolean isAllProcessProducerField()
+   {
+      return allProcessProducerField;
+   }
+
+   public boolean isAllProcessProducerMethod()
+   {
+      return allProcessProducerMethod;
+   }
+
+   public boolean isAllProcessSessionBean()
+   {
+      return allProcessSessionBean;
+   }
+
+   public boolean isAllProcessAnnnotatedType()
+   {
+      return allProcessAnnnotatedType;
+   }
+
+   public boolean isBeforeBeanDiscovery()
+   {
+      return beforeBeanDiscovery;
+   }
+
+   public boolean isAfterBeanDiscovery()
+   {
+      return afterBeanDiscovery;
+   }
+
+   public boolean isAfterDeploymentValidation()
+   {
+      return afterDeploymentValidation;
+   }
+
+   public boolean isProcessBean()
+   {
+      return processBean;
+   }
+
+   public boolean isProcessInjectionTarget()
+   {
+      return processInjectionTarget;
+   }
+
+   public boolean isProcessManagedBean()
+   {
+      return processManagedBean;
+   }
+
+   public boolean isProcessObserverMethod()
+   {
+      return processObserverMethod;
+   }
+
+   public boolean isProcessProducer()
+   {
+      return processProducer;
+   }
+
+   public boolean isProcessProducerField()
+   {
+      return processProducerField;
+   }
+
+   public boolean isProcessProducerMethod()
+   {
+      return processProducerMethod;
+   }
+
+   public boolean isProcessSessionBean()
+   {
+      return processSessionBean;
+   }
+
+   public boolean isProcessAnnotatedType()
+   {
+      return processAnnotatedType;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+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.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at Extension("javax.enterprise.inject.spi.Extension")
+public class ExtensionTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-234")
+   public void testExtensionInjectableAsBean()
+   {
+      assert getReference(SimpleExtension.class).isObservedBeforeBeanDiscovery();
+   }
+   
+   @Test(description="WELD-243")
+   public void testContainerEventsOnlySentToExtensionBeans()
+   {
+      ExtensionObserver extensionObserver = getReference(ExtensionObserver.class);
+      OtherObserver otherObserver = getReference(OtherObserver.class);
+      
+      assert extensionObserver.isBeforeBeanDiscovery();
+      assert extensionObserver.isAllBeforeBeanDiscovery();
+      assert !otherObserver.isBeforeBeanDiscovery();
+      assert !otherObserver.isAllBeforeBeanDiscovery();
+      
+      assert extensionObserver.isAfterBeanDiscovery();
+      assert extensionObserver.isAllAfterBeanDiscovery();
+      assert !otherObserver.isAfterBeanDiscovery();
+      assert !otherObserver.isAllAfterBeanDiscovery();
+      
+      assert extensionObserver.isProcessAnnotatedType();
+      assert extensionObserver.isAllProcessAnnnotatedType();
+      assert !otherObserver.isProcessAnnotatedType();
+      assert !otherObserver.isAllProcessAnnotatedType();
+      
+      assert extensionObserver.isProcessBean();
+      assert extensionObserver.isAllProcessBean();
+      assert !otherObserver.isProcessBean();
+      assert !otherObserver.isAllProcessBean();
+      
+      assert extensionObserver.isProcessInjectionTarget();
+      assert extensionObserver.isAllProcessInjectionTarget();
+      assert !otherObserver.isProcessInjectionTarget();
+      assert !otherObserver.isAllProcessInjectionTarget();
+      
+      assert extensionObserver.isProcessManagedBean();
+      assert extensionObserver.isAllProcessManagedBean();
+      assert !otherObserver.isProcessManagedBean();
+      assert !otherObserver.isAllProcessManagedBean();
+      
+      assert extensionObserver.isProcessObserverMethod();
+      assert extensionObserver.isAllProcessObserverMethod();
+      assert !otherObserver.isProcessObserverMethod();
+      assert !otherObserver.isAllProcessObserverMethod();
+      
+      assert extensionObserver.isProcessProducer();
+      assert extensionObserver.isAllProcessProducer();
+      assert !otherObserver.isProcessProducer();
+      assert !otherObserver.isAllProcessProducer();
+      
+      assert extensionObserver.isProcessProducerField();
+      assert extensionObserver.isAllProcessProducerField();
+      assert !otherObserver.isProcessProducerField();
+      assert !otherObserver.isAllProcessProducerField();
+      
+      assert extensionObserver.isProcessProducerMethod();
+      assert extensionObserver.isAllProcessProducerField();
+      assert !otherObserver.isProcessProducerMethod();
+      assert !otherObserver.isAllProcessProducerMethod();
+      
+      assert extensionObserver.isProcessSessionBean();
+      assert extensionObserver.isAllProcessSessionBean();
+      assert !otherObserver.isProcessSessionBean();
+      assert !otherObserver.isAllProcessSessionBean();
+      
+      assert extensionObserver.isAfterDeploymentValidation();
+      assert extensionObserver.isAllAfterDeploymentValidation();
+      assert !otherObserver.isAfterDeploymentValidation();
+      assert !otherObserver.isAllAfterDeploymentValidation();
+      
+   }
+   
+   @Test
+   public void testInjectionTargetWrapped()
+   {
+      getReference(Capercaillie.class);
+      assert Woodland.isPostConstructCalled();
+      assert WoodlandExtension.isInjectCalled();
+      assert WoodlandExtension.isPostConstructCalled();
+      assert WoodlandExtension.isPreDestroyCalled();
+      assert WoodlandExtension.isProduceCalled();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.inject.Inject;
+
+public class Foo
+{
+   
+   @Inject SimpleExtension simpleExtension;
+   
+   public SimpleExtension getSimpleExtension()
+   {
+      return simpleExtension;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+public class Horse
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/OtherObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,296 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+import javax.enterprise.inject.spi.ProcessObserverMethod;
+import javax.enterprise.inject.spi.ProcessProducer;
+import javax.enterprise.inject.spi.ProcessProducerField;
+import javax.enterprise.inject.spi.ProcessProducerMethod;
+import javax.enterprise.inject.spi.ProcessSessionBean;
+
+ at ApplicationScoped
+public class OtherObserver
+{
+   
+   private boolean allBeforeBeanDiscovery;
+   private boolean allAfterBeanDiscovery;
+   private boolean allAfterDeploymentValidation;
+   private boolean allProcessBean;
+   private boolean allProcessInjectionTarget;
+   private boolean allProcessManagedBean;
+   private boolean allProcessObserverMethod;
+   private boolean allProcessProducer;
+   private boolean allProcessProducerField;
+   private boolean allProcessProducerMethod;
+   private boolean allProcessSession;
+   private boolean allProcessAnnotatedType;
+   
+   private boolean beforeBeanDiscovery;
+   private boolean afterBeanDiscovery;
+   private boolean afterDeploymentValidation;
+   private boolean processBean;
+   private boolean processInjectionTarget;
+   private boolean processManagedBean;
+   private boolean processObserverMethod;
+   private boolean processProducer;
+   private boolean processProducerField;
+   private boolean processProducerMethod;
+   private boolean processSessionBean;
+   private boolean processAnnotatedType;
+
+   public void observeAll(@Observes Object event)
+   {
+      if (event instanceof BeforeBeanDiscovery)
+      {
+         allBeforeBeanDiscovery = true;
+      }
+      if (event instanceof AfterBeanDiscovery)
+      {
+         allAfterBeanDiscovery = true;
+      }
+      if (event instanceof AfterDeploymentValidation)
+      {
+         allAfterDeploymentValidation = true;
+      }
+      if (event instanceof ProcessBean<?> && !(event instanceof ProcessProducerField<?, ?> || event instanceof ProcessProducerMethod<?, ?> || event instanceof ProcessManagedBean<?> || event instanceof ProcessSessionBean<?>))
+      {
+         allProcessBean = true;
+      }
+      if (event instanceof ProcessInjectionTarget<?>)
+      {
+         allProcessInjectionTarget = true;
+      }
+      if (event instanceof ProcessManagedBean<?>)
+      {
+         allProcessManagedBean = true;
+      }
+      if (event instanceof ProcessObserverMethod<?, ?>)
+      {
+         allProcessObserverMethod = true;
+      }
+      if (event instanceof ProcessProducer<?, ?>)
+      {
+         allProcessProducer = true;
+      }
+      if (event instanceof ProcessProducerField<?, ?>)
+      {
+         allProcessProducerField = true;
+      }
+      if (event instanceof ProcessProducerMethod<?, ?>)
+      {
+         allProcessProducerMethod = true;
+      }
+      if (event instanceof ProcessSessionBean<?>)
+      {
+         allProcessSession = true;
+      }
+      if (event instanceof ProcessAnnotatedType<?>)
+      {
+         allProcessAnnotatedType = true;
+      }
+   }
+   
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+   {
+      beforeBeanDiscovery = true;
+   }
+   
+   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
+   {
+      afterBeanDiscovery = true;
+   }
+   
+   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
+   {
+      afterDeploymentValidation = true;
+   }
+   
+   public void observeProcessBean(@Observes ProcessBean<?> event)
+   {
+      processBean = true;
+   }
+   
+   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<?> event)
+   {
+      processInjectionTarget = true;
+   }
+   
+   public void observeProcessProducer(@Observes ProcessProducer<?, ?> event)
+   {
+      processProducer = true;
+   }
+   
+   public void observeProcessProducerMethod(@Observes ProcessProducerMethod<?, ?> event)
+   {
+      processProducerMethod = true;
+   }
+   
+   public void observeProcessProducerField(@Observes ProcessProducerField<?, ?> event)
+   {
+      processProducerField = true;
+   }
+   
+   public void observeProcessObserverMethod(@Observes ProcessObserverMethod<?, ?> event)
+   {
+      processObserverMethod = true;
+   }
+   
+   public void observeProcessManagedBean(@Observes ProcessManagedBean<?> event)
+   {
+      processManagedBean = true;
+   }
+   
+   public void observeProcessSessionBean(@Observes ProcessSessionBean<?> event)
+   {
+      processSessionBean = true;
+   }
+   
+   public void observeProcessAnnotatedType(@Observes ProcessAnnotatedType<?> event)
+   {
+      processAnnotatedType = true;
+   }
+
+   public boolean isAllBeforeBeanDiscovery()
+   {
+      return allBeforeBeanDiscovery;
+   }
+
+   public boolean isAllAfterBeanDiscovery()
+   {
+      return allAfterBeanDiscovery;
+   }
+
+   public boolean isAllAfterDeploymentValidation()
+   {
+      return allAfterDeploymentValidation;
+   }
+
+   public boolean isAllProcessBean()
+   {
+      return allProcessBean;
+   }
+
+   public boolean isAllProcessInjectionTarget()
+   {
+      return allProcessInjectionTarget;
+   }
+
+   public boolean isAllProcessManagedBean()
+   {
+      return allProcessManagedBean;
+   }
+
+   public boolean isAllProcessObserverMethod()
+   {
+      return allProcessObserverMethod;
+   }
+
+   public boolean isAllProcessProducer()
+   {
+      return allProcessProducer;
+   }
+
+   public boolean isAllProcessProducerField()
+   {
+      return allProcessProducerField;
+   }
+
+   public boolean isAllProcessProducerMethod()
+   {
+      return allProcessProducerMethod;
+   }
+
+   public boolean isAllProcessSessionBean()
+   {
+      return allProcessSession;
+   }
+
+   public boolean isAllProcessAnnotatedType()
+   {
+      return allProcessAnnotatedType;
+   }
+
+   public boolean isBeforeBeanDiscovery()
+   {
+      return beforeBeanDiscovery;
+   }
+
+   public boolean isAfterBeanDiscovery()
+   {
+      return afterBeanDiscovery;
+   }
+
+   public boolean isAfterDeploymentValidation()
+   {
+      return afterDeploymentValidation;
+   }
+
+   public boolean isProcessBean()
+   {
+      return processBean;
+   }
+
+   public boolean isProcessInjectionTarget()
+   {
+      return processInjectionTarget;
+   }
+
+   public boolean isProcessManagedBean()
+   {
+      return processManagedBean;
+   }
+
+   public boolean isProcessObserverMethod()
+   {
+      return processObserverMethod;
+   }
+
+   public boolean isProcessProducer()
+   {
+      return processProducer;
+   }
+
+   public boolean isProcessProducerField()
+   {
+      return processProducerField;
+   }
+
+   public boolean isProcessProducerMethod()
+   {
+      return processProducerMethod;
+   }
+
+   public boolean isProcessSessionBean()
+   {
+      return processSessionBean;
+   }
+
+   public boolean isProcessAnnotatedType()
+   {
+      return processAnnotatedType;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Rat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+public class Rat
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.BeforeShutdown;
+import javax.enterprise.inject.spi.Extension;
+
+
+public class SimpleExtension implements Extension
+{
+
+   private static boolean observedBeforeBeanDiscovery;
+   
+   public void observe(@Observes BeforeBeanDiscovery event)
+   {
+      observedBeforeBeanDiscovery = true;
+   }
+   
+   public static boolean isObservedBeforeBeanDiscovery()
+   {
+      return observedBeforeBeanDiscovery;
+   }
+   
+   public void observeBeforeShutdown(@Observes BeforeShutdown beforeShutdown, BeanManager beanManager)
+   {
+      assert beanManager != null;
+      assert beanManager.getELResolver() != null;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Stable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.enterprise.inject.Produces;
+
+public class Stable
+{
+   
+   @Produces @Special Rat rat = new Rat();
+
+   @Produces @Special Horse produce()
+   {
+      return new Horse();
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Woodland.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Woodland.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Woodland.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/Woodland.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Produces;
+
+public class Woodland
+{
+   
+   private static boolean postConstructCalled;
+   
+   @Produces
+   private Capercaillie capercaillie = new Capercaillie("bob");
+   
+   @PostConstruct
+   public void postConstruct()
+   {
+      postConstructCalled = true;
+   }
+   
+   public static boolean isPostConstructCalled()
+   {
+      return postConstructCalled;
+   }
+   
+   public static void reset()
+   {
+      postConstructCalled = false;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/WoodlandExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/WoodlandExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/WoodlandExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/WoodlandExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions;
+
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+
+public class WoodlandExtension implements Extension
+{
+   
+   private static boolean injectCalled;
+   private static boolean postConstructCalled;
+   private static boolean preDestroyCalled;
+   private static boolean produceCalled;
+   
+   public void cleanup(@Observes BeforeShutdown shutdown)
+   {
+      reset();
+      Woodland.reset();
+   }
+
+   public void enhanceWoodland(final @Observes ProcessInjectionTarget<Woodland> processWoodland)
+   {
+      final InjectionTarget<Woodland> it = processWoodland.getInjectionTarget();
+      processWoodland.setInjectionTarget(new InjectionTarget<Woodland>()
+      {
+
+         public void inject(Woodland instance, CreationalContext<Woodland> ctx)
+         {
+            injectCalled = true;
+            it.inject(instance, ctx);
+         }
+
+         public void postConstruct(Woodland instance)
+         {
+            postConstructCalled = true;
+            it.postConstruct(instance);
+         }
+
+         public void preDestroy(Woodland instance)
+         {
+            preDestroyCalled = true;
+            it.preDestroy(instance);
+         }
+
+         public void dispose(Woodland instance)
+         {
+            // No-op for class bean
+            
+         }
+
+         public Set<InjectionPoint> getInjectionPoints()
+         {
+            return it.getInjectionPoints();
+         }
+
+         public Woodland produce(CreationalContext<Woodland> ctx)
+         {
+            produceCalled = true;
+            return it.produce(ctx);
+         }
+          
+      });
+   }
+   
+   public static void reset()
+   {
+      injectCalled = false;
+      postConstructCalled = false;
+      preDestroyCalled = false;
+      preDestroyCalled = false;
+   }
+   
+   public static boolean isInjectCalled()
+   {
+      return injectCalled;
+   }
+   
+   public static boolean isPostConstructCalled()
+   {
+      return postConstructCalled;
+   }
+   
+   public static boolean isPreDestroyCalled()
+   {
+      return preDestroyCalled;
+   }
+   
+   public static boolean isProduceCalled()
+   {
+      return produceCalled;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,563 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AnnotatedCallable;
+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 javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.inject.Inject;
+
+import org.jboss.weld.tests.extensions.annotatedType.EcoFriendlyWashingMachine.EcoFriendlyWashingMachineLiteral;
+import org.jboss.weld.util.collections.Arrays2;
+
+public class AnnotatedTypeExtension implements Extension
+{
+   
+   public void addTumbleDryer(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+   {
+      
+      final Set<AnnotatedConstructor<TumbleDryer>> constructors = new HashSet<AnnotatedConstructor<TumbleDryer>>();
+      final Set<AnnotatedField<? super TumbleDryer>> fields = new HashSet<AnnotatedField<? super TumbleDryer>>();
+      final Set<AnnotatedMethod<? super TumbleDryer>> methods = new HashSet<AnnotatedMethod<? super TumbleDryer>>();
+      
+      final AnnotatedType<TumbleDryer> tumbleDryer = new AnnotatedType<TumbleDryer>()
+      {
+
+         public Set<AnnotatedConstructor<TumbleDryer>> getConstructors()
+         {
+            return constructors;
+         }
+
+         public Set<AnnotatedField<? super TumbleDryer>> getFields()
+         {
+            return fields;
+         }
+         
+         public Set<AnnotatedMethod<? super TumbleDryer>> getMethods()
+         {
+            return methods;
+         }
+         
+         // Now the easy stuff
+
+         public Class<TumbleDryer> getJavaClass()
+         {
+            return TumbleDryer.class;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            // Class has no annotations
+            return null;
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.emptySet();
+         }
+
+         public Type getBaseType()
+         {
+            return TumbleDryer.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(TumbleDryer.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            // Class has no annotations
+            return false;
+         }
+         
+      };
+      
+      AnnotatedField<TumbleDryer> plug = new AnnotatedField<TumbleDryer>()
+      {
+
+         public Field getJavaMember()
+         {
+            try
+            {
+               return TumbleDryer.class.getDeclaredField("plug");
+            }
+            catch (NoSuchFieldException e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+
+         public boolean isStatic()
+         {
+            return false;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if (annotationType.equals(Inject.class))
+            {
+               return annotationType.cast(InjectLiteral.INSTANCE);
+            }
+            else if (annotationType.equals(Special.class))
+            {
+               return annotationType.cast(SpecialLiteral.INSTANCE);
+            }
+            else
+            {
+               return null;
+            }
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Arrays2.asSet(InjectLiteral.INSTANCE, SpecialLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+            return Plug.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(Plug.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            if (annotationType.equals(Inject.class) || annotationType.equals(Special.class))
+            {
+               return true;
+            }
+            else
+            {
+               return false;
+            }
+         }
+
+         public AnnotatedType<TumbleDryer> getDeclaringType()
+         {
+            return tumbleDryer;
+         }
+      };
+      fields.add(plug);
+      
+      
+      final List<AnnotatedParameter<TumbleDryer>> runningTimeParameters = new ArrayList<AnnotatedParameter<TumbleDryer>>();
+      final AnnotatedMethod<TumbleDryer> runningTimeMethod = new AnnotatedMethod<TumbleDryer>()
+      {
+
+         public Method getJavaMember()
+         {
+            try
+            {
+               return TumbleDryer.class.getDeclaredMethod("setRunningTime", RunningTime.class);
+            }
+            catch (NoSuchMethodException e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+
+         public List<AnnotatedParameter<TumbleDryer>> getParameters()
+         {
+            return runningTimeParameters;
+         }
+
+         public AnnotatedType<TumbleDryer> getDeclaringType()
+         {
+            return tumbleDryer;
+         }
+
+         public boolean isStatic()
+         {
+            return false;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if (annotationType.equals(Inject.class))
+            {
+               return annotationType.cast(InjectLiteral.INSTANCE);
+            }
+            else
+            {
+               return null;
+            }
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.<Annotation>singleton(InjectLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+            return TumbleDryer.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(TumbleDryer.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            if (annotationType.equals(Inject.class))
+            {
+               return true;
+            }
+            else
+            {
+               return false;
+            }
+         }
+         
+      };
+      methods.add(runningTimeMethod);
+      
+      final AnnotatedParameter<TumbleDryer> runningTimeParameter = new AnnotatedParameter<TumbleDryer>()
+      {
+
+         public AnnotatedCallable<TumbleDryer> getDeclaringCallable()
+         {
+            return runningTimeMethod;
+         }
+
+         public int getPosition()
+         {
+            return 0;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if (annotationType.equals(Special.class))
+            {
+               return annotationType.cast(SpecialLiteral.INSTANCE);
+            }
+            else
+            {
+               return null;
+            }
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.<Annotation>singleton(SpecialLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+            return RunningTime.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Collections.<Type>singleton(RunningTime.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            if (annotationType.equals(Special.class))
+            {
+               return true;
+            }
+            else
+            {
+               return false;
+            }
+         }
+      };
+      runningTimeParameters.add(runningTimeParameter);
+      
+      final List<AnnotatedParameter<TumbleDryer>> clothesParameters = new ArrayList<AnnotatedParameter<TumbleDryer>>();
+      final AnnotatedConstructor<TumbleDryer> clothesConstructor = new AnnotatedConstructor<TumbleDryer>()
+      {
+
+         public Constructor<TumbleDryer> getJavaMember()
+         {
+            try
+            {
+               return TumbleDryer.class.getDeclaredConstructor(Clothes.class);
+            }
+            catch (NoSuchMethodException e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+
+         public List<AnnotatedParameter<TumbleDryer>> getParameters()
+         {
+            return clothesParameters;
+         }
+
+         public AnnotatedType<TumbleDryer> getDeclaringType()
+         {
+            return tumbleDryer;
+         }
+
+         public boolean isStatic()
+         {
+            return false;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if (annotationType.equals(Inject.class))
+            {
+               return annotationType.cast(InjectLiteral.INSTANCE);
+            }
+            else
+            {
+               return null;
+            }
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.<Annotation>singleton(InjectLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+            return TumbleDryer.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(TumbleDryer.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            if (annotationType.equals(Inject.class))
+            {
+               return true;
+            }
+            else
+            {
+               return false;
+            }
+         }
+      };
+      constructors.add(clothesConstructor);
+      
+      AnnotatedParameter<TumbleDryer> clothesParameter = new AnnotatedParameter<TumbleDryer>()
+      {
+
+         public AnnotatedCallable<TumbleDryer> getDeclaringCallable()
+         {
+            return clothesConstructor;
+         }
+
+         public int getPosition()
+         {
+            return 0;
+         }
+
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if (annotationType.equals(Special.class))
+            {
+               return annotationType.cast(SpecialLiteral.INSTANCE);
+            }
+            else
+            {
+               return null;
+            }
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.<Annotation>singleton(SpecialLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+            return Clothes.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(Clothes.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            if (annotationType.equals(Special.class))
+            {
+               return true;
+            }
+            else
+            {
+               return false;
+            }
+         }
+      };
+      clothesParameters.add(clothesParameter);
+      
+      beforeBeanDiscovery.addAnnotatedType(tumbleDryer);
+   }
+   
+   /**
+    * Adds an eco friendly wasing machine
+    * @param beforeBeanDiscovery
+    */
+   public void addWashingMachine(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+   {
+      final Set<AnnotatedConstructor<WashingMachine>> constructors = new HashSet<AnnotatedConstructor<WashingMachine>>();
+      final AnnotatedType<WashingMachine> type = new AnnotatedType<WashingMachine>()
+      {
+
+         public Set<AnnotatedConstructor<WashingMachine>> getConstructors()
+         {
+            return constructors;
+         }
+
+         public Set<AnnotatedField<? super WashingMachine>> getFields()
+         {
+            return Collections.emptySet();
+         }
+
+         public Class<WashingMachine> getJavaClass()
+         {
+            return WashingMachine.class;
+         }
+
+         public Set<AnnotatedMethod<? super WashingMachine>> getMethods()
+         {
+            return Collections.emptySet();
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            if(annotationType == EcoFriendlyWashingMachine.class)
+            {
+               return annotationType.cast(EcoFriendlyWashingMachineLiteral.INSTANCE);
+            }
+            return null;
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.<Annotation>singleton(EcoFriendlyWashingMachineLiteral.INSTANCE);
+         }
+
+         public Type getBaseType()
+         {
+           return WashingMachine.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(WashingMachine.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            return annotationType == EcoFriendlyWashingMachine.class;
+         }
+         
+      };
+      
+      final AnnotatedConstructor<WashingMachine> constructor = new AnnotatedConstructor<WashingMachine>()
+      {
+
+         public Constructor<WashingMachine> getJavaMember()
+         {
+            try
+            {
+               return WashingMachine.class.getDeclaredConstructor();
+            }
+            catch (NoSuchMethodException e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+
+         public List<AnnotatedParameter<WashingMachine>> getParameters()
+         {
+            return Collections.emptyList();
+         }
+
+         public AnnotatedType<WashingMachine> getDeclaringType()
+         {
+            return type;
+         }
+
+         public boolean isStatic()
+         {
+            return false;
+         }
+
+         public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+         {
+            return null;
+         }
+
+         public Set<Annotation> getAnnotations()
+         {
+            return Collections.emptySet();
+         }
+
+         public Type getBaseType()
+         {
+            return WashingMachine.class;
+         }
+
+         public Set<Type> getTypeClosure()
+         {
+            return Arrays2.<Type>asSet(WashingMachine.class, Object.class);
+         }
+
+         public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+         {
+            return false;
+         }
+      };
+      constructors.add(constructor);
+      
+      beforeBeanDiscovery.addAnnotatedType(type);
+   }
+   
+   public void vetoOriginalTumbleDryer(@Observes ProcessAnnotatedType<TumbleDryer> event)
+   {
+      event.veto();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Set;
+
+import javax.enterprise.inject.Any;
+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.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.jboss.weld.tests.extensions.annotatedType.EcoFriendlyWashingMachine.EcoFriendlyWashingMachineLiteral;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Extension("javax.enterprise.inject.spi.Extension")
+public class AnnotatedTypeExtensionTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testMultipleBeansOfSameType()
+   {
+      Laundry laundry = getReference(Laundry.class);
+      assert laundry.ecoFriendlyWashingMachine != null;
+      assert laundry.fastWashingMachine != null;
+   }
+   
+   @Test(description = "WELD-371")
+   public void testAnnotationsAreOverridden()
+   {
+      Bean<WashingMachine> bean = getBean(WashingMachine.class, EcoFriendlyWashingMachineLiteral.INSTANCE);
+      assert Utils.annotationSetMatches(bean.getQualifiers(), Any.class, EcoFriendlyWashingMachine.class);
+      
+      // Verify overriding the class structure works
+      Clothes.reset();
+      TumbleDryer tumbleDryer = getReference(TumbleDryer.class);
+      Bean<TumbleDryer> tumbleDryerBean = getBean(TumbleDryer.class);
+      assert tumbleDryer != null;
+      
+      assert !containsConstructor(tumbleDryerBean.getInjectionPoints(), SerialNumber.class);
+      assert containsConstructor(tumbleDryerBean.getInjectionPoints(), Clothes.class);
+      assert tumbleDryer.getSerialNumber() == null;
+      assert tumbleDryer.getClothes() != null;
+      assert !Clothes.getInjectionPoint().getAnnotated().isAnnotationPresent(Original.class);
+      AnnotatedConstructor<?> clothesConstructor = getConstructor(tumbleDryerBean.getInjectionPoints(), Clothes.class); 
+      assert clothesConstructor.getParameters().get(0).isAnnotationPresent(Special.class);
+      assert !clothesConstructor.getParameters().get(0).isAnnotationPresent(Original.class);
+     
+      assert containsField(tumbleDryerBean.getInjectionPoints(), "plug");
+      assert !containsField(tumbleDryerBean.getInjectionPoints(), "coins");
+      assert tumbleDryer.getPlug() != null;
+      assert tumbleDryer.getCoins() == null;
+      
+      assert containsMethod(tumbleDryerBean.getInjectionPoints(), "setRunningTime", RunningTime.class);
+      assert !containsMethod(tumbleDryerBean.getInjectionPoints(), "setHotAir", HotAir.class);
+      assert tumbleDryer.getRunningTime() != null;
+      assert tumbleDryer.getHotAir() == null;
+      AnnotatedMethod<?> runningTimeMethod = getMethod(tumbleDryerBean.getInjectionPoints(), "setRunningTime", RunningTime.class);
+      assert runningTimeMethod.getParameters().get(0).isAnnotationPresent(Special.class);
+      assert !runningTimeMethod.getParameters().get(0).isAnnotationPresent(Original.class);
+   }
+   
+   private static boolean containsField(Set<InjectionPoint> injectionPoints, String name)
+   {
+      for (InjectionPoint ip : injectionPoints)
+      {
+         if (ip.getAnnotated() instanceof AnnotatedField<?>)
+         {
+            AnnotatedField<?> field = (AnnotatedField<?>) ip.getAnnotated();
+            if (field.getJavaMember().getName().equals(name))
+            {
+               return true;
+            }
+         }
+      }
+      return false;
+   }
+   
+   private static boolean containsConstructor(Set<InjectionPoint> injectionPoints, Class<?>... parameters)
+   {
+      return getConstructor(injectionPoints, parameters) != null;
+   }
+   
+   private static AnnotatedConstructor<?> getConstructor(Set<InjectionPoint> injectionPoints, Class<?>... parameters)
+   {
+      for (InjectionPoint ip : injectionPoints)
+      {
+         if (ip.getAnnotated() instanceof AnnotatedParameter<?>)
+         {
+            AnnotatedParameter<?> param = (AnnotatedParameter<?>) ip.getAnnotated();
+            if (param.getDeclaringCallable() instanceof AnnotatedConstructor<?>)
+            {
+               Class<?>[] parameterTypes = ((Constructor<?>) param.getDeclaringCallable().getJavaMember()).getParameterTypes();
+               if (Arrays.equals(parameters, parameterTypes))
+               {
+                  return (AnnotatedConstructor<?>) param.getDeclaringCallable();
+               }
+            }
+         }
+      }
+      return null;
+   }
+   
+   private static boolean containsMethod(Set<InjectionPoint> injectionPoints, String name, Class<?>... parameters)
+   {
+      return getMethod(injectionPoints, name, parameters) != null;
+   }
+   
+   private static AnnotatedMethod<?> getMethod(Set<InjectionPoint> injectionPoints, String name, Class<?>... parameters)
+   {
+      for (InjectionPoint ip : injectionPoints)
+      {
+         if (ip.getAnnotated() instanceof AnnotatedParameter<?>)
+         {
+            AnnotatedParameter<?> param = (AnnotatedParameter<?>) ip.getAnnotated();
+            if (param.getDeclaringCallable() instanceof AnnotatedMethod<?>)
+            {
+               Class<?>[] parameterTypes = ((Method) param.getDeclaringCallable().getJavaMember()).getParameterTypes();
+               String methodName = param.getDeclaringCallable().getJavaMember().getName();
+               if (Arrays.equals(parameters, parameterTypes) && methodName.equals(name))
+               {
+                  return (AnnotatedMethod<?>) param.getDeclaringCallable();
+               }
+            }
+         }
+      }
+      return null;
+   }
+   
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Clothes.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Clothes.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Clothes.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Clothes.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+ at Special
+public class Clothes
+{
+   
+   private static InjectionPoint injectionPoint;
+   
+   @Inject 
+   public void setInjectionPoint(InjectionPoint injectionPoint)
+   {
+      Clothes.injectionPoint = injectionPoint;
+   }
+   
+   public static void reset()
+   {
+      injectionPoint = null;
+   }
+   
+   public static InjectionPoint getInjectionPoint()
+   {
+      return injectionPoint;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Coins.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Coins.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Coins.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Coins.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+public class Coins
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/EcoFriendlyWashingMachine.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/EcoFriendlyWashingMachine.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/EcoFriendlyWashingMachine.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/EcoFriendlyWashingMachine.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+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.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface EcoFriendlyWashingMachine
+{
+   
+   @SuppressWarnings("serial")
+   public static class EcoFriendlyWashingMachineLiteral extends AnnotationLiteral<EcoFriendlyWashingMachine> implements EcoFriendlyWashingMachine 
+   {
+      
+      public static final EcoFriendlyWashingMachine INSTANCE = new EcoFriendlyWashingMachineLiteral();
+      
+      private EcoFriendlyWashingMachineLiteral() {}
+      
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/FastWashingMachine.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/FastWashingMachine.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/FastWashingMachine.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/FastWashingMachine.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface FastWashingMachine
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/HotAir.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/HotAir.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/HotAir.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/HotAir.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+public class HotAir
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/InjectLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/InjectLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/InjectLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/InjectLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+public class InjectLiteral extends AnnotationLiteral<Inject> implements Inject
+{
+   
+   public static final Inject INSTANCE = new InjectLiteral();
+   
+   private InjectLiteral() {}
+   
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Laundry.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Laundry.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Laundry.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Laundry.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import javax.inject.Inject;
+
+public class Laundry
+{
+   @Inject @FastWashingMachine
+   public WashingMachine fastWashingMachine;
+   
+   @Inject @EcoFriendlyWashingMachine
+   public WashingMachine ecoFriendlyWashingMachine;
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Original.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Original.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Original.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Original.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Original
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Plug.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Plug.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Plug.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Plug.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+ at Special
+public class Plug
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/RunningTime.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/RunningTime.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/RunningTime.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/RunningTime.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+ at Special
+public class RunningTime
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SerialNumber.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SerialNumber.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SerialNumber.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SerialNumber.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+public class SerialNumber
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Special.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Special.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Special
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SpecialLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SpecialLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SpecialLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/SpecialLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+public class SpecialLiteral extends AnnotationLiteral<Special> implements Special
+{
+   
+   public static final Special INSTANCE = new SpecialLiteral();
+   
+   private SpecialLiteral() {}
+   
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/TumbleDryer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/TumbleDryer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/TumbleDryer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/TumbleDryer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+import javax.inject.Inject;
+
+
+public class TumbleDryer
+{
+
+   
+   private Plug plug;
+   
+   @Inject @Original
+   private Coins coins;
+   
+   private final Clothes clothers;
+
+   private RunningTime runningTime;
+
+   private final SerialNumber serialNumber;
+
+   private HotAir hotAir;
+   
+   public TumbleDryer(@Original Clothes clothes)
+   {
+      this.clothers = clothes;
+      this.serialNumber = null;
+   }
+   
+   @Inject
+   public TumbleDryer(SerialNumber serialNumber)
+   {
+      this.serialNumber = serialNumber;
+      this.clothers = null;
+   }
+   
+   public void setRunningTime(@Original RunningTime runningTime)
+   {
+      this.runningTime = runningTime;  
+   }
+   
+   @Inject
+   public void setHotAir(HotAir hotAir)
+   {
+      this.hotAir = hotAir;
+   }
+   
+   public Plug getPlug()
+   {
+      return plug;
+   }
+   
+   public Clothes getClothes()
+   {
+      return clothers;
+   }
+   
+   public HotAir getHotAir()
+   {
+      return hotAir;
+   }
+   
+   public RunningTime getRunningTime()
+   {
+      return runningTime;
+   }
+   
+   public SerialNumber getSerialNumber()
+   {
+      return serialNumber;
+   }
+   
+   public Coins getCoins()
+   {
+      return coins;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/WashingMachine.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/WashingMachine.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/WashingMachine.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/WashingMachine.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType;
+
+ at FastWashingMachine
+public class WashingMachine
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
-
-public class AnnotatedTypeEjbExtension implements Extension
-{
-   /**
-    * Adds two ejb beans
-    */
-   public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
-   {
-      TestAnnotatedTypeBuilder<Lathe> builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
-      builder.addToClass(new AnnotationLiteral<SmallLathe>() { });
-      beforeBeanDiscovery.addAnnotatedType(builder.create());
-      builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
-      builder.addToClass(new AnnotationLiteral<BigLathe>() { });
-      beforeBeanDiscovery.addAnnotatedType(builder.create());
-   }
-   /**
-    * Adds annotations to an EJB
-    */
-   public void overrideLatheAnnotations(@Observes ProcessAnnotatedType<Lathe> event) throws SecurityException, NoSuchMethodException
-   {
-     TestAnnotatedTypeBuilder<Lathe> builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
-     for(Annotation a : event.getAnnotatedType().getAnnotations())
-     {
-        builder.addToClass(a);
-     }
-     Method method = Lathe.class.getMethod("doWork");
-     builder.addToMethod(method, new AnnotationLiteral<ConveyorShaft>() {});
-     builder.addToMethod(method, new AnnotationLiteral<Produces>() {});
-     event.setAnnotatedType(builder.create());
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
+
+public class AnnotatedTypeEjbExtension implements Extension
+{
+   /**
+    * Adds two ejb beans
+    */
+   public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+   {
+      TestAnnotatedTypeBuilder<Lathe> builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
+      builder.addToClass(new AnnotationLiteral<SmallLathe>() { });
+      beforeBeanDiscovery.addAnnotatedType(builder.create());
+      builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
+      builder.addToClass(new AnnotationLiteral<BigLathe>() { });
+      beforeBeanDiscovery.addAnnotatedType(builder.create());
+   }
+   /**
+    * Adds annotations to an EJB
+    */
+   public void overrideLatheAnnotations(@Observes ProcessAnnotatedType<Lathe> event) throws SecurityException, NoSuchMethodException
+   {
+     TestAnnotatedTypeBuilder<Lathe> builder = new TestAnnotatedTypeBuilder<Lathe>(Lathe.class);
+     for(Annotation a : event.getAnnotatedType().getAnnotations())
+     {
+        builder.addToClass(a);
+     }
+     Method method = Lathe.class.getMethod("doWork");
+     builder.addToMethod(method, new AnnotationLiteral<ConveyorShaft>() {});
+     builder.addToMethod(method, new AnnotationLiteral<Produces>() {});
+     event.setAnnotatedType(builder.create());
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.Extension;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-/**
- * Tests that it is possible to override ejb annotations through the SPI
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- *
- */
- at Artifact
- at Packaging(PackagingType.EAR)
- at IntegrationTest
- at Extension("javax.enterprise.inject.spi.Extension")
- at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
-public class AnnotatedTypeSessionBeanTest extends AbstractWeldTest
-{
-   @Test
-   public void testOverridingEjbAnnotations()
-   {
-      Shaft conveyerShaft = getReference(Shaft.class, new AnnotationLiteral<ConveyorShaft>() { });
-      assert conveyerShaft != null;
-   }
-   
-   @Test
-   public void testAddingBultipleBeansPerEjbClass()
-   {
-      LatheLocal bigLathe = getReference(LatheLocal.class, new AnnotationLiteral<BigLathe>() { });
-      assert bigLathe != null;
-      LatheLocal smallLathe = getReference(LatheLocal.class, new AnnotationLiteral<SmallLathe>() { });
-      assert smallLathe != null;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+/**
+ * Tests that it is possible to override ejb annotations through the SPI
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ *
+ */
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at IntegrationTest
+ at Extension("javax.enterprise.inject.spi.Extension")
+ at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
+public class AnnotatedTypeSessionBeanTest extends AbstractWeldTest
+{
+   @Test
+   public void testOverridingEjbAnnotations()
+   {
+      Shaft conveyerShaft = getReference(Shaft.class, new AnnotationLiteral<ConveyorShaft>() { });
+      assert conveyerShaft != null;
+   }
+   
+   @Test
+   public void testAddingBultipleBeansPerEjbClass()
+   {
+      LatheLocal bigLathe = getReference(LatheLocal.class, new AnnotationLiteral<BigLathe>() { });
+      assert bigLathe != null;
+      LatheLocal smallLathe = getReference(LatheLocal.class, new AnnotationLiteral<SmallLathe>() { });
+      assert smallLathe != null;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
-public @interface BigLathe
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/BigLathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface BigLathe
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
-public @interface ConveyorShaft
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/ConveyorShaft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface ConveyorShaft
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class Lathe implements LatheLocal
-{
-   public Shaft doWork()
-   {
-      return new Shaft();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Lathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class Lathe implements LatheLocal
+{
+   public Shaft doWork()
+   {
+      return new Shaft();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import javax.ejb.Local;
-
- at Local
-public interface LatheLocal
-{
-
-   public Shaft doWork();
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/LatheLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import javax.ejb.Local;
+
+ at Local
+public interface LatheLocal
+{
+
+   public Shaft doWork();
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-public class Shaft
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/Shaft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+public class Shaft
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
-public @interface SmallLathe
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/SmallLathe.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.annotatedType.ejb;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface SmallLathe
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-interface Aircraft
-{
-   boolean isFlying();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Aircraft.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+interface Aircraft
+{
+   boolean isFlying();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
- at Decorator
-class AircraftDecorator implements Aircraft
-{
-   @Inject @Delegate
-   private Aircraft delegate;
-   
-   public boolean isFlying()
-   {
-      return ! delegate.isFlying();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/AircraftDecorator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+class AircraftDecorator implements Aircraft
+{
+   @Inject @Delegate
+   private Aircraft delegate;
+   
+   public boolean isFlying()
+   {
+      return ! delegate.isFlying();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-
-public class InjectionTargetExtension implements Extension
-{
-   public void foo(@Observes ProcessInjectionTarget<Spitfire> event)
-   {
-      InjectionTarget<Spitfire> it = event.getInjectionTarget();
-      event.setInjectionTarget(decorate(it));
-   }
-   
-   private <T> InjectionTarget<T> decorate(InjectionTarget<T> delegate)
-   {
-      return new InjectionTargetWrapper<T>(delegate);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+
+public class InjectionTargetExtension implements Extension
+{
+   public void foo(@Observes ProcessInjectionTarget<Spitfire> event)
+   {
+      InjectionTarget<Spitfire> it = event.getInjectionTarget();
+      event.setInjectionTarget(decorate(it));
+   }
+   
+   private <T> InjectionTarget<T> decorate(InjectionTarget<T> delegate)
+   {
+      return new InjectionTargetWrapper<T>(delegate);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-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.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.testharness.impl.packaging.jsr299.Extension;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at BeansXml("beans.xml")
- at Packaging(PackagingType.EAR)
- at Extension("javax.enterprise.inject.spi.Extension")
-public class InjectionTargetTest extends AbstractWeldTest
-{
-   @Test(description="WELD-557")
-   public void testActualInstanceAndNotProxyPassedToInject()
-   {
-      InjectionTargetWrapper.clear();
-      Spitfire aircraft = getReference(Spitfire.class);
-      aircraft.isFlying();
-      assert aircraft.isTheSameInstance(InjectionTargetWrapper.injectInstance);
-   }
-   
-   @Test(description="WELD-557")
-   public void testActualInstanceAndNotProxyPassedToPostConstruct()
-   {
-      InjectionTargetWrapper.clear();
-      Spitfire aircraft = getReference(Spitfire.class);
-      aircraft.isFlying();
-      assert aircraft.isTheSameInstance(InjectionTargetWrapper.postConstructInstance);
-   }
-   
-   @Test(description="WELD-557")
-   public void testActualInstanceAndNotProxyPassedToPreDestroy()
-   {
-      // prepare instance
-      InjectionTargetWrapper.clear();
-      Bean<Spitfire> bean = getBean(Spitfire.class);
-      CreationalContext<Spitfire> ctx = getCurrentManager().createCreationalContext(bean);
-      Spitfire aircraft = (Spitfire) getCurrentManager().getReference(bean, Spitfire.class, ctx);
-      // invoke business method
-      aircraft.isFlying();
-      // destroy instance
-      bean.destroy(aircraft, ctx);
-      
-      assert aircraft.isTheSameInstance(InjectionTargetWrapper.preDestroyInstance);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+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.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at BeansXml("beans.xml")
+ at Packaging(PackagingType.EAR)
+ at Extension("javax.enterprise.inject.spi.Extension")
+public class InjectionTargetTest extends AbstractWeldTest
+{
+   @Test(description="WELD-557")
+   public void testActualInstanceAndNotProxyPassedToInject()
+   {
+      InjectionTargetWrapper.clear();
+      Spitfire aircraft = getReference(Spitfire.class);
+      aircraft.isFlying();
+      assert aircraft.isTheSameInstance(InjectionTargetWrapper.injectInstance);
+   }
+   
+   @Test(description="WELD-557")
+   public void testActualInstanceAndNotProxyPassedToPostConstruct()
+   {
+      InjectionTargetWrapper.clear();
+      Spitfire aircraft = getReference(Spitfire.class);
+      aircraft.isFlying();
+      assert aircraft.isTheSameInstance(InjectionTargetWrapper.postConstructInstance);
+   }
+   
+   @Test(description="WELD-557")
+   public void testActualInstanceAndNotProxyPassedToPreDestroy()
+   {
+      // prepare instance
+      InjectionTargetWrapper.clear();
+      Bean<Spitfire> bean = getBean(Spitfire.class);
+      CreationalContext<Spitfire> ctx = getCurrentManager().createCreationalContext(bean);
+      Spitfire aircraft = (Spitfire) getCurrentManager().getReference(bean, Spitfire.class, ctx);
+      // invoke business method
+      aircraft.isFlying();
+      // destroy instance
+      bean.destroy(aircraft, ctx);
+      
+      assert aircraft.isTheSameInstance(InjectionTargetWrapper.preDestroyInstance);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-
-class InjectionTargetWrapper<T> implements InjectionTarget<T>
-{
-   private InjectionTarget<T> delegate;
-   public static Object injectInstance;
-   public static Object postConstructInstance;
-   public static Object preDestroyInstance;
-   
-   public static void clear()
-   {
-      injectInstance = null;
-      postConstructInstance = null;
-      preDestroyInstance = null;
-   }
-   
-   public InjectionTargetWrapper(InjectionTarget<T> delegate)
-   {
-      this.delegate = delegate;
-   }
-
-   public void inject(T instance, CreationalContext<T> ctx)
-   {
-      injectInstance = instance;
-      delegate.inject(instance, ctx);
-   }
-
-   public void postConstruct(T instance)
-   {
-      postConstructInstance = instance;
-      delegate.postConstruct(instance);
-   }
-
-   public void preDestroy(T instance)
-   {
-      preDestroyInstance = instance;
-      delegate.preDestroy(instance);
-   }
-
-   public void dispose(T instance)
-   {
-      delegate.dispose(instance);
-   }
-
-   public Set<InjectionPoint> getInjectionPoints()
-   {
-      return delegate.getInjectionPoints();
-   }
-
-   public T produce(CreationalContext<T> ctx)
-   {
-      return delegate.produce(ctx);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/InjectionTargetWrapper.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+class InjectionTargetWrapper<T> implements InjectionTarget<T>
+{
+   private InjectionTarget<T> delegate;
+   public static Object injectInstance;
+   public static Object postConstructInstance;
+   public static Object preDestroyInstance;
+   
+   public static void clear()
+   {
+      injectInstance = null;
+      postConstructInstance = null;
+      preDestroyInstance = null;
+   }
+   
+   public InjectionTargetWrapper(InjectionTarget<T> delegate)
+   {
+      this.delegate = delegate;
+   }
+
+   public void inject(T instance, CreationalContext<T> ctx)
+   {
+      injectInstance = instance;
+      delegate.inject(instance, ctx);
+   }
+
+   public void postConstruct(T instance)
+   {
+      postConstructInstance = instance;
+      delegate.postConstruct(instance);
+   }
+
+   public void preDestroy(T instance)
+   {
+      preDestroyInstance = instance;
+      delegate.preDestroy(instance);
+   }
+
+   public void dispose(T instance)
+   {
+      delegate.dispose(instance);
+   }
+
+   public Set<InjectionPoint> getInjectionPoints()
+   {
+      return delegate.getInjectionPoints();
+   }
+
+   public T produce(CreationalContext<T> ctx)
+   {
+      return delegate.produce(ctx);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import javax.interceptor.InterceptorBinding;
-
- at InterceptorBinding
- at Retention(RUNTIME)
- at Target({ElementType.TYPE, ElementType.METHOD})
- at Documented
- at interface Secured
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Secured.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import javax.interceptor.InterceptorBinding;
+
+ at InterceptorBinding
+ at Retention(RUNTIME)
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Documented
+ at interface Secured
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
- at Interceptor
- at Secured
-class SecurityInterceptor
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      return ! (Boolean) ctx.proceed();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/SecurityInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Interceptor
+ at Secured
+class SecurityInterceptor
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      return ! (Boolean) ctx.proceed();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Spitfire implements Aircraft
-{
-   @Secured
-   public boolean interceptedMethod()
-   {
-      return false;
-   }
-
-   public boolean isFlying()
-   {
-      return false;
-   }
-   
-   /*
-    * Cannot use equals() since behavior of all Object class methods
-    * except for toString() is not defined on the client proxy
-    */
-   public boolean isTheSameInstance(Object object)
-   {
-      return this == object;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/injectionTarget/Spitfire.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.injectionTarget;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Spitfire implements Aircraft
+{
+   @Secured
+   public boolean interceptedMethod()
+   {
+      return false;
+   }
+
+   public boolean isFlying()
+   {
+      return false;
+   }
+   
+   /*
+    * Cannot use equals() since behavior of all Object class methods
+    * except for toString() is not defined on the client proxy
+    */
+   public boolean isTheSameInstance(Object object)
+   {
+      return this == object;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
- at Retention(RetentionPolicy.RUNTIME)
- at Target(value = { ElementType.TYPE })
-public @interface FullMarathon
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(value = { ElementType.TYPE })
+public @interface FullMarathon
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
- at Retention(RetentionPolicy.RUNTIME)
- at Target(value = { ElementType.TYPE, ElementType.METHOD })
-public @interface Incremented
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(value = { ElementType.TYPE, ElementType.METHOD })
+public @interface Incremented
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * Interceptor that adds one to the result of a method
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class IncrementingInterceptor
-{
-   private static boolean doAroundCalled = false;
-
-   // @AroundInvoke
-   public Object doAround(InvocationContext context) throws Exception
-   {
-      doAroundCalled = true;
-      Integer res = (Integer)context.proceed();
-      return res + 1;
-   }
-  
-   public static boolean isDoAroundCalled()
-   {
-      return doAroundCalled;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ * Interceptor that adds one to the result of a method
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class IncrementingInterceptor
+{
+   private static boolean doAroundCalled = false;
+
+   // @AroundInvoke
+   public Object doAround(InvocationContext context) throws Exception
+   {
+      doAroundCalled = true;
+      Integer res = (Integer)context.proceed();
+      return res + 1;
+   }
+  
+   public static boolean isDoAroundCalled()
+   {
+      return doAroundCalled;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import java.lang.reflect.Method;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
-import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
-
-/**
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class InterceptorExtension implements Extension
-{
-   /**
-    * registers two interceptors via the SPI
-    */
-   public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) throws SecurityException, NoSuchMethodException
-   {
-      event.addInterceptorBinding(Incremented.class);
-      event.addInterceptorBinding(FullMarathon.class);
-
-      TestAnnotatedTypeBuilder<IncrementingInterceptor> incBuilder = new TestAnnotatedTypeBuilder<IncrementingInterceptor>(IncrementingInterceptor.class);
-      incBuilder.addToClass(new InterceptorLiteral());
-      incBuilder.addToClass(new IncrementedLiteral());
-
-      Method around = IncrementingInterceptor.class.getMethod("doAround", InvocationContext.class);
-      incBuilder.addToMethod(around, new AroundInvokeLiteral());
-      event.addAnnotatedType(incBuilder.create());
-
-      TestAnnotatedTypeBuilder<LifecycleInterceptor> marBuilder = new TestAnnotatedTypeBuilder<LifecycleInterceptor>(LifecycleInterceptor.class);
-      marBuilder.addToClass(new InterceptorLiteral());
-      marBuilder.addToClass(new FullMarathonImpl());
-
-      Method pre = LifecycleInterceptor.class.getMethod("preDestroy", InvocationContext.class);
-      marBuilder.addToMethod(pre, new PreDestroyLiteral());
-
-      Method post = LifecycleInterceptor.class.getMethod("postConstruct", InvocationContext.class);
-      marBuilder.addToMethod(post, new PostConstructLiteral());
-
-      event.addAnnotatedType(marBuilder.create());
-
-   }
-
-   private static class InterceptorLiteral extends AnnotationLiteral<Interceptor> implements Interceptor
-   {
-   };
-
-   private static class IncrementedLiteral extends AnnotationLiteral<Incremented> implements Incremented
-   {
-   };
-
-   private static class AroundInvokeLiteral extends AnnotationLiteral<AroundInvoke> implements AroundInvoke
-   {
-   };
-
-   private static class PreDestroyLiteral extends AnnotationLiteral<PreDestroy> implements PreDestroy
-   {
-   };
-
-   private static class PostConstructLiteral extends AnnotationLiteral<PostConstruct> implements PostConstruct
-   {
-   };
-
-   private static class FullMarathonImpl extends AnnotationLiteral<FullMarathon> implements FullMarathon
-   {
-   };
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import java.lang.reflect.Method;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
+
+/**
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class InterceptorExtension implements Extension
+{
+   /**
+    * registers two interceptors via the SPI
+    */
+   public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) throws SecurityException, NoSuchMethodException
+   {
+      event.addInterceptorBinding(Incremented.class);
+      event.addInterceptorBinding(FullMarathon.class);
+
+      TestAnnotatedTypeBuilder<IncrementingInterceptor> incBuilder = new TestAnnotatedTypeBuilder<IncrementingInterceptor>(IncrementingInterceptor.class);
+      incBuilder.addToClass(new InterceptorLiteral());
+      incBuilder.addToClass(new IncrementedLiteral());
+
+      Method around = IncrementingInterceptor.class.getMethod("doAround", InvocationContext.class);
+      incBuilder.addToMethod(around, new AroundInvokeLiteral());
+      event.addAnnotatedType(incBuilder.create());
+
+      TestAnnotatedTypeBuilder<LifecycleInterceptor> marBuilder = new TestAnnotatedTypeBuilder<LifecycleInterceptor>(LifecycleInterceptor.class);
+      marBuilder.addToClass(new InterceptorLiteral());
+      marBuilder.addToClass(new FullMarathonImpl());
+
+      Method pre = LifecycleInterceptor.class.getMethod("preDestroy", InvocationContext.class);
+      marBuilder.addToMethod(pre, new PreDestroyLiteral());
+
+      Method post = LifecycleInterceptor.class.getMethod("postConstruct", InvocationContext.class);
+      marBuilder.addToMethod(post, new PostConstructLiteral());
+
+      event.addAnnotatedType(marBuilder.create());
+
+   }
+
+   private static class InterceptorLiteral extends AnnotationLiteral<Interceptor> implements Interceptor
+   {
+   };
+
+   private static class IncrementedLiteral extends AnnotationLiteral<Incremented> implements Incremented
+   {
+   };
+
+   private static class AroundInvokeLiteral extends AnnotationLiteral<AroundInvoke> implements AroundInvoke
+   {
+   };
+
+   private static class PreDestroyLiteral extends AnnotationLiteral<PreDestroy> implements PreDestroy
+   {
+   };
+
+   private static class PostConstructLiteral extends AnnotationLiteral<PostConstruct> implements PostConstruct
+   {
+   };
+
+   private static class FullMarathonImpl extends AnnotationLiteral<FullMarathon> implements FullMarathon
+   {
+   };
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-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.testharness.impl.packaging.jsr299.Extension;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests that interceptors registered via the SPI work correctly
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
- at Extension("javax.enterprise.inject.spi.Extension")
- at BeansXml("beans.xml")
- at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
-public class InterceptorExtensionTest extends AbstractWeldTest
-{
-   @Test
-   public void testInterceptorCalled()
-   {
-      NumberSource ng = getReference(NumberSource.class);
-      assert ng.value() == 2;
-      assert IncrementingInterceptor.isDoAroundCalled();
-   }
-
-   @Test
-   @SuppressWarnings("unchecked")
-   public void testLifecycleInterceptor()
-   {
-      Bean bean = getCurrentManager().getBeans(Marathon.class).iterator().next();
-      CreationalContext creationalContext = getCurrentManager().createCreationalContext(bean);
-      Marathon m = (Marathon)bean.create(creationalContext);
-      
-      assert LifecycleInterceptor.isPostConstructCalled();
-      assert m.getLength()==42;
-      bean.destroy(m, creationalContext);
-      assert LifecycleInterceptor.isPreDestroyCalled();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+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.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that interceptors registered via the SPI work correctly
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at Extension("javax.enterprise.inject.spi.Extension")
+ at BeansXml("beans.xml")
+ at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
+public class InterceptorExtensionTest extends AbstractWeldTest
+{
+   @Test
+   public void testInterceptorCalled()
+   {
+      NumberSource ng = getReference(NumberSource.class);
+      assert ng.value() == 2;
+      assert IncrementingInterceptor.isDoAroundCalled();
+   }
+
+   @Test
+   @SuppressWarnings("unchecked")
+   public void testLifecycleInterceptor()
+   {
+      Bean bean = getCurrentManager().getBeans(Marathon.class).iterator().next();
+      CreationalContext creationalContext = getCurrentManager().createCreationalContext(bean);
+      Marathon m = (Marathon)bean.create(creationalContext);
+      
+      assert LifecycleInterceptor.isPostConstructCalled();
+      assert m.getLength()==42;
+      bean.destroy(m, creationalContext);
+      assert LifecycleInterceptor.isPreDestroyCalled();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class LifecycleInterceptor
-{
-   static private boolean preDestroyCalled = false;
-   static private boolean postConstructCalled = false;
-
-   // PreDestroy
-   public void preDestroy(InvocationContext ctx)
-   {
-      preDestroyCalled = true;
-   }
-
-   // @PostConstruct
-   public void postConstruct(InvocationContext ctx)
-   {
-      Object marathon = ctx.getTarget();
-      if (marathon instanceof Marathon)
-      {
-         Marathon m = (Marathon) marathon;
-         m.setLength(42);
-      }
-      postConstructCalled = true;
-   }
-
-   static public boolean isPostConstructCalled()
-   {
-      return postConstructCalled;
-   }
-
-   static public boolean isPreDestroyCalled()
-   {
-      return preDestroyCalled;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class LifecycleInterceptor
+{
+   static private boolean preDestroyCalled = false;
+   static private boolean postConstructCalled = false;
+
+   // PreDestroy
+   public void preDestroy(InvocationContext ctx)
+   {
+      preDestroyCalled = true;
+   }
+
+   // @PostConstruct
+   public void postConstruct(InvocationContext ctx)
+   {
+      Object marathon = ctx.getTarget();
+      if (marathon instanceof Marathon)
+      {
+         Marathon m = (Marathon) marathon;
+         m.setLength(42);
+      }
+      postConstructCalled = true;
+   }
+
+   static public boolean isPostConstructCalled()
+   {
+      return postConstructCalled;
+   }
+
+   static public boolean isPreDestroyCalled()
+   {
+      return preDestroyCalled;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
- at FullMarathon
-public class Marathon
-{
-   long length;
-
-   public long getLength()
-   {
-      return length;
-   }
-
-   public void setLength(long length)
-   {
-      this.length = length;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+ at FullMarathon
+public class Marathon
+{
+   long length;
+
+   public long getLength()
+   {
+      return length;
+   }
+
+   public void setLength(long length)
+   {
+      this.length = length;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
-
-/**
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class NumberSource
-{
-   @Incremented
-   public int value()
-   {
-      return 1;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.interceptors;
+
+/**
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class NumberSource
+{
+   @Incremented
+   public int value()
+   {
+      return 1;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
-public @interface Author
-{
-   public String name();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Author.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
+public @interface Author
+{
+   public String name();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/**
- * 
- */
-package org.jboss.weld.tests.extensions.multipleBeans;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-class AuthorLiteral extends AnnotationLiteral<Author> implements Author
-{
-
-   final String name;
-
-   AuthorLiteral(String name)
-   {
-      this.name = name;
-   }
-
-   public String name()
-   {
-      return name;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/AuthorLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/**
+ * 
+ */
+package org.jboss.weld.tests.extensions.multipleBeans;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+class AuthorLiteral extends AnnotationLiteral<Author> implements Author
+{
+
+   final String name;
+
+   AuthorLiteral(String name)
+   {
+      this.name = name;
+   }
+
+   public String name()
+   {
+      return name;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import javax.inject.Inject;
-
- at Consumer(name = "Barry")
-public class BlogConsumer
-{
-   @Inject
-   @FormattedBlog(name = "Barry")
-   public String blogContent;
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import javax.inject.Inject;
+
+ at Consumer(name = "Barry")
+public class BlogConsumer
+{
+   @Inject
+   @FormattedBlog(name = "Barry")
+   public String blogContent;
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-
-public class BlogFormatter
-{
-   @Inject
-   @Author(name = "Barry")
-   public String content;
-
-   @Produces
-   @FormattedBlog(name = "Barry")
-   public String format()
-   {
-      return "+" + content + "+";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogFormatter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+public class BlogFormatter
+{
+   @Inject
+   @Author(name = "Barry")
+   public String content;
+
+   @Produces
+   @FormattedBlog(name = "Barry")
+   public String format()
+   {
+      return "+" + content + "+";
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import javax.enterprise.inject.Produces;
-
-public class BlogSource
-{
-   @Produces
-   @Author(name = "Barry")
-   String barrysBlog = "Barry's content";
-
-   @Produces
-   @Author(name = "Bob")
-   String bobsBlog = "Bob's content";
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/BlogSource.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import javax.enterprise.inject.Produces;
+
+public class BlogSource
+{
+   @Produces
+   @Author(name = "Barry")
+   String barrysBlog = "Barry's content";
+
+   @Produces
+   @Author(name = "Bob")
+   String bobsBlog = "Bob's content";
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
-public @interface Consumer
-{
-   public String name();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/Consumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
+public @interface Consumer
+{
+   public String name();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/**
- * 
- */
-package org.jboss.weld.tests.extensions.multipleBeans;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-class ConsumerLiteral extends AnnotationLiteral<Consumer> implements Consumer
-{
-
-   final String name;
-
-   ConsumerLiteral(String name)
-   {
-      this.name = name;
-   }
-
-   public String name()
-   {
-      return name;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/ConsumerLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/**
+ * 
+ */
+package org.jboss.weld.tests.extensions.multipleBeans;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+class ConsumerLiteral extends AnnotationLiteral<Consumer> implements Consumer
+{
+
+   final String name;
+
+   ConsumerLiteral(String name)
+   {
+      this.name = name;
+   }
+
+   public String name()
+   {
+      return name;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
-public @interface FormattedBlog
-{
-   public String name();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlog.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target( { ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
+public @interface FormattedBlog
+{
+   public String name();
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/**
- * 
- */
-package org.jboss.weld.tests.extensions.multipleBeans;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-class FormattedBlogLiteral extends AnnotationLiteral<FormattedBlog> implements FormattedBlog
-{
-
-   final String name;
-
-   FormattedBlogLiteral(String name)
-   {
-      this.name = name;
-   }
-
-   public String name()
-   {
-      return name;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/FormattedBlogLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/**
+ * 
+ */
+package org.jboss.weld.tests.extensions.multipleBeans;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+class FormattedBlogLiteral extends AnnotationLiteral<FormattedBlog> implements FormattedBlog
+{
+
+   final String name;
+
+   FormattedBlogLiteral(String name)
+   {
+      this.name = name;
+   }
+
+   public String name()
+   {
+      return name;
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
-
-import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
-
-/**
- * Extension that registers addition types via the SPI
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class MultipleBeansExtension implements Extension
-{
-
-   private boolean addedBlogFormatterSeen = false;
-   
-   public void addNewAnnotatedTypes(@Observes BeforeBeanDiscovery event) throws SecurityException, NoSuchFieldException, NoSuchMethodException
-   {
-      TestAnnotatedTypeBuilder<BlogFormatter> formatter = new TestAnnotatedTypeBuilder<BlogFormatter>(BlogFormatter.class);
-      Field content = BlogFormatter.class.getField("content");
-      formatter.addToField(content, new InjectLiteral());
-      formatter.addToField(content, new AuthorLiteral("Bob"));
-      Method format = BlogFormatter.class.getMethod("format");
-      formatter.addToMethod(format, new ProducesLiteral());
-      formatter.addToMethod(format, new FormattedBlogLiteral("Bob"));
-      event.addAnnotatedType(formatter.create());
-
-      TestAnnotatedTypeBuilder<BlogConsumer> consumer = new TestAnnotatedTypeBuilder<BlogConsumer>(BlogConsumer.class);
-      consumer.addToClass(new ConsumerLiteral("Bob"));
-      content = BlogConsumer.class.getField("blogContent");
-      consumer.addToField(content, new InjectLiteral());
-      consumer.addToField(content, new FormattedBlogLiteral("Bob"));
-      event.addAnnotatedType(consumer.create());
-
-      // two beans that are exactly the same
-      // this is not very useful, however should still work
-      TestAnnotatedTypeBuilder<UselessBean> uselessBuilder = new TestAnnotatedTypeBuilder<UselessBean>(UselessBean.class);
-      event.addAnnotatedType(uselessBuilder.create());
-
-   }
-   
-   public void observeProcessBlogFormatter(@Observes ProcessAnnotatedType<BlogFormatter> event)
-   {
-      AnnotatedType<BlogFormatter> type = event.getAnnotatedType();
-      for(AnnotatedField<? super BlogFormatter> f : type.getFields())
-      {
-         if(f.getJavaMember().getName().equals("content"))
-         {
-            if(f.isAnnotationPresent(Author.class))
-            {
-               if(f.getAnnotation(Author.class).name().equals("Bob"))
-               {
-                  addedBlogFormatterSeen = true;
-               }
-            }
-         }
-      }
-   }
-   
-
-   public boolean isAddedBlogFormatterSeen()
-   {
-      return addedBlogFormatterSeen;
-   }
-
-   private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject
-   {
-
-   }
-
-   private static class ProducesLiteral extends AnnotationLiteral<Produces> implements Produces
-   {
-
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
+
+/**
+ * Extension that registers addition types via the SPI
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class MultipleBeansExtension implements Extension
+{
+
+   private boolean addedBlogFormatterSeen = false;
+   
+   public void addNewAnnotatedTypes(@Observes BeforeBeanDiscovery event) throws SecurityException, NoSuchFieldException, NoSuchMethodException
+   {
+      TestAnnotatedTypeBuilder<BlogFormatter> formatter = new TestAnnotatedTypeBuilder<BlogFormatter>(BlogFormatter.class);
+      Field content = BlogFormatter.class.getField("content");
+      formatter.addToField(content, new InjectLiteral());
+      formatter.addToField(content, new AuthorLiteral("Bob"));
+      Method format = BlogFormatter.class.getMethod("format");
+      formatter.addToMethod(format, new ProducesLiteral());
+      formatter.addToMethod(format, new FormattedBlogLiteral("Bob"));
+      event.addAnnotatedType(formatter.create());
+
+      TestAnnotatedTypeBuilder<BlogConsumer> consumer = new TestAnnotatedTypeBuilder<BlogConsumer>(BlogConsumer.class);
+      consumer.addToClass(new ConsumerLiteral("Bob"));
+      content = BlogConsumer.class.getField("blogContent");
+      consumer.addToField(content, new InjectLiteral());
+      consumer.addToField(content, new FormattedBlogLiteral("Bob"));
+      event.addAnnotatedType(consumer.create());
+
+      // two beans that are exactly the same
+      // this is not very useful, however should still work
+      TestAnnotatedTypeBuilder<UselessBean> uselessBuilder = new TestAnnotatedTypeBuilder<UselessBean>(UselessBean.class);
+      event.addAnnotatedType(uselessBuilder.create());
+
+   }
+   
+   public void observeProcessBlogFormatter(@Observes ProcessAnnotatedType<BlogFormatter> event)
+   {
+      AnnotatedType<BlogFormatter> type = event.getAnnotatedType();
+      for(AnnotatedField<? super BlogFormatter> f : type.getFields())
+      {
+         if(f.getJavaMember().getName().equals("content"))
+         {
+            if(f.isAnnotationPresent(Author.class))
+            {
+               if(f.getAnnotation(Author.class).name().equals("Bob"))
+               {
+                  addedBlogFormatterSeen = true;
+               }
+            }
+         }
+      }
+   }
+   
+
+   public boolean isAddedBlogFormatterSeen()
+   {
+      return addedBlogFormatterSeen;
+   }
+
+   private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject
+   {
+
+   }
+
+   private static class ProducesLiteral extends AnnotationLiteral<Produces> implements Produces
+   {
+
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.Extension;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests that it is possible to add multiple beans with the same java class type
- * through the SPI
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
- at Extension("javax.enterprise.inject.spi.Extension")
- at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
-public class MultipleBeansTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testFormatterRegistered()
-   {
-      // test that we have added two beans with the same qualifiers
-      assert getBeans(BlogFormatter.class).size() == 2;
-      // test that the beans which have different producer methods produce
-      // different values
-      assert getReference(String.class, new FormattedBlogLiteral("Bob")).equals("+Bob's content+");
-      assert getReference(String.class, new FormattedBlogLiteral("Barry")).equals("+Barry's content+");
-   }
-
-   @Test
-   public void testBlogConsumed()
-   {
-      // test that the two different BlogConsumers have been registered
-      // correctly
-      BlogConsumer consumer = getReference(BlogConsumer.class, new ConsumerLiteral("Barry"));
-      assert consumer.blogContent.equals("+Barry's content+");
-      consumer = getReference(BlogConsumer.class, new ConsumerLiteral("Bob"));
-      assert consumer.blogContent.equals("+Bob's content+");
-   }
-   /**
-    * makes sure that ProcessAnnotatedType is thrown for types
-    * added through BeforeBeanDiscovery.addAnnotatedType
-    */
-   @Test
-   public void testProcessAnnotatedTypeEventFiredForSPIAddedType()
-   {
-      MultipleBeansExtension ext = getReference(MultipleBeansExtension.class);
-      assert ext.isAddedBlogFormatterSeen();
-   }
-
-   /**
-    * Apparently it is not possible to add two beans that are exactly the same.
-    * Even though this is not very useful it should still be possible.
-    * 
-    */
-   @Test(groups = { "broken" })
-   public void testTwoBeansExactlyTheSame()
-   {
-      assert getBeans(UselessBean.class).size() == 2;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that it is possible to add multiple beans with the same java class type
+ * through the SPI
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at Extension("javax.enterprise.inject.spi.Extension")
+ at Classes(packages = { "org.jboss.weld.tests.util.annotated" })
+public class MultipleBeansTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testFormatterRegistered()
+   {
+      // test that we have added two beans with the same qualifiers
+      assert getBeans(BlogFormatter.class).size() == 2;
+      // test that the beans which have different producer methods produce
+      // different values
+      assert getReference(String.class, new FormattedBlogLiteral("Bob")).equals("+Bob's content+");
+      assert getReference(String.class, new FormattedBlogLiteral("Barry")).equals("+Barry's content+");
+   }
+
+   @Test
+   public void testBlogConsumed()
+   {
+      // test that the two different BlogConsumers have been registered
+      // correctly
+      BlogConsumer consumer = getReference(BlogConsumer.class, new ConsumerLiteral("Barry"));
+      assert consumer.blogContent.equals("+Barry's content+");
+      consumer = getReference(BlogConsumer.class, new ConsumerLiteral("Bob"));
+      assert consumer.blogContent.equals("+Bob's content+");
+   }
+   /**
+    * makes sure that ProcessAnnotatedType is thrown for types
+    * added through BeforeBeanDiscovery.addAnnotatedType
+    */
+   @Test
+   public void testProcessAnnotatedTypeEventFiredForSPIAddedType()
+   {
+      MultipleBeansExtension ext = getReference(MultipleBeansExtension.class);
+      assert ext.isAddedBlogFormatterSeen();
+   }
+
+   /**
+    * Apparently it is not possible to add two beans that are exactly the same.
+    * Even though this is not very useful it should still be possible.
+    * 
+    */
+   @Test(groups = { "broken" })
+   public void testTwoBeansExactlyTheSame()
+   {
+      assert getBeans(UselessBean.class).size() == 2;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
-
-/**
- * 
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
-public class UselessBean
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/UselessBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.extensions.multipleBeans;
+
+/**
+ * 
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+public class UselessBean
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public class BaseClass
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class BaseClass
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public class BoundedGenericBean<T extends BaseClass>
-{
-  public T echo (T param) {
-     return param;
-  }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class BoundedGenericBean<T extends BaseClass>
+{
+  public T echo (T param) {
+     return param;
+  }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public class GenericBean<T> implements GenericInterface<T>
-{
-
-   public T echo(T parameter)
-   {
-      return parameter;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class GenericBean<T> implements GenericInterface<T>
+{
+
+   public T echo(T parameter)
+   {
+      return parameter;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
-public class GenericBeanTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testGenericBean()
-   {
-      TestBean testBean = getReference(TestBean.class);
-      assert "Hello".equals(testBean.echo("Hello"));
-      assert Integer.valueOf(1).equals(testBean.echo(1));
-      Subclass subclassInstance = new Subclass();
-      assert subclassInstance == testBean.echo(subclassInstance);
-      assert subclassInstance == testBean.echo((BaseClass)subclassInstance);
-      BaseClass baseInstance = new BaseClass();
-      assert baseInstance == testBean.echo(baseInstance);
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+public class GenericBeanTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testGenericBean()
+   {
+      TestBean testBean = getReference(TestBean.class);
+      assert "Hello".equals(testBean.echo("Hello"));
+      assert Integer.valueOf(1).equals(testBean.echo(1));
+      Subclass subclassInstance = new Subclass();
+      assert subclassInstance == testBean.echo(subclassInstance);
+      assert subclassInstance == testBean.echo((BaseClass)subclassInstance);
+      BaseClass baseInstance = new BaseClass();
+      assert baseInstance == testBean.echo(baseInstance);
+   }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public interface GenericInterface<T>
-{
-   T echo(T parameter);
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericInterface.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public interface GenericInterface<T>
+{
+   T echo(T parameter);
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-/**
- * @author Marius Bogoevici
- */
-public class Subclass extends BaseClass
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class Subclass extends BaseClass
+{
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.generic;
-
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
-public class TestBean
-{
-   @Inject GenericInterface<String> genericStringField;
-
-   @Inject GenericInterface<Integer> genericIntegerField;
-
-   @Inject BoundedGenericBean<Subclass> boundedGenericSubclassField;
-
-   @Inject BoundedGenericBean<BaseClass> boundedGenericBaseField;
-
-
-   public String echo(String param)
-   {
-      return genericStringField.echo(param);
-   }
-
-   public Integer echo(Integer param)
-   {
-      return genericIntegerField.echo(param);
-   }
-
-   public Subclass echo (Subclass param)
-   {
-      return boundedGenericSubclassField.echo(param);
-   }
-
-   public BaseClass echo (BaseClass param)
-   {
-      return boundedGenericBaseField.echo(param);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.generic;
+
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class TestBean
+{
+   @Inject GenericInterface<String> genericStringField;
+
+   @Inject GenericInterface<Integer> genericIntegerField;
+
+   @Inject BoundedGenericBean<Subclass> boundedGenericSubclassField;
+
+   @Inject BoundedGenericBean<BaseClass> boundedGenericBaseField;
+
+
+   public String echo(String param)
+   {
+      return genericStringField.echo(param);
+   }
+
+   public Integer echo(Integer param)
+   {
+      return genericIntegerField.echo(param);
+   }
+
+   public Subclass echo (Subclass param)
+   {
+      return boundedGenericSubclassField.echo(param);
+   }
+
+   public BaseClass echo (BaseClass param)
+   {
+      return boundedGenericBaseField.echo(param);
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-public class Cow
-{
-   
-   private final String name;
-
-   public Cow(String name)
-   {
-      this.name = name;
-   }
-   
-   public String getName()
-   {
-      return name;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+public class Cow
+{
+   
+   private final String name;
+
+   public Cow(String name)
+   {
+      this.name = name;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.weld.injection.FieldInjectionPoint;
-
-public class CowShed
-{
-
-   @Produces
-   public Cow get(InjectionPoint ip)
-   {
-      assert ip instanceof FieldInjectionPoint<?, ?>;
-      FieldInjectionPoint<?, ?> fip = (FieldInjectionPoint<?, ?>) ip;
-      assert fip.getDeclaringType().getJavaClass().equals(Field.class);
-      return new Cow("daisy");
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/CowShed.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.FieldInjectionPoint;
+
+public class CowShed
+{
+
+   @Produces
+   public Cow get(InjectionPoint ip)
+   {
+      assert ip instanceof FieldInjectionPoint<?, ?>;
+      FieldInjectionPoint<?, ?> fip = (FieldInjectionPoint<?, ?>) ip;
+      assert fip.getDeclaringType().getJavaClass().equals(Field.class);
+      return new Cow("daisy");
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
- at Named
- at SessionScoped
-public class DoubleConsumer implements Serializable
-{
-
-   private static final long serialVersionUID = 6619645042310126425L;
-
-   @Inject
-   private double maxNumber;
-
-   public DoubleConsumer()
-   {
-   }
-   
-   public void ping()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+ at Named
+ at SessionScoped
+public class DoubleConsumer implements Serializable
+{
+
+   private static final long serialVersionUID = 6619645042310126425L;
+
+   @Inject
+   private double maxNumber;
+
+   public DoubleConsumer()
+   {
+   }
+   
+   public void ping()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.io.Serializable;
-import java.util.Timer;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-
- at ApplicationScoped
-public class DoubleGenerator implements Serializable
-{
-
-   private static final long serialVersionUID = -7213673465118041882L;
-   
-   @Inject Timer timer;
-   
-   @Produces
-   double getDouble()
-   {
-      timer.cancel();
-      return 11.1;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/DoubleGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.io.Serializable;
+import java.util.Timer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+public class DoubleGenerator implements Serializable
+{
+
+   private static final long serialVersionUID = -7213673465118041882L;
+   
+   @Inject Timer timer;
+   
+   @Produces
+   double getDouble()
+   {
+      timer.cancel();
+      return 11.1;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
-
-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;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface ExtraSpecial
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface ExtraSpecial
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-public class ExtraSpecialLiteral extends AnnotationLiteral<ExtraSpecial> implements ExtraSpecial
-{
-    public static final ExtraSpecial INSTANCE = new ExtraSpecialLiteral();
-
-    private ExtraSpecialLiteral() {
-    }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+public class ExtraSpecialLiteral extends AnnotationLiteral<ExtraSpecial> implements ExtraSpecial
+{
+    public static final ExtraSpecial INSTANCE = new ExtraSpecialLiteral();
+
+    private ExtraSpecialLiteral() {
+    }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import javax.inject.Inject;
-
-public class Field
-{
-   
-   @Inject Cow cow;
-   
-   public Cow getCow()
-   {
-      return cow;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Field.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import javax.inject.Inject;
+
+public class Field
+{
+   
+   @Inject Cow cow;
+   
+   public Cow getCow()
+   {
+      return cow;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-public class GrassyField extends Field
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/GrassyField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+public class GrassyField extends Field
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.lang.reflect.ParameterizedType;
-
-import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
-public class InjectionPointTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-239")
-   public void testCorrectInjectionPointUsed()
-   {
-      getReference(IntConsumer.class).ping();
-      
-      try
-      {
-         getReference(DoubleConsumer.class).ping();
-      }
-      catch (IllegalProductException e)
-      {
-         assert e.getMessage().contains("Injection Point: field org.jboss.weld.tests.injectionPoint.DoubleGenerator.timer");
-      }
-   }
-   
-   @Test(description="WELD-316")
-   public void testFieldInjectionPointSerializability() throws Throwable
-   {
-      getReference(StringConsumer.class).ping();
-      InjectionPoint ip = StringGenerator.getInjectionPoint();
-      assert ip != null;
-      assert ip.getMember().getName().equals("str");
-      InjectionPoint ip1 = Utils.deserialize(Utils.serialize(ip));
-      assert ip1.getMember().getName().equals("str");
-   }
-   
-   @Test
-   public void testGetDeclaringType()
-   {
-      assert getReference(GrassyField.class).getCow().getName().equals("daisy");
-   }
-   
-   @Test(description = "WELD-438")
-   public void testInjectionPointWhenInstanceGetIsUsed() throws Exception
-   {
-      Pig pig = getReference(PigSty.class).getPig();
-      assert pig != null;
-      assert pig.getInjectionPoint().getBean() != null;
-      assert pig.getInjectionPoint().getBean().getBeanClass().equals(PigSty.class);
-      assert pig.getInjectionPoint().getMember().equals(PigSty.class.getDeclaredField("pig"));
-      assert pig.getInjectionPoint().getAnnotated() != null;
-      assert pig.getInjectionPoint().getAnnotated().getBaseType() instanceof ParameterizedType;
-      ParameterizedType parameterizedType = ((ParameterizedType) pig.getInjectionPoint().getAnnotated().getBaseType());
-      assert parameterizedType.getRawType().equals(Instance.class);
-      assert parameterizedType.getActualTypeArguments().length == 1;
-      assert parameterizedType.getActualTypeArguments()[0].equals(Pig.class);
-      assert pig.getInjectionPoint().getAnnotated().isAnnotationPresent(Special.class);
-      assert !pig.getInjectionPoint().getAnnotated().isAnnotationPresent(ExtraSpecial.class);
-      assert Utils.annotationSetMatches(pig.injectionPoint.getQualifiers(), Special.class, ExtraSpecial.class);
-      assert Pig.class.equals(pig.getInjectionPoint().getType());
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.lang.reflect.ParameterizedType;
+
+import javax.enterprise.inject.IllegalProductException;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class InjectionPointTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-239")
+   public void testCorrectInjectionPointUsed()
+   {
+      getReference(IntConsumer.class).ping();
+      
+      try
+      {
+         getReference(DoubleConsumer.class).ping();
+      }
+      catch (IllegalProductException e)
+      {
+         assert e.getMessage().contains("Injection Point: field org.jboss.weld.tests.injectionPoint.DoubleGenerator.timer");
+      }
+   }
+   
+   @Test(description="WELD-316")
+   public void testFieldInjectionPointSerializability() throws Throwable
+   {
+      getReference(StringConsumer.class).ping();
+      InjectionPoint ip = StringGenerator.getInjectionPoint();
+      assert ip != null;
+      assert ip.getMember().getName().equals("str");
+      InjectionPoint ip1 = Utils.deserialize(Utils.serialize(ip));
+      assert ip1.getMember().getName().equals("str");
+   }
+   
+   @Test
+   public void testGetDeclaringType()
+   {
+      assert getReference(GrassyField.class).getCow().getName().equals("daisy");
+   }
+   
+   @Test(description = "WELD-438")
+   public void testInjectionPointWhenInstanceGetIsUsed() throws Exception
+   {
+      Pig pig = getReference(PigSty.class).getPig();
+      assert pig != null;
+      assert pig.getInjectionPoint().getBean() != null;
+      assert pig.getInjectionPoint().getBean().getBeanClass().equals(PigSty.class);
+      assert pig.getInjectionPoint().getMember().equals(PigSty.class.getDeclaredField("pig"));
+      assert pig.getInjectionPoint().getAnnotated() != null;
+      assert pig.getInjectionPoint().getAnnotated().getBaseType() instanceof ParameterizedType;
+      ParameterizedType parameterizedType = ((ParameterizedType) pig.getInjectionPoint().getAnnotated().getBaseType());
+      assert parameterizedType.getRawType().equals(Instance.class);
+      assert parameterizedType.getActualTypeArguments().length == 1;
+      assert parameterizedType.getActualTypeArguments()[0].equals(Pig.class);
+      assert pig.getInjectionPoint().getAnnotated().isAnnotationPresent(Special.class);
+      assert !pig.getInjectionPoint().getAnnotated().isAnnotationPresent(ExtraSpecial.class);
+      assert Utils.annotationSetMatches(pig.injectionPoint.getQualifiers(), Special.class, ExtraSpecial.class);
+      assert Pig.class.equals(pig.getInjectionPoint().getType());
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
- at Named
- at SessionScoped
-public class IntConsumer implements Serializable
-{
-
-   private static final long serialVersionUID = 6619645042310126425L;
-
-   @Inject
-   private int maxNumber;
-
-   public IntConsumer()
-   {
-   }
-   
-   public void ping()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+ at Named
+ at SessionScoped
+public class IntConsumer implements Serializable
+{
+
+   private static final long serialVersionUID = 6619645042310126425L;
+
+   @Inject
+   private int maxNumber;
+
+   public IntConsumer()
+   {
+   }
+   
+   public void ping()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.io.Serializable;
-import java.util.Timer;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-
- at ApplicationScoped
-public class IntGenerator implements Serializable
-{
-
-   private static final long serialVersionUID = -7213673465118041882L;
-
-   @Inject
-   private Instance<Timer> timerInstance;
-
-   @Produces
-   int getInt()
-   {
-      // This has no purpose other than to invoke a method on the proxy so that the proxy instance
-      // is retrieved via the producer method
-      timerInstance.get().cancel();
-      return 100;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/IntGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.io.Serializable;
+import java.util.Timer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+public class IntGenerator implements Serializable
+{
+
+   private static final long serialVersionUID = -7213673465118041882L;
+
+   @Inject
+   private Instance<Timer> timerInstance;
+
+   @Produces
+   int getInt()
+   {
+      // This has no purpose other than to invoke a method on the proxy so that the proxy instance
+      // is retrieved via the producer method
+      timerInstance.get().cancel();
+      return 100;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-
- at Special @ExtraSpecial
-public class Pig
-{
-   
-   @Inject InjectionPoint injectionPoint;
-   
-   public InjectionPoint getInjectionPoint()
-   {
-      return injectionPoint;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Pig.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+ at Special @ExtraSpecial
+public class Pig
+{
+   
+   @Inject InjectionPoint injectionPoint;
+   
+   public InjectionPoint getInjectionPoint()
+   {
+      return injectionPoint;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-public class PigSty
-{
-   @Inject @Special Instance<Pig> pig;
-   
-   public Pig getPig()
-   {
-      return pig.select(ExtraSpecialLiteral.INSTANCE).get();
-   }
-   
-}
-

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+public class PigSty
+{
+   @Inject @Special Instance<Pig> pig;
+   
+   public Pig getPig()
+   {
+      return pig.select(ExtraSpecialLiteral.INSTANCE).get();
+   }
+   
+}
+

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-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;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface Special
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import javax.inject.Inject;
-
-public class StringConsumer
-{
-
-   @Inject String str;
-   
-   public void ping() {}
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import javax.inject.Inject;
+
+public class StringConsumer
+{
+
+   @Inject String str;
+   
+   public void ping() {}
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-public class StringGenerator
-{
-
-   private static InjectionPoint injectionPoint;
-   
-   public static InjectionPoint getInjectionPoint()
-   {
-      return injectionPoint;
-   }
-   
-   public static void reset()
-   {
-      injectionPoint = null;
-   }
-   
-   @Produces String getString(InjectionPoint ip)
-   {
-      injectionPoint = ip;
-      return "";
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+public class StringGenerator
+{
+
+   private static InjectionPoint injectionPoint;
+   
+   public static InjectionPoint getInjectionPoint()
+   {
+      return injectionPoint;
+   }
+   
+   public static void reset()
+   {
+      injectionPoint = null;
+   }
+   
+   @Produces String getString(InjectionPoint ip)
+   {
+      injectionPoint = ip;
+      return "";
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
-
-import java.io.Serializable;
-import java.util.Timer;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-
-public class TimerManager implements Serializable
-{
-
-   private static final long serialVersionUID = 5156835887786174326L;
-
-   @Produces
-   @RequestScoped
-   public Timer getTimer()
-   {
-      return new Timer();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/TimerManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint;
+
+import java.io.Serializable;
+import java.util.Timer;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+public class TimerManager implements Serializable
+{
+
+   private static final long serialVersionUID = 5156835887786174326L;
+
+   @Produces
+   @RequestScoped
+   public Timer getTimer()
+   {
+      return new Timer();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint.other;
-
-public class Foo
-{
-
-   public void ping() {}
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/other/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.injectionPoint.other;
+
+public class Foo
+{
+
+   public void ping() {}
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/managed)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.managed.newBean;
-
-import java.util.Set;
-
-import javax.enterprise.inject.New;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.bean.ManagedBean;
-import org.jboss.weld.bean.NewManagedBean;
-import org.jboss.weld.introspector.WeldAnnotated;
-import org.jboss.weld.literal.NewLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.util.AnnotatedTypes;
-import org.testng.annotations.Test;
-
- at Artifact
-public class NewSimpleBeanTest extends AbstractWeldTest
-{
-   private ManagedBean<WrappedSimpleBean> wrappedSimpleBean;
-   private NewManagedBean<WrappedSimpleBean> newSimpleBean;
-   
-   private static final New NEW_LITERAL = new NewLiteral();
-   
-   public void initNewBean() {
-      
-      assert getCurrentManager().getBeans(WrappedSimpleBean.class).size() == 1;
-      assert getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next() instanceof ManagedBean;
-      wrappedSimpleBean = (ManagedBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next();
-      
-      assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).size() == 1;
-      assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewManagedBean;
-      newSimpleBean = (NewManagedBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next();
-   }
-
-   @Test(groups = { "new" })
-   public void testNewBeanHasImplementationClassOfInjectionPointType()
-   {
-      initNewBean();
-      assert newSimpleBean.getType().equals(WrappedSimpleBean.class);
-   }
-
-   @Test(groups = { "new" })
-   public void testNewBeanIsSimpleWebBeanIfParameterTypeIsSimpleWebBean()
-   {
-      initNewBean();
-      assert newSimpleBean.getType().equals(wrappedSimpleBean.getType());
-   }
-
-   @Test(groups = { "new" })
-   public void testNewBeanHasSameConstructorAsWrappedBean()
-   {
-      initNewBean();
-      assert AnnotatedTypes.compareAnnotatedCallable(wrappedSimpleBean.getConstructor(), newSimpleBean.getConstructor());
-   }
-
-   @Test(groups = { "new" })
-   public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
-   {
-      initNewBean();
-      assert newSimpleBean.getInitializerMethods().equals(wrappedSimpleBean.getInitializerMethods());
-   }
-
-   @Test(groups = { "new" })
-   public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
-   {
-      initNewBean();
-      Set<? extends WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getWeldInjectionPoints();
-      Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newSimpleBean.getWeldInjectionPoints();
-      assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.managed.newBean;
+
+import java.util.Set;
+
+import javax.enterprise.inject.New;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.NewManagedBean;
+import org.jboss.weld.introspector.WeldAnnotated;
+import org.jboss.weld.literal.NewLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.util.AnnotatedTypes;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class NewSimpleBeanTest extends AbstractWeldTest
+{
+   private ManagedBean<WrappedSimpleBean> wrappedSimpleBean;
+   private NewManagedBean<WrappedSimpleBean> newSimpleBean;
+   
+   private static final New NEW_LITERAL = new NewLiteral();
+   
+   public void initNewBean() {
+      
+      assert getCurrentManager().getBeans(WrappedSimpleBean.class).size() == 1;
+      assert getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next() instanceof ManagedBean;
+      wrappedSimpleBean = (ManagedBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next();
+      
+      assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).size() == 1;
+      assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewManagedBean;
+      newSimpleBean = (NewManagedBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next();
+   }
+
+   @Test(groups = { "new" })
+   public void testNewBeanHasImplementationClassOfInjectionPointType()
+   {
+      initNewBean();
+      assert newSimpleBean.getType().equals(WrappedSimpleBean.class);
+   }
+
+   @Test(groups = { "new" })
+   public void testNewBeanIsSimpleWebBeanIfParameterTypeIsSimpleWebBean()
+   {
+      initNewBean();
+      assert newSimpleBean.getType().equals(wrappedSimpleBean.getType());
+   }
+
+   @Test(groups = { "new" })
+   public void testNewBeanHasSameConstructorAsWrappedBean()
+   {
+      initNewBean();
+      assert AnnotatedTypes.compareAnnotatedCallable(wrappedSimpleBean.getConstructor(), newSimpleBean.getConstructor());
+   }
+
+   @Test(groups = { "new" })
+   public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
+   {
+      initNewBean();
+      assert newSimpleBean.getInitializerMethods().equals(wrappedSimpleBean.getInitializerMethods());
+   }
+
+   @Test(groups = { "new" })
+   public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
+   {
+      initNewBean();
+      Set<? extends WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getWeldInjectionPoints();
+      Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newSimpleBean.getWeldInjectionPoints();
+      assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.managed.newBean;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-
- at SessionScoped
-class WrappedSimpleBean implements Serializable
-{
-   public WrappedSimpleBean() {
-      
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/WrappedSimpleBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.managed.newBean;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+
+ at SessionScoped
+class WrappedSimpleBean implements Serializable
+{
+   public WrappedSimpleBean() {
+      
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-
-import org.jboss.metadata.validation.ValidationException;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ExampleTest extends AbstractWeldTest
-{
-   @Test
-   public void testNonContextual() throws Exception 
-   {
-      NonContextual<External> nonContextual = new NonContextual<External>(getCurrentManager(), External.class);
-      
-      External external = new External();
-      Assert.assertNull(external.bean);
-      nonContextual.postConstruct(external);
-      Assert.assertNotNull(external.bean);
-      nonContextual.preDestroy(external);
-      // preDestroy doesn't cause any dis-injection
-      Assert.assertNotNull(external.bean);      
-   }
-   
-   @Test
-   public void validateNonContextual() throws Exception
-   {
-      NonContextual<External> nonContextual = new NonContextual<External>(getCurrentManager(), External.class);
-
-      for (InjectionPoint point : nonContextual.it.getInjectionPoints())
-      {
-         try
-         {
-            getCurrentManager().validate(point);
-         }
-         catch(ValidationException e)
-         {
-            Assert.fail("Should have been valid");
-         }
-      }
-   }
-   
-   
-   public class NonContextual<T> {
-
-      final InjectionTarget<T> it;
-      final BeanManager manager;
-
-      public NonContextual(BeanManager manager, Class<T> clazz) {
-         this.manager = manager;
-         AnnotatedType<T> type = manager.createAnnotatedType(clazz);
-         this.it = manager.createInjectionTarget(type);
-      }
-
-      public CreationalContext<T> postConstruct(T instance) {
-         CreationalContext<T> cc = manager.createCreationalContext(null);
-         it.inject(instance, cc);
-         it.postConstruct(instance);
-         return cc;
-      }
-
-      public void preDestroy(T instance) {
-         it.preDestroy(instance);
-      }
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+import org.jboss.metadata.validation.ValidationException;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ExampleTest extends AbstractWeldTest
+{
+   @Test
+   public void testNonContextual() throws Exception 
+   {
+      NonContextual<External> nonContextual = new NonContextual<External>(getCurrentManager(), External.class);
+      
+      External external = new External();
+      Assert.assertNull(external.bean);
+      nonContextual.postConstruct(external);
+      Assert.assertNotNull(external.bean);
+      nonContextual.preDestroy(external);
+      // preDestroy doesn't cause any dis-injection
+      Assert.assertNotNull(external.bean);      
+   }
+   
+   @Test
+   public void validateNonContextual() throws Exception
+   {
+      NonContextual<External> nonContextual = new NonContextual<External>(getCurrentManager(), External.class);
+
+      for (InjectionPoint point : nonContextual.it.getInjectionPoints())
+      {
+         try
+         {
+            getCurrentManager().validate(point);
+         }
+         catch(ValidationException e)
+         {
+            Assert.fail("Should have been valid");
+         }
+      }
+   }
+   
+   
+   public class NonContextual<T> {
+
+      final InjectionTarget<T> it;
+      final BeanManager manager;
+
+      public NonContextual(BeanManager manager, Class<T> clazz) {
+         this.manager = manager;
+         AnnotatedType<T> type = manager.createAnnotatedType(clazz);
+         this.it = manager.createInjectionTarget(type);
+      }
+
+      public CreationalContext<T> postConstruct(T instance) {
+         CreationalContext<T> cc = manager.createCreationalContext(null);
+         it.inject(instance, cc);
+         it.postConstruct(instance);
+         return cc;
+      }
+
+      public void preDestroy(T instance) {
+         it.preDestroy(instance);
+      }
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-import javax.inject.Inject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class External
-{
-   
-   public External()
-   {
-      // TODO Auto-generated constructor stub
-   }
-   
-   @Inject WebBean bean;
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/External.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+import javax.inject.Inject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class External
+{
+   
+   public External()
+   {
+      // TODO Auto-generated constructor stub
+   }
+   
+   @Inject WebBean bean;
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-import java.util.logging.Logger;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-public class LogManager
-{
-
-   @Produces
-   public Logger createLogger(InjectionPoint injectionPoint)
-   {
-      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName());
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/LogManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+import java.util.logging.Logger;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+public class LogManager
+{
+
+   @Produces
+   public Logger createLogger(InjectionPoint injectionPoint)
+   {
+      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName());
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Random
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Random
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-public class ServletContextListenerImpl implements ServletContextListener
-{
-   
-   public static boolean ok;
-   
-   @Inject Logger log;
-
-   public void contextDestroyed(ServletContextEvent sce)
-   {
-      
-   }
-
-   public void contextInitialized(ServletContextEvent sce)
-   {
-      log.finer("hello!");
-      ok = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletContextListenerImpl.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class ServletContextListenerImpl implements ServletContextListener
+{
+   
+   public static boolean ok;
+   
+   @Inject Logger log;
+
+   public void contextDestroyed(ServletContextEvent sce)
+   {
+      
+   }
+
+   public void contextInitialized(ServletContextEvent sce)
+   {
+      log.finer("hello!");
+      ok = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.war.WebXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at WebXml("web.xml")
-public class ServletListenerTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-445")
-   public void test()
-   {
-      assert ServletContextListenerImpl.ok;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.war.WebXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at WebXml("web.xml")
+public class ServletListenerTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-445")
+   public void test()
+   {
+      assert ServletContextListenerImpl.ok;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,21 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
-
-public class WebBean
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/nonContextual/WebBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,21 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.nonContextual;
+
+public class WebBean
+{
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Baz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Baz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,13 @@
+package org.jboss.weld.tests.producer.field;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Qualifier
+public @interface Baz
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/IntegerCollectionInjection.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/IntegerCollectionInjection.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/IntegerCollectionInjection.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/IntegerCollectionInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+
+public class IntegerCollectionInjection
+{
+
+   private Collection<Integer> value;
+
+   @Inject
+   private Collection<Integer> fieldInjection;
+
+   private Collection<Integer> setterInjection;
+
+   @Inject
+   public void init(Collection<Integer> setterInjection)
+   {
+      this.setterInjection = setterInjection;
+   }
+
+   @Inject
+   public IntegerCollectionInjection(Collection<Integer> com)
+   {
+      this.value = com;
+   }
+
+   public Collection<Integer> getValue()
+   {
+      return value;
+   }
+
+   public Collection<Integer> getFieldInjection()
+   {
+      return fieldInjection;
+   }
+
+   public Collection<Integer> getSetterInjection()
+   {
+      return setterInjection;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListInstance.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListInstance.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListInstance.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListInstance.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.List;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+public class ListInstance
+{
+   @Inject @Any
+   Instance<List> instance;
+   
+   public Instance<List> get()
+   {
+      return instance;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListStringInstance.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListStringInstance.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListStringInstance.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ListStringInstance.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.List;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+public class ListStringInstance
+{
+   @Inject @Any Instance<List<String>> instance;
+
+   public List<String> get()
+   {
+      return instance.get();
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedCollectionInjection.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedCollectionInjection.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedCollectionInjection.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedCollectionInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+
+public class ParameterizedCollectionInjection
+{
+
+   private Collection<String> value;
+
+   @Inject
+   private Collection<String> fieldInjection;
+
+   private Collection<String> setterInjection;
+
+   @Inject
+   public void init(Collection<String> setterInjection)
+   {
+      this.setterInjection = setterInjection;
+   }
+
+   @Inject
+   public ParameterizedCollectionInjection(Collection<String> com)
+   {
+      this.value = com;
+   }
+
+   public Collection<String> getValue()
+   {
+      return value;
+   }
+
+   public Collection<String> getFieldInjection()
+   {
+      return fieldInjection;
+   }
+
+   public Collection<String> getSetterInjection()
+   {
+      return setterInjection;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedListInjection.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedListInjection.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedListInjection.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedListInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class ParameterizedListInjection
+{
+
+   private List<String> value;
+
+   @Inject
+   private List<String> fieldInjection;
+
+   private List<String> setterInjection;
+
+   @Inject
+   public void init(List<String> setterInjection)
+   {
+      this.setterInjection = setterInjection;
+   }
+
+   @Inject
+   public ParameterizedListInjection(List<String> com)
+   {
+      this.value = com;
+   }
+
+   public java.util.List<String> getValue()
+   {
+      return value;
+   }
+
+   public List<String> getFieldInjection()
+   {
+      return fieldInjection;
+   }
+
+   public List<String> getSetterInjection()
+   {
+      return setterInjection;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.inject.Produces;
+
+public class ParameterizedProducer
+{
+
+   @Produces
+   public List<String> createStringList()
+   {
+      return Arrays.asList("aaa", "bbb");
+   }
+
+   @Produces
+   public ArrayList<Integer> createIntegerList()
+   {
+      List<Integer> list = Arrays.asList(1, 2, 3, 4);
+      ArrayList<Integer> arrayList = new ArrayList<Integer>();
+      arrayList.addAll(list);
+      return arrayList;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ParameterizedProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ParameterizedProducerTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testParameterizedListInjection()
+   {
+      List<String> strings = getReference(Target.class).getStringList();
+      assert strings.size() == 2;
+
+      ParameterizedListInjection item = getReference(ParameterizedListInjection.class);
+      assert item.getFieldInjection().size() == 2;
+      assert item.getValue().size() == 2;
+      assert item.getSetterInjection().size() == 2;
+
+   }
+
+   @Test
+   public void testParameterizedCollectionInjection()
+   {
+      Collection<String> strings = getReference(Target.class).getStrings();
+      assert strings.size() == 2;
+
+      ParameterizedCollectionInjection item = getReference(ParameterizedCollectionInjection.class);
+      assert item.getFieldInjection().size() == 2;
+      assert item.getValue().size() == 2;
+      assert item.getSetterInjection().size() == 2;
+
+   }
+   
+   @Test
+   public void testIntegerCollectionInjection()
+   {
+      Collection<Integer> integers = getReference(Target.class).getIntegers();
+      assert integers.size() == 4;
+
+      IntegerCollectionInjection item = getReference(IntegerCollectionInjection.class);
+      assert item.getFieldInjection().size() == 4;
+      assert item.getValue().size() == 4;
+      assert item.getSetterInjection().size() == 4;
+
+   }
+   
+   @Test
+   public void testInstanceList()
+   {
+        ListInstance listInstance = getReference(ListInstance.class);
+        assert listInstance.get().isAmbiguous();
+   }
+   
+   @Test
+   public void testTypeParameterInstance()
+   {
+        ListStringInstance listInstance = getReference(ListStringInstance.class);
+        assert listInstance.get().size() == 2;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ProducerBeanInvocationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ProducerBeanInvocationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ProducerBeanInvocationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/ProducerBeanInvocationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, 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.tests.producer.field;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Simple test which invokes a method directly on a normal scoped producer
+ * bean to ensure that it's proxy is for that bean and not the product
+ * of a producer method.
+ * 
+ * @author David Allen
+ *
+ */
+ at Artifact
+public class ProducerBeanInvocationTest extends AbstractWeldTest
+{
+   @Test
+   // WELD-546
+   public void test()
+   {
+      Qux bar = getReference(Qux.class);
+      assert bar.getBar().equals("qux");
+      QuxProducer producer = getReference(QuxProducer.class);
+      assert producer.ping();
+      Qux bazBar = getReference(Qux.class, new AnnotationLiteral<Baz>(){});
+      assert bazBar.getBar().equals("baz");
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Qux.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Qux.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Qux.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Qux.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+package org.jboss.weld.tests.producer.field;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+public class Qux
+{
+   
+   private final String name;
+   
+   public Qux(String name)
+   {
+      this.name = name;
+   }
+   
+   public Qux()
+   {
+      this("qux");
+   }
+   
+   public String getBar()
+   {
+      return name;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/QuxProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/QuxProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/QuxProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/QuxProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,18 @@
+package org.jboss.weld.tests.producer.field;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+ at RequestScoped
+public class QuxProducer
+{
+   
+   @Produces @Baz @RequestScoped
+   private Qux bar = new Qux("baz");
+   
+   public boolean ping() 
+   {
+      return true;
+   };
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Target.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Target.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Target.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/field/Target.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.field;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class Target
+{
+   
+   @Inject private Collection<String> strings;
+   
+   @Inject private Collection<Integer> integers;
+   
+   @Inject private List<String> stringList;
+   
+   public Collection<String> getStrings()
+   {
+      return strings;
+   }
+   
+   public Collection<Integer> getIntegers()
+   {
+      return integers;
+   }
+   
+   public List<String> getStringList()
+   {
+      return stringList;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-public class Bar
-{
-
-   public Bar(String blah)
-   {
-      
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+public class Bar
+{
+
+   public Bar(String blah)
+   {
+      
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
- at RequestScoped
-public class BarConsumer
-{
-   @Inject
-   private Bar bar;
-
-   public Bar getBar()
-   {
-      return bar;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+ at RequestScoped
+public class BarConsumer
+{
+   @Inject
+   private Bar bar;
+
+   public Bar getBar()
+   {
+      return bar;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import java.lang.reflect.Member;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-/**
- * Class with a producer method and disposal method both containing InjectionPoint
- * parameters.
- * 
- * @author David Allen
- *
- */
-public class BarProducer
-{
-   private static Bar disposedBar;
-   private static Member disposedInjection;
-   private static Member producedInjection;
-   
-   @Produces
-   public Bar getBar(InjectionPoint injectionPoint)
-   {
-      producedInjection = injectionPoint.getMember();
-      return new Bar("blah");
-   }
-   
-   public void dispose(@Disposes @Any Bar bar, InjectionPoint injectionPoint)
-   {
-      disposedBar = bar;
-      disposedInjection = injectionPoint.getMember();
-   }
-
-   public static Bar getDisposedBar()
-   {
-      return disposedBar;
-   }
-
-   public static Member getDisposedInjection()
-   {
-      return disposedInjection;
-   }
-
-   public static Member getProducedInjection()
-   {
-      return producedInjection;
-   }
-   
-   public static void reset()
-   {
-      disposedBar = null;
-      disposedInjection = null;
-      producedInjection = null;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/BarProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import java.lang.reflect.Member;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+/**
+ * Class with a producer method and disposal method both containing InjectionPoint
+ * parameters.
+ * 
+ * @author David Allen
+ *
+ */
+public class BarProducer
+{
+   private static Bar disposedBar;
+   private static Member disposedInjection;
+   private static Member producedInjection;
+   
+   @Produces
+   public Bar getBar(InjectionPoint injectionPoint)
+   {
+      producedInjection = injectionPoint.getMember();
+      return new Bar("blah");
+   }
+   
+   public void dispose(@Disposes @Any Bar bar, InjectionPoint injectionPoint)
+   {
+      disposedBar = bar;
+      disposedInjection = injectionPoint.getMember();
+   }
+
+   public static Bar getDisposedBar()
+   {
+      return disposedBar;
+   }
+
+   public static Member getDisposedInjection()
+   {
+      return disposedInjection;
+   }
+
+   public static Member getProducedInjection()
+   {
+      return producedInjection;
+   }
+   
+   public static void reset()
+   {
+      disposedBar = null;
+      disposedInjection = null;
+      producedInjection = null;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,13 +0,0 @@
-package org.jboss.weld.tests.producer.method;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
- at Retention(RetentionPolicy.RUNTIME)
- at Qualifier
-public @interface Baz
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,13 @@
+package org.jboss.weld.tests.producer.method;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Qualifier
+public @interface Baz
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import java.io.Serializable;
-
-public class Car implements Serializable
-{
-
-   private static final long serialVersionUID = 1L;
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Car.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import java.io.Serializable;
+
+public class Car implements Serializable
+{
+
+   private static final long serialVersionUID = 1L;
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Produces;
-
-public class CarFactory
-{
-
-   @Produces @Important
-   public Car produceGovernmentCar()
-   {
-      return null;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/CarFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Produces;
+
+public class CarFactory
+{
+
+   @Produces @Important
+   public Car produceGovernmentCar()
+   {
+      return null;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class DisposalMethodInjectionPointTest extends AbstractWeldTest
-{
-   @Test(groups = { "broken" })
-   // WELD-358
-   public void test()
-   {
-      BarProducer.reset();
-      Bean<BarConsumer> barConsumerBean = getBean(BarConsumer.class);
-      CreationalContext<BarConsumer> ctx = getCurrentManager().createCreationalContext(barConsumerBean);
-      BarConsumer barConsumer = barConsumerBean.create(ctx);
-      assert BarProducer.getProducedInjection().getName().equals("bar");
-      Bar bar = barConsumer.getBar();
-      barConsumerBean.destroy(barConsumer, ctx);
-      assert BarProducer.getDisposedBar() == bar;
-      assert BarProducer.getDisposedInjection().getName().equals("bar");
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodInjectionPointTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class DisposalMethodInjectionPointTest extends AbstractWeldTest
+{
+   @Test(groups = { "broken" })
+   // WELD-358
+   public void test()
+   {
+      BarProducer.reset();
+      Bean<BarConsumer> barConsumerBean = getBean(BarConsumer.class);
+      CreationalContext<BarConsumer> ctx = getCurrentManager().createCreationalContext(barConsumerBean);
+      BarConsumer barConsumer = barConsumerBean.create(ctx);
+      assert BarProducer.getProducedInjection().getName().equals("bar");
+      Bar bar = barConsumer.getBar();
+      barConsumerBean.destroy(barConsumer, ctx);
+      assert BarProducer.getDisposedBar() == bar;
+      assert BarProducer.getDisposedInjection().getName().equals("bar");
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class DisposalMethodOnOtherBeanNotResolvedTest extends AbstractWeldTest
-{
-   @Test
-   public void test()
-   {
-      FooDisposer.reset();
-      FooProducer.reset();
-      Bean<Foo> bean = getBean(Foo.class);
-      CreationalContext<Foo> ctx = getCurrentManager().createCreationalContext(bean);
-      Foo instance = bean.create(ctx);
-      assert instance.getBlah().equals("foo!");
-      bean.destroy(instance, ctx);
-      assert !FooDisposer.isDisposed();
-      assert FooProducer.isDisposed();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class DisposalMethodOnOtherBeanNotResolvedTest extends AbstractWeldTest
+{
+   @Test
+   public void test()
+   {
+      FooDisposer.reset();
+      FooProducer.reset();
+      Bean<Foo> bean = getBean(Foo.class);
+      CreationalContext<Foo> ctx = getCurrentManager().createCreationalContext(bean);
+      Foo instance = bean.create(ctx);
+      assert instance.getBlah().equals("foo!");
+      bean.destroy(instance, ctx);
+      assert !FooDisposer.isDisposed();
+      assert FooProducer.isDisposed();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-/**
- * @author pmuir
- *
- */
-public class Foo
-{
-   
-   private final String blah;
-   
-   public Foo(String blah)
-   {
-      this.blah = blah;
-   }
-
-   /**
-    * @return the blah
-    */
-   public String getBlah()
-   {
-      return blah;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Foo
+{
+   
+   private final String blah;
+   
+   public Foo(String blah)
+   {
+      this.blah = blah;
+   }
+
+   /**
+    * @return the blah
+    */
+   public String getBlah()
+   {
+      return blah;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author pmuir
- *
- */
-public class FooDisposer
-{
-
-   private static boolean disposed;
-   
-   public static void reset()
-   {
-      disposed = false;
-   }
-   
-   void disposeFoo(@Disposes @Any Foo foo)
-   {
-      disposed = true;
-   }
-   
-   /**
-    * @return the disposed
-    */
-   public static boolean isDisposed()
-   {
-      return disposed;
-   }
-   
-   @Produces @Important
-   public Foo getFoo()
-   {
-      return new Foo("bar!");
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooDisposer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+/**
+ * @author pmuir
+ *
+ */
+public class FooDisposer
+{
+
+   private static boolean disposed;
+   
+   public static void reset()
+   {
+      disposed = false;
+   }
+   
+   void disposeFoo(@Disposes @Any Foo foo)
+   {
+      disposed = true;
+   }
+   
+   /**
+    * @return the disposed
+    */
+   public static boolean isDisposed()
+   {
+      return disposed;
+   }
+   
+   @Produces @Important
+   public Foo getFoo()
+   {
+      return new Foo("bar!");
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-/**
- * @author pmuir
- *
- */
-public class FooProducer
-{
-
-   @Produces Foo getFoo()
-   {
-      return new Foo("foo!");
-   }
-   
-   private static boolean disposed;
-   
-   public static void reset()
-   {
-      disposed = false;
-   }
-   
-   public void disposeFoo(@Disposes Foo foo)
-   {
-      disposed = true;
-   }
-   
-   /**
-    * @return the disposed
-    */
-   public static boolean isDisposed()
-   {
-      return disposed;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/FooProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+/**
+ * @author pmuir
+ *
+ */
+public class FooProducer
+{
+
+   @Produces Foo getFoo()
+   {
+      return new Foo("foo!");
+   }
+   
+   private static boolean disposed;
+   
+   public static void reset()
+   {
+      disposed = false;
+   }
+   
+   public void disposeFoo(@Disposes Foo foo)
+   {
+      disposed = true;
+   }
+   
+   /**
+    * @return the disposed
+    */
+   public static boolean isDisposed()
+   {
+      return disposed;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-
- at SessionScoped
-public class Government implements Serializable
-{
-
-   private static final long serialVersionUID = 1L;
-
-   @Important Car governmentCar;
-   
-   public void destabilize()
-   {
-      
-   }
-   
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Government.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+
+ at SessionScoped
+public class Government implements Serializable
+{
+
+   private static final long serialVersionUID = 1L;
+
+   @Important Car governmentCar;
+   
+   public void destabilize()
+   {
+      
+   }
+   
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * @author Dan Allen
- */
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at Inherited
-public @interface Important {
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Important.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * @author Dan Allen
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+public @interface Important {
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.inject.Inject;
-
-public class IntInjection
-{
-   
-   int value;
-   
-   @Inject public IntInjection(Integer integer)
-   {
-      this.value = integer;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/IntInjection.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.inject.Inject;
+
+public class IntInjection
+{
+   
+   int value;
+   
+   @Inject public IntInjection(Integer integer)
+   {
+      this.value = integer;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-public class JmsTemplate
-{
-   
-   private final int receiveTimeout;
-   
-   public JmsTemplate(int receiveTimeout)
-   {
-      this.receiveTimeout = receiveTimeout;
-   }
-   
-   public int getReceiveTimeout()
-   {
-      return receiveTimeout;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplate.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+public class JmsTemplate
+{
+   
+   private final int receiveTimeout;
+   
+   public JmsTemplate(int receiveTimeout)
+   {
+      this.receiveTimeout = receiveTimeout;
+   }
+   
+   public int getReceiveTimeout()
+   {
+      return receiveTimeout;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
-public class JmsTemplateConfigurationProducer
-{
-   
-   public static final int LONG_RECEIVE_TIMEOUT = 3 * 3600;
-   public static final int SHORT_RECEIVE_TIMEOUT = 100;
-
-   @Produces @Long
-   private int longReceiveTimeout = LONG_RECEIVE_TIMEOUT;
-   
-   @Produces @Short
-   private int shortReceiveTimeout = SHORT_RECEIVE_TIMEOUT;
-
-   @Produces
-   @Named
-   public JmsTemplate getErrorQueueTemplate(@Long int receiveTimeout)
-   {
-      return new JmsTemplate(receiveTimeout);
-   }
-
-   @Produces
-   @Named
-   public JmsTemplate getLogQueueTemplate(@Short int receiveTimeout)
-   {
-      return new JmsTemplate(receiveTimeout);
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/JmsTemplateConfigurationProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class JmsTemplateConfigurationProducer
+{
+   
+   public static final int LONG_RECEIVE_TIMEOUT = 3 * 3600;
+   public static final int SHORT_RECEIVE_TIMEOUT = 100;
+
+   @Produces @Long
+   private int longReceiveTimeout = LONG_RECEIVE_TIMEOUT;
+   
+   @Produces @Short
+   private int shortReceiveTimeout = SHORT_RECEIVE_TIMEOUT;
+
+   @Produces
+   @Named
+   public JmsTemplate getErrorQueueTemplate(@Long int receiveTimeout)
+   {
+      return new JmsTemplate(receiveTimeout);
+   }
+
+   @Produces
+   @Named
+   public JmsTemplate getLogQueueTemplate(@Short int receiveTimeout)
+   {
+      return new JmsTemplate(receiveTimeout);
+   }
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * @author Dan Allen
- */
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at Inherited
-public @interface Long {
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Long.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * @author Dan Allen
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+public @interface Long {
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-
-class ManagerProducer
-{
-   
-   @Inject BeanManager beanManager;
-   
-   private static boolean injectionPointInjected;
-   
-   public static boolean isInjectionPointInjected()
-   {
-      return injectionPointInjected;
-   }
-   
-   public static void setInjectionPointInjected(boolean injectionPointInjected)
-   {
-      ManagerProducer.injectionPointInjected = injectionPointInjected;
-   }
-
-   @Produces
-   Integer create(InjectionPoint point)
-   {
-      injectionPointInjected = point != null;
-      return 10;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+class ManagerProducer
+{
+   
+   @Inject BeanManager beanManager;
+   
+   private static boolean injectionPointInjected;
+   
+   public static boolean isInjectionPointInjected()
+   {
+      return injectionPointInjected;
+   }
+   
+   public static void setInjectionPointInjected(boolean injectionPointInjected)
+   {
+      ManagerProducer.injectionPointInjected = injectionPointInjected;
+   }
+
+   @Produces
+   Integer create(InjectionPoint point)
+   {
+      injectionPointInjected = point != null;
+      return 10;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ManagerProducerTest extends AbstractWeldTest
-{
-   @Test(description="WBRI-183")
-   public void testInjectManagerProducer()
-   {
-      ManagerProducer.setInjectionPointInjected(false);
-      getReference(IntInjection.class);
-      assert ManagerProducer.isInjectionPointInjected();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ManagerProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ManagerProducerTest extends AbstractWeldTest
+{
+   @Test(description="WBRI-183")
+   public void testInjectManagerProducer()
+   {
+      ManagerProducer.setInjectionPointInjected(false);
+      getReference(IntInjection.class);
+      assert ManagerProducer.isInjectionPointInjected();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
-public class NamedProducer
-{
-   @Named("itoen")
-   @Produces
-   public String[] createName()
-   {
-      return new String[] { "oh", "otya" };
-   }
-
-   @Named("iemon")
-   @Produces
-   public String[] createName2()
-   {
-      return new String[] { "fukujyuen", "iemon", "otya" };
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class NamedProducer
+{
+   @Named("itoen")
+   @Produces
+   public String[] createName()
+   {
+      return new String[] { "oh", "otya" };
+   }
+
+   @Named("iemon")
+   @Produces
+   public String[] createName2()
+   {
+      return new String[] { "fukujyuen", "iemon", "otya" };
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class NamedProducerTest extends AbstractWeldTest
-{
-   
-   @Test
-   public void testNamedProducer()
-   {
-      Bean<?> iemonBean = getCurrentManager().resolve(getCurrentManager().getBeans("iemon"));
-      String[] iemon = (String[]) getCurrentManager().getReference(iemonBean, Object.class, getCurrentManager().createCreationalContext(iemonBean));
-      assert iemon.length == 3;
-      Bean<?> itoenBean = getCurrentManager().resolve(getCurrentManager().getBeans("itoen"));
-      String[] itoen = (String[]) getCurrentManager().getReference(itoenBean, Object.class, getCurrentManager().createCreationalContext(itoenBean));
-      assert itoen.length == 2;
-   }
-   
-   @Test
-   public void testDefaultNamedProducerMethod() 
-   {
-      Set<Bean<?>> beans = getCurrentManager().getBeans(JmsTemplate.class);
-      assert beans.size() == 2;
-      List<String> beanNames = new ArrayList<String>(Arrays.asList("errorQueueTemplate", "logQueueTemplate"));
-      for (Bean<?> b : beans)
-      {
-         beanNames.remove(b.getName());
-      }
-      assert beanNames.isEmpty();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class NamedProducerTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testNamedProducer()
+   {
+      Bean<?> iemonBean = getCurrentManager().resolve(getCurrentManager().getBeans("iemon"));
+      String[] iemon = (String[]) getCurrentManager().getReference(iemonBean, Object.class, getCurrentManager().createCreationalContext(iemonBean));
+      assert iemon.length == 3;
+      Bean<?> itoenBean = getCurrentManager().resolve(getCurrentManager().getBeans("itoen"));
+      String[] itoen = (String[]) getCurrentManager().getReference(itoenBean, Object.class, getCurrentManager().createCreationalContext(itoenBean));
+      assert itoen.length == 2;
+   }
+   
+   @Test
+   public void testDefaultNamedProducerMethod() 
+   {
+      Set<Bean<?>> beans = getCurrentManager().getBeans(JmsTemplate.class);
+      assert beans.size() == 2;
+      List<String> beanNames = new ArrayList<String>(Arrays.asList("errorQueueTemplate", "logQueueTemplate"));
+      for (Bean<?> b : beans)
+      {
+         beanNames.remove(b.getName());
+      }
+      assert beanNames.isEmpty();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import java.util.Date;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
-/**
- * @author Dan Allen
- */
-public class NamedProducerWithBinding {
-   public @Produces @Important @Named Date getDate() {
-      return new Date();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBinding.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import java.util.Date;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+/**
+ * @author Dan Allen
+ */
+public class NamedProducerWithBinding {
+   public @Produces @Important @Named Date getDate() {
+      return new Date();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Date;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Dan Allen
- */
- at Artifact(addCurrentPackage = true)
-public class NamedProducerWithBindingTest extends AbstractWeldTest
-{
-   @Test
-   public void testGetNamedProducerWithBinding()
-   {
-      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("date"));
-      Date date = (Date) getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
-      assertNotNull(date);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NamedProducerWithBindingTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import static org.testng.Assert.assertNotNull;
+
+import java.util.Date;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Dan Allen
+ */
+ at Artifact(addCurrentPackage = true)
+public class NamedProducerWithBindingTest extends AbstractWeldTest
+{
+   @Test
+   public void testGetNamedProducerWithBinding()
+   {
+      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("date"));
+      Date date = (Date) getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
+      assertNotNull(date);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class NullProducerTest extends AbstractWeldTest
-{
-   
-   @Test(description="WBRI-276")
-   public void testProducerMethodReturnsNull()
-   {
-      getReference(Government.class).destabilize();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/NullProducerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class NullProducerTest extends AbstractWeldTest
+{
+   
+   @Test(description="WBRI-276")
+   public void testProducerMethodReturnsNull()
+   {
+      getReference(Government.class).destabilize();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat, Inc. and/or its affiliates, 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.tests.producer.method;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * Simple test which invokes a method directly on a normal scoped producer
- * bean to ensure that it's proxy is for that bean and not the product
- * of a producer method.
- * 
- * @author David Allen
- *
- */
- at Artifact
-public class ProducerBeanInvocationTest extends AbstractWeldTest
-{
-   @Test
-   // WELD-546
-   public void test()
-   {
-      Qux bar = getReference(Qux.class);
-      assert bar.getBar().equals("qux");
-      QuxProducer producer = getReference(QuxProducer.class);
-      assert producer.ping();
-      Qux bazBar = getReference(Qux.class, new AnnotationLiteral<Baz>(){});
-      assert bazBar.getBar().equals("baz");
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/ProducerBeanInvocationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, 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.tests.producer.method;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Simple test which invokes a method directly on a normal scoped producer
+ * bean to ensure that it's proxy is for that bean and not the product
+ * of a producer method.
+ * 
+ * @author David Allen
+ *
+ */
+ at Artifact
+public class ProducerBeanInvocationTest extends AbstractWeldTest
+{
+   @Test
+   // WELD-546
+   public void test()
+   {
+      Qux bar = getReference(Qux.class);
+      assert bar.getBar().equals("qux");
+      QuxProducer producer = getReference(QuxProducer.class);
+      assert producer.ping();
+      Qux bazBar = getReference(Qux.class, new AnnotationLiteral<Baz>(){});
+      assert bazBar.getBar().equals("baz");
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-package org.jboss.weld.tests.producer.method;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-public class Qux
-{
-   
-   private final String name;
-   
-   public Qux(String name)
-   {
-      this.name = name;
-   }
-   
-   public Qux()
-   {
-      this("qux");
-   }
-   
-   public String getBar()
-   {
-      return name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Qux.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+package org.jboss.weld.tests.producer.method;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+public class Qux
+{
+   
+   private final String name;
+   
+   public Qux(String name)
+   {
+      this.name = name;
+   }
+   
+   public Qux()
+   {
+      this("qux");
+   }
+   
+   public String getBar()
+   {
+      return name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,21 +0,0 @@
-package org.jboss.weld.tests.producer.method;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-
- at RequestScoped
-public class QuxProducer
-{
-   
-   @Produces @Baz @RequestScoped
-   public Qux getQux()
-   {
-      return new Qux("baz");
-   }
-   
-   public boolean ping() 
-   {
-      return true;
-   };
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/QuxProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,21 @@
+package org.jboss.weld.tests.producer.method;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+ at RequestScoped
+public class QuxProducer
+{
+   
+   @Produces @Baz @RequestScoped
+   public Qux getQux()
+   {
+      return new Qux("baz");
+   }
+   
+   public boolean ping() 
+   {
+      return true;
+   };
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * @author Dan Allen
- */
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at Inherited
-public @interface Short {
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/Short.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * @author Dan Allen
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+public @interface Short {
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-
-class Bar {
-
-    @Inject void injectFoo(Foo foo) {}
-    @Produces Foo produceFoo() { return new Foo() {}; }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+class Bar {
+
+    @Inject void injectFoo(Foo foo) {}
+    @Produces Foo produceFoo() { return new Foo() {}; }
+
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class CircularInjectionTest extends AbstractWeldTest
-{
-
-   @Test(description="WELD-310")
-   public void testProducerCalledOnBeanUnderConstruction()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/CircularInjectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class CircularInjectionTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-310")
+   public void testProducerCalledOnBeanUnderConstruction()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
-
-public abstract class Foo
-{
-
-   
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/circular/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.circular;
+
+public abstract class Foo
+{
+
+   
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-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.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RUNTIME)
- at Target( { PARAMETER, METHOD, FIELD, TYPE })
-public @interface Parameterized
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RUNTIME)
+ at Target( { PARAMETER, METHOD, FIELD, TYPE })
+public @interface Parameterized
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-public class Parameterized1<T>
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+public class Parameterized1<T>
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-public class Parameterized2<T>
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/Parameterized2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+public class Parameterized2<T>
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-import javax.enterprise.inject.Produces;
-
-public class ParameterizedProducer
-{
-
-   @Produces
-   @Parameterized
-   public Parameterized1<Parameterized2<Double>> getParameterized()
-   {
-      return new Parameterized1();
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+import javax.enterprise.inject.Produces;
+
+public class ParameterizedProducer
+{
+
+   @Produces
+   @Parameterized
+   public Parameterized1<Parameterized2<Double>> getParameterized()
+   {
+      return new Parameterized1();
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ParameterizedTest extends AbstractWeldTest
-{
-
-   @Test(description = "WELD-452")
-   public void testEventQualifiersCorrect()
-   {
-      TestBean testBean = getReference(TestBean.class);
-      assert testBean != null;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/ParameterizedTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ParameterizedTest extends AbstractWeldTest
+{
+
+   @Test(description = "WELD-452")
+   public void testEventQualifiersCorrect()
+   {
+      TestBean testBean = getReference(TestBean.class);
+      assert testBean != null;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
- at ApplicationScoped
-public class TestBean
-{
-   @Inject
-   @Parameterized
-   Parameterized1<Parameterized2<Double>> parameterized;
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/method/parameterized/TestBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.producer.method.parameterized;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+public class TestBean
+{
+   @Inject
+   @Parameterized
+   Parameterized1<Parameterized2<Double>> parameterized;
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
- at Named
- at RequestScoped
-class Foo implements Serializable
-{
-   
-   public String getMsg()
-   {
-      return "Hi";
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+ at Named
+ at RequestScoped
+class Foo implements Serializable
+{
+   
+   public String getMsg()
+   {
+      return "Hi";
+   }
+   
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ProxyTest extends AbstractWeldTest
-{
-   
-   @Test(description="WBRI-122")
-   public void testImplementationClassImplementsSerializable()
-   {
-      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo"));
-      assert getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean)) != null;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ProxyTest extends AbstractWeldTest
+{
+   
+   @Test(description="WBRI-122")
+   public void testImplementationClassImplementsSerializable()
+   {
+      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo"));
+      assert getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean)) != null;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy.enterprise;
-
-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.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class EnterpriseBeanProxyTest extends AbstractWeldTest
-{
-   
-   /*
-    * <a href="https://jira.jboss.org/jira/browse/WBRI-109">WBRI-109</a>
-    */
-   // Broken due to WELDINT-45
-   @Test(description="WBRI-109", groups = "broken")
-   public void testNoInterfaceView() throws Exception
-   {
-      Object mouse = getReference(Mouse.class);
-      assert Utils.isProxy(mouse);
-      assert mouse instanceof Mouse;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy.enterprise;
+
+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.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class EnterpriseBeanProxyTest extends AbstractWeldTest
+{
+   
+   /*
+    * <a href="https://jira.jboss.org/jira/browse/WBRI-109">WBRI-109</a>
+    */
+   // Broken due to WELDINT-45
+   @Test(description="WBRI-109", groups = "broken")
+   public void testNoInterfaceView() throws Exception
+   {
+      Object mouse = getReference(Mouse.class);
+      assert Utils.isProxy(mouse);
+      assert mouse instanceof Mouse;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy.enterprise;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class Mouse
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy.enterprise;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class Mouse
+{
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-package org.jboss.weld.tests.proxy.observer;
-
-public class Baz
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+package org.jboss.weld.tests.proxy.observer;
+
+public class Baz
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,20 +0,0 @@
-package org.jboss.weld.tests.proxy.observer;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ObserverInjectionTest extends AbstractWeldTest
-{
-
-   @Test(description="WELD-535")
-   public void testInjectionHappens()
-   {
-      SampleObserver sampleObserver = getReference(SampleObserver.class);
-      assert !sampleObserver.isInjectionAndObservationOccured();
-      getCurrentManager().fireEvent(new Baz());
-      assert sampleObserver.isInjectionAndObservationOccured();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/ObserverInjectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,20 @@
+package org.jboss.weld.tests.proxy.observer;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ObserverInjectionTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-535")
+   public void testInjectionHappens()
+   {
+      SampleObserver sampleObserver = getReference(SampleObserver.class);
+      assert !sampleObserver.isInjectionAndObservationOccured();
+      getCurrentManager().fireEvent(new Baz());
+      assert sampleObserver.isInjectionAndObservationOccured();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,13 +0,0 @@
-package org.jboss.weld.tests.proxy.observer;
-
-import java.io.Serializable;
-
-public class Qux implements Serializable
-{
-
-   /**
-    * 
-    */
-   private static final long serialVersionUID = -947946956903414048L;
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/Qux.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,13 @@
+package org.jboss.weld.tests.proxy.observer;
+
+import java.io.Serializable;
+
+public class Qux implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = -947946956903414048L;
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-package org.jboss.weld.tests.proxy.observer;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-
-
- at SessionScoped
-public class SampleObserver implements Serializable
-{
-
-   private static final long serialVersionUID = -8311790045944819159L;
-
-   @Inject
-   private Qux qux;
-   
-   private boolean injectionAndObservationOccured;
-
-   @SuppressWarnings("unused")
-   private void observes(@Observes Baz baz)
-   {
-      injectionAndObservationOccured = qux != null;
-   }
-   
-   public boolean isInjectionAndObservationOccured()
-   {
-      return injectionAndObservationOccured;
-   }
-   
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/observer/SampleObserver.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+package org.jboss.weld.tests.proxy.observer;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+
+
+ at SessionScoped
+public class SampleObserver implements Serializable
+{
+
+   private static final long serialVersionUID = -8311790045944819159L;
+
+   @Inject
+   private Qux qux;
+   
+   private boolean injectionAndObservationOccured;
+
+   @SuppressWarnings("unused")
+   private void observes(@Observes Baz baz)
+   {
+      injectionAndObservationOccured = qux != null;
+   }
+   
+   public boolean isInjectionAndObservationOccured()
+   {
+      return injectionAndObservationOccured;
+   }
+   
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477 (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
-
-import javax.inject.Inject;
-
-/**
- * @author Marius Bogoevici
- */
-public class InjectedClass
-{
-   @Inject ScopedClass dependency;
-
-   public ScopedClass getDependency()
-   {
-      return dependency;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/InjectedClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
+
+import javax.inject.Inject;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class InjectedClass
+{
+   @Inject ScopedClass dependency;
+
+   public ScopedClass getDependency()
+   {
+      return dependency;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
-public class ProxiabilityTest extends AbstractWeldTest
-{
-
-   @Test(description = "https://jira.jboss.org/jira/browse/WELD-477")
-   public void testClassWithPrivateFinalMethodsProxyable()
-   {
-       InjectedClass injectedClassInstance = getReference(InjectedClass.class);
-       Assert.assertNotNull(injectedClassInstance.getDependency());
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+public class ProxiabilityTest extends AbstractWeldTest
+{
+
+   @Test(description = "https://jira.jboss.org/jira/browse/WELD-477")
+   public void testClassWithPrivateFinalMethodsProxyable()
+   {
+       InjectedClass injectedClassInstance = getReference(InjectedClass.class);
+       Assert.assertNotNull(injectedClassInstance.getDependency());
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
-
-import javax.enterprise.context.ApplicationScoped;
-
-/**
- * @author Marius Bogoevici
- */
- at ApplicationScoped
-public class ScopedClass
-{
-   private final void privateMethod()
-   {
-
-   }
-                                           
-   public void publicMethod()
-   {
-
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ScopedClass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.proxy.weld477;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at ApplicationScoped
+public class ScopedClass
+{
+   private final void privateMethod()
+   {
+
+   }
+                                           
+   public void publicMethod()
+   {
+
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56 (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-public class Bar
-{
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+public class Bar
+{
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
-
- at RequestScoped
-public class Foo
-{
-
-   @Inject
-   public Foo(Bar bar)
-   {
-   }
-
-   public String ping()
-   {
-      return "ping";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+
+ at RequestScoped
+public class Foo
+{
+
+   @Inject
+   public Foo(Bar bar)
+   {
+   }
+
+   public String ping()
+   {
+      return "ping";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
-
-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.testharness.impl.packaging.Resource;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.WAR)
- at Resource(source = "org.jboss.weld.enableUnsafeProxies", destination = "WEB-INF/classes/META-INF/org.jboss.weld.enableUnsafeProxies")
-public class ProxyTest extends AbstractWeldTest
-{
-
-   @Test
-   public void testProxy()
-   {
-      assert "ping".equals(getReference(Foo.class).ping());
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.proxy.weld56;
+
+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.testharness.impl.packaging.Resource;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.WAR)
+ at Resource(source = "org.jboss.weld.enableUnsafeProxies", destination = "WEB-INF/classes/META-INF/org.jboss.weld.enableUnsafeProxies")
+public class ProxyTest extends AbstractWeldTest
+{
+
+   @Test
+   public void testProxy()
+   {
+      assert "ping".equals(getReference(Foo.class).ping());
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-public class Bar
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+public class Bar
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-public class Baz
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+public class Baz
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-public class Foo extends FooBase<Bar>
-{
-
-   public String getName()
-   {
-      return "foo";
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+public class Foo extends FooBase<Bar>
+{
+
+   public String getName()
+   {
+      return "foo";
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-public class FooBase<T>
-{
-   
-   public String getName()
-   {
-      return "foobase";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooBase.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+public class FooBase<T>
+{
+   
+   public String getName()
+   {
+      return "foobase";
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-import javax.enterprise.inject.Produces;
-
-public class FooProducer
-{
-   
-   @Produces @Special
-   public FooBase<Baz> produce()
-   {
-      return new FooBase<Baz>();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/FooProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+import javax.enterprise.inject.Produces;
+
+public class FooProducer
+{
+   
+   @Produces @Special
+   public FooBase<Baz> produce()
+   {
+      return new FooBase<Baz>();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-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: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupFoo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+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;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-import java.util.List;
-
-import javax.enterprise.inject.Instance;
-import javax.enterprise.util.TypeLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class LookupInstanceTest extends AbstractWeldTest
-{
-  
-   
-   @Test
-   public void testLookupInstance() throws Exception
-   {
-      assert getReference(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), DefaultLiteral.INSTANCE) == null; 
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+import java.util.List;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class LookupInstanceTest extends AbstractWeldTest
+{
+  
+   
+   @Test
+   public void testLookupInstance() throws Exception
+   {
+      assert getReference(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), DefaultLiteral.INSTANCE) == null; 
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-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;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface Special
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class Weld256Test extends AbstractWeldTest
-{
-
-   @Test
-   public void testParameterizedInjection()
-   {
-      LookupFoo lookupFoo = getReference(LookupFoo.class);
-      assert lookupFoo.getFoo().getName().equals("foo");
-      assert lookupFoo.getFoobaz().getName().equals("foobase");
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/Weld256Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class Weld256Test extends AbstractWeldTest
+{
+
+   @Test
+   public void testParameterizedInjection()
+   {
+      LookupFoo lookupFoo = getReference(LookupFoo.class);
+      assert lookupFoo.getFoo().getName().equals("foo");
+      assert lookupFoo.getFoobaz().getName().equals("foobase");
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
- at ApplicationScoped
-class Bar
-{
-   
-   public static boolean success;
-   
-   @Inject Foo foo;
-   
-   public Bar()
-   {
-      success = false;
-   }
-   
-   @PostConstruct
-   public void postConstruct()
-   {
-      if (foo.getName().equals("foo"))
-      {
-         success = true;
-      }
-   }
-   
-   public String getName()
-   {
-      return "bar";
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+class Bar
+{
+   
+   public static boolean success;
+   
+   @Inject Foo foo;
+   
+   public Bar()
+   {
+      success = false;
+   }
+   
+   @PostConstruct
+   public void postConstruct()
+   {
+      if (foo.getName().equals("foo"))
+      {
+         success = true;
+      }
+   }
+   
+   public String getName()
+   {
+      return "bar";
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class CircularDependencyTest extends AbstractWeldTest
-{
-  
-   @Test
-   public void testCircularInjectionOnTwoSimpleDependentBeans() throws Exception
-   {
-      getReference(Foo.class).getName();
-      assert Foo.success;
-      assert Bar.success;
-   }
-   
-   @Test
-   public void testDependentProducerMethodDeclaredOnDependentBeanWhichInjectsProducedBean() throws Exception
-   {
-      getReference(DependentSelfConsumingDependentProducer.class).ping();
-   }
-   
-   @Test
-   public void testDependentSelfConsumingProducer() throws Exception
-   {
-      getReference(Violation.class).ping();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class CircularDependencyTest extends AbstractWeldTest
+{
+  
+   @Test
+   public void testCircularInjectionOnTwoSimpleDependentBeans() throws Exception
+   {
+      getReference(Foo.class).getName();
+      assert Foo.success;
+      assert Bar.success;
+   }
+   
+   @Test
+   public void testDependentProducerMethodDeclaredOnDependentBeanWhichInjectsProducedBean() throws Exception
+   {
+      getReference(DependentSelfConsumingDependentProducer.class).ping();
+   }
+   
+   @Test
+   public void testDependentSelfConsumingProducer() throws Exception
+   {
+      getReference(Violation.class).ping();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface DependentLooping
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLooping.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface DependentLooping
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.enterprise.inject.Produces;
-
-class DependentLoopingProducer
-{
-   
-   @Produces @DependentLooping
-   public Violation produceViolation(@DependentLooping Violation violation) {
-      return new Violation();
-   }
-
-} 
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentLoopingProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.enterprise.inject.Produces;
+
+class DependentLoopingProducer
+{
+   
+   @Produces @DependentLooping
+   public Violation produceViolation(@DependentLooping Violation violation) {
+      return new Violation();
+   }
+
+} 
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.enterprise.inject.Produces;
-
-class DependentSelfConsumingDependentProducer
-{
-   @SelfConsumingDependent Violation violation;
-   
-   @Produces @SelfConsumingDependent
-   public Violation produceViolation() {
-      return new Violation();
-   }
-   
-   public void ping() {
-      
-   }
-} 
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/DependentSelfConsumingDependentProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.enterprise.inject.Produces;
+
+class DependentSelfConsumingDependentProducer
+{
+   @SelfConsumingDependent Violation violation;
+   
+   @Produces @SelfConsumingDependent
+   public Violation produceViolation() {
+      return new Violation();
+   }
+   
+   public void ping() {
+      
+   }
+} 
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.inject.Inject;
-
-class Farm
-{
-   
-   @Inject
-   public Farm(Farm farm)
-   {
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Farm.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.inject.Inject;
+
+class Farm
+{
+   
+   @Inject
+   public Farm(Farm farm)
+   {
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.inject.Inject;
-
-class Fish
-{
-   
-   private Water water;
-   
-   @Inject
-   public Fish(Water water)
-   {
-      this.water = water;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Fish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.inject.Inject;
+
+class Fish
+{
+   
+   private Water water;
+   
+   @Inject
+   public Fish(Water water)
+   {
+      this.water = water;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-class Foo
-{
-   
-   public static boolean success;
-   
-   @Inject Bar bar;
-   
-   public Foo()
-   {
-      success = false;
-   }
-   
-   @PostConstruct
-   public void postConstruct()
-   {
-      if (bar.getName().equals("bar"))
-      {
-         success = true;
-      }
-   }
-   
-   public String getName()
-   {
-      return "foo";
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+class Foo
+{
+   
+   public static boolean success;
+   
+   @Inject Bar bar;
+   
+   public Foo()
+   {
+      success = false;
+   }
+   
+   @PostConstruct
+   public void postConstruct()
+   {
+      if (bar.getName().equals("bar"))
+      {
+         success = true;
+      }
+   }
+   
+   public String getName()
+   {
+      return "foo";
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface NormalLooping
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLooping.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface NormalLooping
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
- at ApplicationScoped
-class NormalLoopingProducer
-{
-   
-   @Produces @ApplicationScoped @NormalLooping
-   public Violation produceViolation(@NormalLooping Violation violation) {
-      return new Violation();
-   }
-
-} 
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/NormalLoopingProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+
+ at ApplicationScoped
+class NormalLoopingProducer
+{
+   
+   @Produces @ApplicationScoped @NormalLooping
+   public Violation produceViolation(@NormalLooping Violation violation) {
+      return new Violation();
+   }
+
+} 
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface SelfConsumingDependent
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/SelfConsumingDependent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface SelfConsumingDependent
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import java.io.Serializable;
-
-class Violation implements Serializable
-{
-   
-   public void ping()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Violation.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import java.io.Serializable;
+
+class Violation implements Serializable
+{
+   
+   public void ping()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
-
-import javax.inject.Inject;
-
-class Water
-{
-   @Inject
-   public Water(Fish fish)
-   {
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/Water.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular;
+
+import javax.inject.Inject;
+
+class Water
+{
+   @Inject
+   public Water(Fish fish)
+   {
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public class Baz
-{
-
-   @Produces @FooDB @PersistenceContext private EntityManager db;
-   @Inject @FooDB EntityManager fooDb; 
-   
-   public EntityManager getFooDb()
-   {
-      return fooDb;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/Baz.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public class Baz
+{
+
+   @Produces @FooDB @PersistenceContext private EntityManager db;
+   @Inject @FooDB EntityManager fooDb; 
+   
+   public EntityManager getFooDb()
+   {
+      return fooDb;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
-
-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;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface FooDB
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/FooDB.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface FooDB
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at Resources({
-   @Resource(source="persistence.xml", destination="WEB-INF/classes/META-INF/persistence.xml")
-})
-public class ResourceCircularDependencyTest extends AbstractWeldTest
-{
-   
-   @Test
-   public void testResourceProducerField() throws Exception
-   {
-      assert getReference(Baz.class).getFooDb().isOpen();
-      assert true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/circular/resource/ResourceCircularDependencyTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.circular.resource;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Resources({
+   @Resource(source="persistence.xml", destination="WEB-INF/classes/META-INF/persistence.xml")
+})
+public class ResourceCircularDependencyTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testResourceProducerField() throws Exception
+   {
+      assert getReference(Baz.class).getFooDb().isOpen();
+      assert true;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
-
-import javax.inject.Named;
-
- at Named("foo")
-public class FooBean
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/FooBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
+
+import javax.inject.Named;
+
+ at Named("foo")
+public class FooBean
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
-
-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.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * @author Dan Allen
- */
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at Inherited
-public @interface Important {
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/Important.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
+
+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.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * @author Dan Allen
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+public @interface Important {
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-
-public class NamedBeanConsumer
-{
-   
-   @Inject @Named FooBean foo;
-   
-   public FooBean getFoo()
-   {
-      return foo;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+
+public class NamedBeanConsumer
+{
+   
+   @Inject @Named FooBean foo;
+   
+   public FooBean getFoo()
+   {
+      return foo;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Dan Allen
- */
- at Artifact(addCurrentPackage = true)
-public class NamedBeanTest extends AbstractWeldTest
-{
-   @Test
-   public void testGetNamedBeanWithBinding()
-   {
-      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("namedBeanWithBinding"));
-      NamedBeanWithBinding instance = (NamedBeanWithBinding) getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
-      assert instance != null;
-   }
-   
-   @Test(description = "WELD-435")
-   public void testNamedInjectedFieldUsesFieldName()
-   {
-      assert getReference(NamedBeanConsumer.class).getFoo() != null;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Dan Allen
+ */
+ at Artifact(addCurrentPackage = true)
+public class NamedBeanTest extends AbstractWeldTest
+{
+   @Test
+   public void testGetNamedBeanWithBinding()
+   {
+      Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("namedBeanWithBinding"));
+      NamedBeanWithBinding instance = (NamedBeanWithBinding) getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
+      assert instance != null;
+   }
+   
+   @Test(description = "WELD-435")
+   public void testNamedInjectedFieldUsesFieldName()
+   {
+      assert getReference(NamedBeanConsumer.class).getFoo() != null;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-/**
- * @author Dan Allen
- */
-public
- at Named
- at Important
- at RequestScoped
-class NamedBeanWithBinding {
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/named/NamedBeanWithBinding.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.named;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+/**
+ * @author Dan Allen
+ */
+public
+ at Named
+ at Important
+ at RequestScoped
+class NamedBeanWithBinding {
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279 (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
-public abstract class AbstractFactory<T>
-{
-
-   public abstract T createObject();
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/AbstractFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+public abstract class AbstractFactory<T>
+{
+
+   public abstract T createObject();
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
-public class DummyParent
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/DummyParent.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+public class DummyParent
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
-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;
-
- at Retention(RetentionPolicy.RUNTIME)
- at Target( { TYPE, FIELD, METHOD, PARAMETER })
- at Qualifier
-public @interface IntFactory
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+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;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target( { TYPE, FIELD, METHOD, PARAMETER })
+ at Qualifier
+public @interface IntFactory
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
- at IntFactory
-public class IntegerFactory extends AbstractFactory<Integer>
-{
-
-   public static final Integer VALUE = 123;
-   
-   public Integer createObject()
-   {
-      return VALUE;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/IntegerFactory.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+ at IntFactory
+public class IntegerFactory extends AbstractFactory<Integer>
+{
+
+   public static final Integer VALUE = 123;
+   
+   public Integer createObject()
+   {
+      return VALUE;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
-import javax.inject.Inject;
-
-public class SomeBean
-{
-
-   @Inject @IntFactory
-   IntegerFactory integerFactory;
-
-   public String getObjectAsString()
-   {
-      return integerFactory.createObject().toString();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/SomeBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+import javax.inject.Inject;
+
+public class SomeBean
+{
+
+   @Inject @IntFactory
+   IntegerFactory integerFactory;
+
+   public String getObjectAsString()
+   {
+      return integerFactory.createObject().toString();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author pmuir
- *
- */
- at Artifact
-public class Weld279Test extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-279")
-   public void testLookupOfGenericTypeSubclass()
-   {
-      assert getReference(SomeBean.class).getObjectAsString().equals(IntegerFactory.VALUE.toString());
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri279/Weld279Test.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri279;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Artifact
+public class Weld279Test extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-279")
+   public void testLookupOfGenericTypeSubclass()
+   {
+      assert getReference(SomeBean.class).getObjectAsString().equals(IntegerFactory.VALUE.toString());
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293 (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri293;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * 
- * @author Jozef Hartinger
- *
- */
- at Artifact
-public class ContextualReferenceTest extends AbstractWeldTest
-{
-   @Test(groups = "broken")
-   public void testReferencesEqual() {
-      Sheep sheep = getReference(Sheep.class);
-      sheep.setAge(10);
-      Sheep sheep2 = getReference(Sheep.class);
-      assert sheep.getAge() == sheep2.getAge();
-      assert sheep.equals(sheep2);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/ContextualReferenceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri293;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author Jozef Hartinger
+ *
+ */
+ at Artifact
+public class ContextualReferenceTest extends AbstractWeldTest
+{
+   @Test(groups = "broken")
+   public void testReferencesEqual() {
+      Sheep sheep = getReference(Sheep.class);
+      sheep.setAge(10);
+      Sheep sheep2 = getReference(Sheep.class);
+      assert sheep.getAge() == sheep2.getAge();
+      assert sheep.equals(sheep2);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri293;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Sheep
-{
-   private int age = 0;
-
-   public int getAge()
-   {
-      return age;
-   }
-
-   public void setAge(int age)
-   {
-      this.age = age;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/wbri293/Sheep.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resolution.wbri293;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Sheep
+{
+   private int age = 0;
+
+   public int getAge()
+   {
+      return age;
+   }
+
+   public void setAge(int age)
+   {
+      this.age = age;
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resources (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resources)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resources;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
-public class ResourceTest extends AbstractWeldTest
-{
-   
-   @Test(description="WELD-385")
-   public void testUTInjectedByResource()
-   {
-      assert getReference(UTConsumer.class).getUserTransaction() != null;
-   }
-   
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resources;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+public class ResourceTest extends AbstractWeldTest
+{
+   
+   @Test(description="WELD-385")
+   public void testUTInjectedByResource()
+   {
+      assert getReference(UTConsumer.class).getUserTransaction() != null;
+   }
+   
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.resources;
-
-import javax.annotation.Resource;
-import javax.transaction.UserTransaction;
-
-public class UTConsumer
-{
-
-   @Resource
-   UserTransaction userTransaction;
-   
-   public UserTransaction getUserTransaction()
-   {
-      return userTransaction;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resources/UTConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.resources;
+
+import javax.annotation.Resource;
+import javax.transaction.UserTransaction;
+
+public class UTConsumer
+{
+
+   @Resource
+   UserTransaction userTransaction;
+   
+   public UserTransaction getUserTransaction()
+   {
+      return userTransaction;
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+import javax.enterprise.context.Dependent;
+
+ at Dependent
+class Bar extends Foo
+{
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Foo
+{
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.beanstore.HashMapBeanStore;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ScopeTest extends AbstractWeldTest
+{
+   
+   private static Annotation USELESS_LITERAL = new AnnotationLiteral<Useless>() {};
+   private static Annotation SPECIAL_LITERAL = new AnnotationLiteral<Special>() {};
+   
+   @Test(description="WELD-322")
+   public void testScopeDeclaredOnSubclassOverridesScopeOnSuperClass()
+   {
+      assert getCurrentManager().resolve(getCurrentManager().getBeans(Bar.class)).getScope().equals(Dependent.class);
+   }
+   @Test(description="WELD-311")
+   public void testScopeOfProducerMethod()
+   {
+      Bean<Temp> specialTempBean = getBean(Temp.class, SPECIAL_LITERAL);
+      Bean<Temp> uselessTempBean = getBean(Temp.class, USELESS_LITERAL);
+      assert specialTempBean.getScope().equals(RequestScoped.class);
+      assert uselessTempBean.getScope().equals(RequestScoped.class);
+      assert getReference(specialTempBean).getNumber() == 10;
+      assert getReference(uselessTempBean).getNumber() == 11;
+      
+      TempConsumer tempConsumer = getReference(TempConsumer.class);
+      tempConsumer.getSpecialTemp().setNumber(101);
+      tempConsumer.getUselessTemp().setNumber(102);
+      
+      assert tempConsumer.getSpecialTemp().getNumber() == 101;
+      assert tempConsumer.getUselessTemp().getNumber() == 102;
+      assert getReference(specialTempBean).getNumber() == 101;
+      assert getReference(uselessTempBean).getNumber() == 102;
+      
+      newRequest();
+      
+      assert tempConsumer.getSpecialTemp().getNumber() == 10;
+      assert tempConsumer.getUselessTemp().getNumber() == 11;
+      assert getReference(specialTempBean).getNumber() == 10;
+      assert getReference(uselessTempBean).getNumber() == 11;
+   }
+   
+   private void newRequest()
+   {
+      ContextLifecycle lifecycle = Container.instance().services().get(ContextLifecycle.class);
+      lifecycle.endRequest("test", lifecycle.getRequestContext().getBeanStore());
+      lifecycle.restoreSession("test", new HashMapBeanStore());
+      lifecycle.beginRequest("test", new HashMapBeanStore());
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Special.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Special.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Special.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Temp.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Temp.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Temp.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Temp.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+public class Temp
+{
+   
+   private int number;
+   
+   public Temp(int number)
+   {
+      this.number = number;
+   }
+   
+   public Temp()
+   {
+      number = 0;
+   }
+   
+   public int getNumber()
+   {
+      return number;
+   }
+   
+   public void setNumber(int number)
+   {
+      this.number = number;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+ at ApplicationScoped
+public class TempConsumer
+{
+
+   @Inject @Special Temp specialTemp;
+   @Inject @Useless Temp uselessTemp;
+   
+   public Temp getSpecialTemp()
+   {
+      return specialTemp;
+   }
+   
+   public Temp getUselessTemp()
+   {
+      return uselessTemp;
+   }
+   
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/TempProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+ at Named
+ at SessionScoped
+public class TempProducer implements Serializable
+{
+
+   @Produces
+   @RequestScoped
+   @Special
+   public Temp getTemp()
+   {
+      return new Temp(10);
+   }
+
+   @Produces
+   @RequestScoped
+   @Useless
+   Temp t = new Temp(11);
+
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Useless.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Useless.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Useless.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/Useless.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.scope;
+
+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;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Useless
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
-
-import java.io.Serializable;
-import java.util.logging.Logger;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class LoggerConsumer implements Serializable
-{
-   
-   @Inject Logger log;
-   
-   public void ping()
-   {
-      
-   }
-   
-   public Logger getLog()
-   {
-      return log;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
+
+import java.io.Serializable;
+import java.util.logging.Logger;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class LoggerConsumer implements Serializable
+{
+   
+   @Inject Logger log;
+   
+   public void ping()
+   {
+      
+   }
+   
+   public Logger getLog()
+   {
+      return log;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
-
-import java.util.logging.Logger;
-
-import javax.enterprise.inject.Produces;
-
-public class LoggerProducer
-{
-
-   @Produces
-   public Logger produceLogger()
-   {
-      return Logger.getLogger("foo");
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
+
+import java.util.logging.Logger;
+
+import javax.enterprise.inject.Produces;
+
+public class LoggerProducer
+{
+
+   @Produces
+   public Logger produceLogger()
+   {
+      return Logger.getLogger("foo");
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
-
-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.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at Inherited
-public @interface Mock {
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/Mock.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
+
+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.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+public @interface Mock {
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
-
-import java.io.Serializable;
-
-import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
- at Artifact
-public class SerializationTest extends AbstractWeldTest
-{
-
-   @Test(description="WELD-363")
-   public void testConversationManagerSerializable()
-      throws Exception
-   {
-      TestConversationManager cMgr = getReference(TestConversationManager.class, new AnnotationLiteral<Mock>()
-      {
-      });
-      
-      assert cMgr.getConversationInstance() != null;
-      
-      Object deserialized = Utils.deserialize(Utils.serialize(cMgr));
-      
-      assert deserialized instanceof TestConversationManager;
-      TestConversationManager deserializedCMgr = (TestConversationManager) deserialized;
-      assert deserializedCMgr.getConversationInstance() != null;
-   }
-   
-   @Test(description="http://lists.jboss.org/pipermail/weld-dev/2010-February/002265.html")
-   public void testNonSerializableProductInjectedIntoSessionScopedBean()
-   {
-      try
-      {
-         getReference(LoggerConsumer.class).ping();
-      }
-      catch (Exception e) 
-      {
-         // If Logger isn't serializable, we get here 
-         assert e instanceof IllegalProductException;
-         return;
-      }
-      // If Logger is serializable we get here
-      assert getReference(LoggerConsumer.class).getLog() instanceof Serializable;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
+
+import java.io.Serializable;
+
+import javax.enterprise.inject.IllegalProductException;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class SerializationTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-363")
+   public void testConversationManagerSerializable()
+      throws Exception
+   {
+      TestConversationManager cMgr = getReference(TestConversationManager.class, new AnnotationLiteral<Mock>()
+      {
+      });
+      
+      assert cMgr.getConversationInstance() != null;
+      
+      Object deserialized = Utils.deserialize(Utils.serialize(cMgr));
+      
+      assert deserialized instanceof TestConversationManager;
+      TestConversationManager deserializedCMgr = (TestConversationManager) deserialized;
+      assert deserializedCMgr.getConversationInstance() != null;
+   }
+   
+   @Test(description="http://lists.jboss.org/pipermail/weld-dev/2010-February/002265.html")
+   public void testNonSerializableProductInjectedIntoSessionScopedBean()
+   {
+      try
+      {
+         getReference(LoggerConsumer.class).ping();
+      }
+      catch (Exception e) 
+      {
+         // If Logger isn't serializable, we get here 
+         assert e instanceof IllegalProductException;
+         return;
+      }
+      // If Logger is serializable we get here
+      assert getReference(LoggerConsumer.class).getLog() instanceof Serializable;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
-
-import java.lang.reflect.Field;
-
-import org.jboss.weld.conversation.AbstractConversationManager;
-import org.jboss.weld.conversation.ConversationImpl;
-import org.jboss.weld.conversation.ServletConversationManager;
-
- at Mock
-public class TestConversationManager extends ServletConversationManager
-{
-   private static final long serialVersionUID = 2;
-   
-   public ConversationImpl getConversationInstance() throws Exception
-   {
-      Field ccField = AbstractConversationManager.class.getDeclaredField("conversation");
-      ccField.setAccessible(true);
-      return (ConversationImpl) ccField.get(this);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/TestConversationManager.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.serialization;
+
+import java.lang.reflect.Field;
+
+import org.jboss.weld.conversation.AbstractConversationManager;
+import org.jboss.weld.conversation.ConversationImpl;
+import org.jboss.weld.conversation.ServletConversationManager;
+
+ at Mock
+public class TestConversationManager extends ServletConversationManager
+{
+   private static final long serialVersionUID = 2;
+   
+   public ConversationImpl getConversationInstance() throws Exception
+   {
+      Field ccField = AbstractConversationManager.class.getDeclaredField("conversation");
+      ccField.setAccessible(true);
+      return (ConversationImpl) ccField.get(this);
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/session (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/session)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
-
-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.WeldAnnotated;
-import org.jboss.weld.literal.NewLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class NewEnterpriseBeanTest extends AbstractWeldTest
-{
-   
-   private static final New NEW_LITERAL = new NewLiteral()
-   {
-      
-      @Override
-      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 WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getWeldInjectionPoints();
-      Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getWeldInjectionPoints();
-      assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
+
+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.WeldAnnotated;
+import org.jboss.weld.literal.NewLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class NewEnterpriseBeanTest extends AbstractWeldTest
+{
+   
+   private static final New NEW_LITERAL = new NewLiteral()
+   {
+      
+      @Override
+      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 WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getWeldInjectionPoints();
+      Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getWeldInjectionPoints();
+      assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.SessionScoped;
-
- at SessionScoped
- at Stateful
-class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
-{
-   @Remove
-   public void bye() {
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+
+ at SessionScoped
+ at Stateful
+class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
+{
+   @Remove
+   public void bye() {
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
-
-import javax.ejb.Local;
-
- at Local
-public interface WrappedEnterpriseBeanLocal
-{
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/session/newBean/WrappedEnterpriseBeanLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.session.newBean;
+
+import javax.ejb.Local;
+
+ at Local
+public interface WrappedEnterpriseBeanLocal
+{
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class SpecializationTest extends AbstractWeldTest
-{
-   
-   @Test(groups="WELD-321")
-   public void testSpecialization()
-   {
-      assert getCurrentManager().resolve(getCurrentManager().getBeans(User.class)).getBeanClass().equals(User2.class);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class SpecializationTest extends AbstractWeldTest
+{
+   
+   @Test(groups="WELD-321")
+   public void testSpecialization()
+   {
+      assert getCurrentManager().resolve(getCurrentManager().getBeans(User.class)).getBeanClass().equals(User2.class);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
-
-public class User
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
+
+public class User
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
-
-import javax.enterprise.inject.Specializes;
-
- at Specializes
-public class User2 extends User
-{
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/specialization/User2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.specialization;
+
+import javax.enterprise.inject.Specializes;
+
+ at Specializes
+public class User2 extends User
+{
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.Stereotype;
-
-
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
- at interface AnimalOrderStereotype
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalOrderStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Stereotype;
+
+
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at interface AnimalOrderStereotype
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
-
- at Stereotype
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at RequestScoped
- at interface AnimalStereotype
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/AnimalStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+
+ at Stereotype
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at RequestScoped
+ at interface AnimalStereotype
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-
-class Order
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/Order.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+
+class Order
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.Stereotype;
-
- at Stereotype
- at Target( { TYPE })
- at Retention(RUNTIME)
-public @interface RequestScopedAnimalStereotype
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/RequestScopedAnimalStereotype.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Stereotype;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+public @interface RequestScopedAnimalStereotype
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
-
-import javax.enterprise.context.RequestScoped;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.metadata.cache.StereotypeModel;
-import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class StereotypesTest extends AbstractWeldTest
-{
-	
-   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-	
-   @Test
-   public void testAnimalStereotype()
-   {
-      StereotypeModel<AnimalStereotype> animalStereotype = new StereotypeModel<AnimalStereotype>(AnimalStereotype.class, transformer);
-      assert animalStereotype.getDefaultScopeType().annotationType().equals(RequestScoped.class);
-      assert animalStereotype.getInterceptorBindings().size() == 0;
-      assert !animalStereotype.isBeanNameDefaulted();
-      assert !animalStereotype.isAlternative();
-   }
-   
-   @Test
-   public void testAnimalOrderStereotype()
-   {
-      StereotypeModel<AnimalOrderStereotype> animalStereotype = new StereotypeModel<AnimalOrderStereotype>(AnimalOrderStereotype.class, transformer);
-      assert animalStereotype.getDefaultScopeType() == null;
-      assert animalStereotype.getInterceptorBindings().size() == 0;
-      assert !animalStereotype.isBeanNameDefaulted();
-      assert !animalStereotype.isAlternative();
-   }
-   
-   @Test
-   public void testRequestScopedAnimalStereotype()
-   {
-      StereotypeModel<RequestScopedAnimalStereotype> animalStereotype = new StereotypeModel<RequestScopedAnimalStereotype>(RequestScopedAnimalStereotype.class, transformer);
-      assert animalStereotype.getDefaultScopeType() == null;
-      assert animalStereotype.getInterceptorBindings().size() == 0;
-      assert !animalStereotype.isBeanNameDefaulted();
-      assert !animalStereotype.isAlternative();
-   }
-      
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.stereotypes;
+
+import javax.enterprise.context.RequestScoped;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.metadata.cache.StereotypeModel;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class StereotypesTest extends AbstractWeldTest
+{
+	
+   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+	
+   @Test
+   public void testAnimalStereotype()
+   {
+      StereotypeModel<AnimalStereotype> animalStereotype = new StereotypeModel<AnimalStereotype>(AnimalStereotype.class, transformer);
+      assert animalStereotype.getDefaultScopeType().annotationType().equals(RequestScoped.class);
+      assert animalStereotype.getInterceptorBindings().size() == 0;
+      assert !animalStereotype.isBeanNameDefaulted();
+      assert !animalStereotype.isAlternative();
+   }
+   
+   @Test
+   public void testAnimalOrderStereotype()
+   {
+      StereotypeModel<AnimalOrderStereotype> animalStereotype = new StereotypeModel<AnimalOrderStereotype>(AnimalOrderStereotype.class, transformer);
+      assert animalStereotype.getDefaultScopeType() == null;
+      assert animalStereotype.getInterceptorBindings().size() == 0;
+      assert !animalStereotype.isBeanNameDefaulted();
+      assert !animalStereotype.isAlternative();
+   }
+   
+   @Test
+   public void testRequestScopedAnimalStereotype()
+   {
+      StereotypeModel<RequestScopedAnimalStereotype> animalStereotype = new StereotypeModel<RequestScopedAnimalStereotype>(RequestScopedAnimalStereotype.class, transformer);
+      assert animalStereotype.getDefaultScopeType() == null;
+      assert animalStereotype.getInterceptorBindings().size() == 0;
+      assert !animalStereotype.isBeanNameDefaulted();
+      assert !animalStereotype.isAlternative();
+   }
+      
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
-
-/**
- * @author pmuir
- *
- */
-public class Bar
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Bar
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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() {}
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
-
-import org.jboss.weld.Container;
-import org.jboss.weld.ContainerState;
-import org.jboss.weld.mock.MockServletLifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.testng.annotations.Test;
-
-public class ContainerStatusTest
-{
-   
-   @Test
-   public void testStatus()
-   {
-      TestContainer container = new TestContainer(new MockServletLifecycle());
-      assert !Container.available();
-      container.getLifecycle().initialize();
-      assert !Container.available();
-      assert Container.instance().getState().equals(ContainerState.STARTING);
-      container.getLifecycle().getBootstrap().startInitialization();
-      assert !Container.available();
-      assert Container.instance().getState().equals(ContainerState.STARTING);
-      container.getLifecycle().getBootstrap().deployBeans();
-      assert Container.available();
-      assert Container.instance().getState().equals(ContainerState.INITIALIZED);
-      container.getLifecycle().getBootstrap().validateBeans().endInitialization();
-      assert Container.available();
-      assert Container.instance().getState().equals(ContainerState.VALIDATED);
-      container.stopContainer();
-      assert !Container.available();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
+
+import org.jboss.weld.Container;
+import org.jboss.weld.ContainerState;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.testng.annotations.Test;
+
+public class ContainerStatusTest
+{
+   
+   @Test
+   public void testStatus()
+   {
+      TestContainer container = new TestContainer(new MockServletLifecycle());
+      assert !Container.available();
+      container.getLifecycle().initialize();
+      assert !Container.available();
+      assert Container.instance().getState().equals(ContainerState.STARTING);
+      container.getLifecycle().getBootstrap().startInitialization();
+      assert !Container.available();
+      assert Container.instance().getState().equals(ContainerState.STARTING);
+      container.getLifecycle().getBootstrap().deployBeans();
+      assert Container.available();
+      assert Container.instance().getState().equals(ContainerState.INITIALIZED);
+      container.getLifecycle().getBootstrap().validateBeans().endInitialization();
+      assert Container.available();
+      assert Container.instance().getState().equals(ContainerState.VALIDATED);
+      container.stopContainer();
+      assert !Container.available();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
-
-import org.jboss.weld.bootstrap.WeldBootstrap;
-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 WeldBootstrap();
-      bootstrap.startContainer(Environments.SE, null, new ConcurrentHashMapBeanStore());
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
+
+import org.jboss.weld.bootstrap.WeldBootstrap;
+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 WeldBootstrap();
+      bootstrap.startContainer(Environments.SE, null, new ConcurrentHashMapBeanStore());
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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.getLifecycle().getWar().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: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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.getLifecycle().getWar().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();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-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 kkhan
- *
- */
-public class PreinstantiateBeanManagerTest
-{
-
-   @Test
-   public void test()
-   {
-      //Start the container, but do not deploy weld yet
-      List<Class<?>> classes = new ArrayList<Class<?>>();
-      classes.add(WeldBean.class);
-      TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
-      container.getLifecycle().initialize();
-      
-      BeanManager bootstrapManager = container.getBeanManager();
-      assert bootstrapManager != null;
-
-      //Check the bean is null since it is not there yet
-      Set<Bean<?>> beans = bootstrapManager.getBeans(WeldBean.class);
-      assert beans == null || beans.size() == 0;
-      
-      
-      //Start the application
-      container.getLifecycle().beginApplication();
-      container.ensureRequestActive();
-      
-      //Check the manager is the same as before
-      BeanManager manager = container.getBeanManager();
-      assert manager != null;
-      assert bootstrapManager == manager;
-      
-      //Check we can get the bean
-      Bean<? extends Object> bean = manager.resolve(manager.getBeans(WeldBean.class));
-      WeldBean weldBean = (WeldBean) manager.getReference(bean, WeldBean.class, manager.createCreationalContext(bean));
-      assert weldBean != null;
-      
-      container.stopContainer();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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 kkhan
+ *
+ */
+public class PreinstantiateBeanManagerTest
+{
+
+   @Test
+   public void test()
+   {
+      //Start the container, but do not deploy weld yet
+      List<Class<?>> classes = new ArrayList<Class<?>>();
+      classes.add(WeldBean.class);
+      TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
+      container.getLifecycle().initialize();
+      
+      BeanManager bootstrapManager = container.getBeanManager();
+      assert bootstrapManager != null;
+
+      //Check the bean is null since it is not there yet
+      Set<Bean<?>> beans = bootstrapManager.getBeans(WeldBean.class);
+      assert beans == null || beans.size() == 0;
+      
+      
+      //Start the application
+      container.getLifecycle().beginApplication();
+      container.ensureRequestActive();
+      
+      //Check the manager is the same as before
+      BeanManager manager = container.getBeanManager();
+      assert manager != null;
+      assert bootstrapManager == manager;
+      
+      //Check we can get the bean
+      Bean<? extends Object> bean = manager.resolve(manager.getBeans(WeldBean.class));
+      WeldBean weldBean = (WeldBean) manager.getReference(bean, WeldBean.class, manager.createCreationalContext(bean));
+      assert weldBean != null;
+      
+      container.stopContainer();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class WeldBean
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WeldBean
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.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 WeldStartupTest
-{
-
-   @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: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.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 WeldStartupTest
+{
+
+   @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: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-import javax.enterprise.inject.Alternative;
-
- at Alternative
-public class Alt
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+import javax.enterprise.inject.Alternative;
+
+ at Alternative
+public class Alt
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,218 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.weld.logging.messages.XmlMessage;
-import org.jboss.weld.mock.MockEELifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.xml.WeldXmlException;
-import org.testng.annotations.Test;
-
- at SuppressWarnings("unchecked")
-public class BeansXmlTest
-{
-   private static class FailedDeployment
-   {
-      private List<Class<?>> beans = Collections.emptyList();
-      private List<URL> beansXml = Collections.emptyList();
-
-      public FailedDeployment(List<Class<?>> beans, List<URL> beansXml)
-      {
-         this.beans = beans;
-         this.beansXml = beansXml;
-      }
-
-      public void run()
-      {
-         TestContainer container = null;
-         try
-         {
-            container = new TestContainer(new MockEELifecycle(), beans, beansXml).startContainer().ensureRequestActive();
-         }
-         finally
-         {
-            if (container != null)
-            {
-               container.stopContainer();
-            }
-         }
-      }
-
-      public void runAndExpect(WeldXmlException expected)
-      {
-         String errorCode = expected.getMessage().substring(0, 11);
-         try
-         {
-            run();
-         }
-         catch (WeldXmlException e)
-         {
-            if (e.getMessage().startsWith(errorCode))
-            {
-               return;
-            }
-         }
-         assert false;
-      }
-
-   }
-
-   private static void checkWithBeansXmlAndExpectException(String beansXml, WeldXmlException e)
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, Plain.class, IntBind.class);
-      List<URL> beansXmls = Arrays.asList(BeansXmlTest.class.getResource(beansXml));
-      new FailedDeployment(beans, beansXmls).runAndExpect(e);
-   }
-
-   // Multiple XML blocks
-
-   @Test
-   public void testMultipleAlternativeBlocksFail()
-   {
-      checkWithBeansXmlAndExpectException("multipleAlternativeBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_ALTERNATIVES));
-   }
-
-   @Test
-   public void testMultipleDecoratorBlocksFail()
-   {
-      checkWithBeansXmlAndExpectException("multipleDecoratorBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_DECORATORS));
-   }
-
-   @Test
-   public void testMultipleInterceptorBlocksFail()
-   {
-      checkWithBeansXmlAndExpectException("multipleInterceptorsBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_INTERCEPTORS));
-   }
-
-   @Test
-   public void testAlternativesEnabled()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("alternative.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
-      container.stopContainer();
-   }
-
-   @Test
-   public void testDecoratorsEnabled()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("decorator.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getDecorators().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getDecorators().iterator().next() == Dec.class;
-      container.stopContainer();
-   }
-
-   @Test
-   public void testInterceptorsEnabled()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("interceptor.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getInterceptors().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getInterceptors().iterator().next() == Int.class;
-      container.stopContainer();
-   }
-
-   @Test
-   public void testMergeBeansXmls()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("alternative.xml"), getClass().getResource("decorator.xml"), getClass().getResource("interceptor.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
-      assert container.getBeanManager().getEnabledClasses().getInterceptors().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getInterceptors().iterator().next() == Int.class;
-      assert container.getBeanManager().getEnabledClasses().getDecorators().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getDecorators().iterator().next() == Dec.class;
-      container.stopContainer();
-   }
-
-   @Test
-   public void testBeansXmlDoesntExist()
-   {
-      checkWithBeansXmlAndExpectException("nope.xml", new WeldXmlException(XmlMessage.LOAD_ERROR));
-   }
-   
-   // WELD-467
-   @Test
-   public void testNamespacedBeansXml()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("namespaced.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
-      container.stopContainer();
-   }
-   
-   // WELD-467
-   @Test
-   public void testNotDefaultNamespacedBeansXml()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("nonDefaultNamespaced.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
-      container.stopContainer();
-   }
-
-   /*
-    * https://jira.jboss.org/jira/browse/WELD-362
-    */
-   @Test
-   public void testNonPrettyPrintedXML()
-   {
-      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
-      List<URL> beansXmls = Arrays.asList(getClass().getResource("nonPrettyPrinted.xml"));
-      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
-      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
-      container.stopContainer();
-   }
-
-   @Test
-   public void testCannotLoadFile() throws MalformedURLException
-   {
-      List<Class<?>> beans = Collections.emptyList();
-      new FailedDeployment(beans, Arrays.asList(new URL("http://foo.bar/beans.xml"))).runAndExpect(new WeldXmlException(XmlMessage.LOAD_ERROR));
-   }
-
-   @Test
-   public void testParsingError()
-   {
-      checkWithBeansXmlAndExpectException("unparseable.xml", new WeldXmlException(XmlMessage.PARSING_ERROR));
-   }
-
-   @Test
-   public void testCannotLoadClass()
-   {
-      checkWithBeansXmlAndExpectException("unloadable.xml", new WeldXmlException(XmlMessage.CANNOT_LOAD_CLASS));
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,218 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.weld.logging.messages.XmlMessage;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.xml.WeldXmlException;
+import org.testng.annotations.Test;
+
+ at SuppressWarnings("unchecked")
+public class BeansXmlTest
+{
+   private static class FailedDeployment
+   {
+      private List<Class<?>> beans = Collections.emptyList();
+      private List<URL> beansXml = Collections.emptyList();
+
+      public FailedDeployment(List<Class<?>> beans, List<URL> beansXml)
+      {
+         this.beans = beans;
+         this.beansXml = beansXml;
+      }
+
+      public void run()
+      {
+         TestContainer container = null;
+         try
+         {
+            container = new TestContainer(new MockEELifecycle(), beans, beansXml).startContainer().ensureRequestActive();
+         }
+         finally
+         {
+            if (container != null)
+            {
+               container.stopContainer();
+            }
+         }
+      }
+
+      public void runAndExpect(WeldXmlException expected)
+      {
+         String errorCode = expected.getMessage().substring(0, 11);
+         try
+         {
+            run();
+         }
+         catch (WeldXmlException e)
+         {
+            if (e.getMessage().startsWith(errorCode))
+            {
+               return;
+            }
+         }
+         assert false;
+      }
+
+   }
+
+   private static void checkWithBeansXmlAndExpectException(String beansXml, WeldXmlException e)
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, Plain.class, IntBind.class);
+      List<URL> beansXmls = Arrays.asList(BeansXmlTest.class.getResource(beansXml));
+      new FailedDeployment(beans, beansXmls).runAndExpect(e);
+   }
+
+   // Multiple XML blocks
+
+   @Test
+   public void testMultipleAlternativeBlocksFail()
+   {
+      checkWithBeansXmlAndExpectException("multipleAlternativeBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_ALTERNATIVES));
+   }
+
+   @Test
+   public void testMultipleDecoratorBlocksFail()
+   {
+      checkWithBeansXmlAndExpectException("multipleDecoratorBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_DECORATORS));
+   }
+
+   @Test
+   public void testMultipleInterceptorBlocksFail()
+   {
+      checkWithBeansXmlAndExpectException("multipleInterceptorsBlocks.xml", new WeldXmlException(XmlMessage.MULTIPLE_INTERCEPTORS));
+   }
+
+   @Test
+   public void testAlternativesEnabled()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("alternative.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
+      container.stopContainer();
+   }
+
+   @Test
+   public void testDecoratorsEnabled()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("decorator.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getDecorators().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getDecorators().iterator().next() == Dec.class;
+      container.stopContainer();
+   }
+
+   @Test
+   public void testInterceptorsEnabled()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("interceptor.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getInterceptors().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getInterceptors().iterator().next() == Int.class;
+      container.stopContainer();
+   }
+
+   @Test
+   public void testMergeBeansXmls()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("alternative.xml"), getClass().getResource("decorator.xml"), getClass().getResource("interceptor.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
+      assert container.getBeanManager().getEnabledClasses().getInterceptors().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getInterceptors().iterator().next() == Int.class;
+      assert container.getBeanManager().getEnabledClasses().getDecorators().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getDecorators().iterator().next() == Dec.class;
+      container.stopContainer();
+   }
+
+   @Test
+   public void testBeansXmlDoesntExist()
+   {
+      checkWithBeansXmlAndExpectException("nope.xml", new WeldXmlException(XmlMessage.LOAD_ERROR));
+   }
+   
+   // WELD-467
+   @Test
+   public void testNamespacedBeansXml()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("namespaced.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
+      container.stopContainer();
+   }
+   
+   // WELD-467
+   @Test
+   public void testNotDefaultNamespacedBeansXml()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("nonDefaultNamespaced.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
+      container.stopContainer();
+   }
+
+   /*
+    * https://jira.jboss.org/jira/browse/WELD-362
+    */
+   @Test
+   public void testNonPrettyPrintedXML()
+   {
+      List<Class<?>> beans = Arrays.asList(Alt.class, Dec.class, Int.class, IntBind.class, Plain.class);
+      List<URL> beansXmls = Arrays.asList(getClass().getResource("nonPrettyPrinted.xml"));
+      TestContainer container = new TestContainer(new MockEELifecycle(), beans, beansXmls).startContainer().ensureRequestActive();
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().size() == 1;
+      assert container.getBeanManager().getEnabledClasses().getAlternativeClasses().iterator().next() == Alt.class;
+      container.stopContainer();
+   }
+
+   @Test
+   public void testCannotLoadFile() throws MalformedURLException
+   {
+      List<Class<?>> beans = Collections.emptyList();
+      new FailedDeployment(beans, Arrays.asList(new URL("http://foo.bar/beans.xml"))).runAndExpect(new WeldXmlException(XmlMessage.LOAD_ERROR));
+   }
+
+   @Test
+   public void testParsingError()
+   {
+      checkWithBeansXmlAndExpectException("unparseable.xml", new WeldXmlException(XmlMessage.PARSING_ERROR));
+   }
+
+   @Test
+   public void testCannotLoadClass()
+   {
+      checkWithBeansXmlAndExpectException("unloadable.xml", new WeldXmlException(XmlMessage.CANNOT_LOAD_CLASS));
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
- at Decorator
-public class Dec
-{
-   @Inject @Delegate Plain plain;
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class Dec
+{
+   @Inject @Delegate Plain plain;
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-import javax.interceptor.Interceptor;
-
- at Interceptor
- at IntBind
-public class Int
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+import javax.interceptor.Interceptor;
+
+ at Interceptor
+ at IntBind
+public class Int
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import javax.interceptor.InterceptorBinding;
-
- at InterceptorBinding
- at Inherited
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
-public @interface IntBind
-{
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+import javax.interceptor.InterceptorBinding;
+
+ at InterceptorBinding
+ at Inherited
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+public @interface IntBind
+{
+}
\ No newline at end of file

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
-
-public class Plain
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.bootstrap.xml;
+
+public class Plain
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.io.Serializable;
-
-public class Fodder implements Serializable
-{
-
-   private static final long serialVersionUID = 7526196594918652669L;
-   
-   private int amount;
-   
-   public int getAmount()
-   {
-      return amount;
-   }
-   
-   public void setAmount(int amount)
-   {
-      this.amount = amount;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Fodder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.io.Serializable;
+
+public class Fodder implements Serializable
+{
+
+   private static final long serialVersionUID = 7526196594918652669L;
+   
+   private int amount;
+   
+   public int getAmount()
+   {
+      return amount;
+   }
+   
+   public void setAmount(int amount)
+   {
+      this.amount = amount;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-
- at SessionScoped
-public class Foo implements Serializable
-{
-   
-   private String name;
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public String getName()
-   {
-      return name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+
+ at SessionScoped
+public class Foo implements Serializable
+{
+   
+   private String name;
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-public class Horse implements Serializable
-{
-   
-   private String name;
-   
-   public String getName()
-   {
-      return name;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+public class Horse implements Serializable
+{
+   
+   private String name;
+   
+   public String getName()
+   {
+      return name;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.mock.cluster.AbstractClusterTest;
-import org.testng.annotations.Test;
-
-public class NaiveClusterTest extends AbstractClusterTest
-{
-   
-   @Test(description="A simple test to check session replication, doesn't carefully check if a bean ids are correct")
-   public void testSimpleSessionReplication() throws Exception
-   {
-      
-      TestContainer container1 = bootstrapContainer(1, Arrays.<Class<?>>asList(Foo.class));
-      BeanManagerImpl beanManager1 = container1.getBeanManager();
-      Bean<?> fooBean1 = beanManager1.resolve(beanManager1.getBeans(Foo.class));
-      
-      TestContainer container2 = bootstrapContainer(2, Arrays.<Class<?>>asList(Foo.class));
-      BeanManagerImpl beanManager2 = container2.getBeanManager();
-      Bean<?> fooBean2 = beanManager2.resolve(beanManager2.getBeans(Foo.class));
-      
-      use(1);
-      // Set a value into Foo1
-      Foo foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
-      foo1.setName("container 1");
-      
-      replicateSession(1, beanManager1, 2, beanManager2);
-      
-      use(2);
-      Foo foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
-      assert foo2.getName().equals("container 1");
-      use(2);
-      container2.stopContainer();
-      use(1);
-      container1.stopContainer();
-   }
-   
-   @Test
-   public void testMultipleDependentObjectsSessionReplication() throws Exception
-   {
-      Collection<Class<?>> classes = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class);
-      TestContainer container1 = bootstrapContainer(1, classes);
-      BeanManagerImpl beanManager1 = container1.getBeanManager();
-      Bean<?> stableBean1 = beanManager1.resolve(beanManager1.getBeans(Stable.class));
-      
-      TestContainer container2 = bootstrapContainer(2, classes);
-      BeanManagerImpl beanManager2 = container2.getBeanManager();
-      Bean<?> stableBean2 = beanManager2.resolve(beanManager2.getBeans(Stable.class));
-      
-      use(1);
-      // Set a value into Foo1
-      Stable stable1 = (Stable) beanManager1.getReference(stableBean1, Foo.class, beanManager1.createCreationalContext(stableBean1));
-      stable1.getFodder().setAmount(10);
-      stable1.getHorse().setName("George");
-      
-      replicateSession(1, beanManager1, 2, beanManager2);
-      
-      use(2);
-      
-      Stable stable2 = (Stable) beanManager2.getReference(stableBean2, Stable.class, beanManager2.createCreationalContext(stableBean2));
-      assert stable2.getFodder().getAmount() == stable1.getFodder().getAmount();
-      assert stable2.getHorse().getName() == null;
-      
-      use(1);
-      assert stable1.getFodder().getAmount() == 10;
-      assert stable1.getHorse().getName().equals("George");
-      
-      use(2);
-      
-      stable2.getFodder().setAmount(11);
-      
-      replicateSession(2, beanManager2, 1, beanManager1);
-      
-      use(1);
-      
-      assert stable1.getFodder().getAmount() == 11;
-      use(1);
-      container1.stopContainer();
-      use(2);
-      container2.stopContainer();
-   }
-   
-   @Test
-   public void testVariableBeanDeploymentStructure() throws Exception
-   {
-      // NB This is not a valid deployment scenario for a cluster, but it does allow us to test bean ids neatly!
-      Collection<Class<?>> classes1 = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class);
-      Collection<Class<?>> classes2 = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class, Foo.class);
-      TestContainer container1 = bootstrapContainer(1, classes1);
-      BeanManagerImpl beanManager1 = container1.getBeanManager();
-      Bean<?> stableBean1 = beanManager1.resolve(beanManager1.getBeans(Stable.class));
-      
-      TestContainer container2 = bootstrapContainer(2, classes2);
-      BeanManagerImpl beanManager2 = container2.getBeanManager();
-      Bean<?> stableBean2 = beanManager2.resolve(beanManager2.getBeans(Stable.class));
-      
-      use(1);
-      // Set a value into Foo1
-      Stable stable1 = (Stable) beanManager1.getReference(stableBean1, Foo.class, beanManager1.createCreationalContext(stableBean1));
-      stable1.getFodder().setAmount(10);
-      stable1.getHorse().setName("George");
-      
-      replicateSession(1, beanManager1, 2, beanManager2);
-      
-      use(2);
-      
-      Stable stable2 = (Stable) beanManager2.getReference(stableBean2, Stable.class, beanManager2.createCreationalContext(stableBean2));
-      assert stable2.getFodder().getAmount() == stable1.getFodder().getAmount();
-      assert stable2.getHorse().getName() == null;
-      use(1);
-      container1.stopContainer();
-      use(2);
-      container2.stopContainer();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.mock.cluster.AbstractClusterTest;
+import org.testng.annotations.Test;
+
+public class NaiveClusterTest extends AbstractClusterTest
+{
+   
+   @Test(description="A simple test to check session replication, doesn't carefully check if a bean ids are correct")
+   public void testSimpleSessionReplication() throws Exception
+   {
+      
+      TestContainer container1 = bootstrapContainer(1, Arrays.<Class<?>>asList(Foo.class));
+      BeanManagerImpl beanManager1 = container1.getBeanManager();
+      Bean<?> fooBean1 = beanManager1.resolve(beanManager1.getBeans(Foo.class));
+      
+      TestContainer container2 = bootstrapContainer(2, Arrays.<Class<?>>asList(Foo.class));
+      BeanManagerImpl beanManager2 = container2.getBeanManager();
+      Bean<?> fooBean2 = beanManager2.resolve(beanManager2.getBeans(Foo.class));
+      
+      use(1);
+      // Set a value into Foo1
+      Foo foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
+      foo1.setName("container 1");
+      
+      replicateSession(1, beanManager1, 2, beanManager2);
+      
+      use(2);
+      Foo foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
+      assert foo2.getName().equals("container 1");
+      use(2);
+      container2.stopContainer();
+      use(1);
+      container1.stopContainer();
+   }
+   
+   @Test
+   public void testMultipleDependentObjectsSessionReplication() throws Exception
+   {
+      Collection<Class<?>> classes = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class);
+      TestContainer container1 = bootstrapContainer(1, classes);
+      BeanManagerImpl beanManager1 = container1.getBeanManager();
+      Bean<?> stableBean1 = beanManager1.resolve(beanManager1.getBeans(Stable.class));
+      
+      TestContainer container2 = bootstrapContainer(2, classes);
+      BeanManagerImpl beanManager2 = container2.getBeanManager();
+      Bean<?> stableBean2 = beanManager2.resolve(beanManager2.getBeans(Stable.class));
+      
+      use(1);
+      // Set a value into Foo1
+      Stable stable1 = (Stable) beanManager1.getReference(stableBean1, Foo.class, beanManager1.createCreationalContext(stableBean1));
+      stable1.getFodder().setAmount(10);
+      stable1.getHorse().setName("George");
+      
+      replicateSession(1, beanManager1, 2, beanManager2);
+      
+      use(2);
+      
+      Stable stable2 = (Stable) beanManager2.getReference(stableBean2, Stable.class, beanManager2.createCreationalContext(stableBean2));
+      assert stable2.getFodder().getAmount() == stable1.getFodder().getAmount();
+      assert stable2.getHorse().getName() == null;
+      
+      use(1);
+      assert stable1.getFodder().getAmount() == 10;
+      assert stable1.getHorse().getName().equals("George");
+      
+      use(2);
+      
+      stable2.getFodder().setAmount(11);
+      
+      replicateSession(2, beanManager2, 1, beanManager1);
+      
+      use(1);
+      
+      assert stable1.getFodder().getAmount() == 11;
+      use(1);
+      container1.stopContainer();
+      use(2);
+      container2.stopContainer();
+   }
+   
+   @Test
+   public void testVariableBeanDeploymentStructure() throws Exception
+   {
+      // NB This is not a valid deployment scenario for a cluster, but it does allow us to test bean ids neatly!
+      Collection<Class<?>> classes1 = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class);
+      Collection<Class<?>> classes2 = Arrays.<Class<?>>asList(Stable.class, Horse.class, Fodder.class, Foo.class);
+      TestContainer container1 = bootstrapContainer(1, classes1);
+      BeanManagerImpl beanManager1 = container1.getBeanManager();
+      Bean<?> stableBean1 = beanManager1.resolve(beanManager1.getBeans(Stable.class));
+      
+      TestContainer container2 = bootstrapContainer(2, classes2);
+      BeanManagerImpl beanManager2 = container2.getBeanManager();
+      Bean<?> stableBean2 = beanManager2.resolve(beanManager2.getBeans(Stable.class));
+      
+      use(1);
+      // Set a value into Foo1
+      Stable stable1 = (Stable) beanManager1.getReference(stableBean1, Foo.class, beanManager1.createCreationalContext(stableBean1));
+      stable1.getFodder().setAmount(10);
+      stable1.getHorse().setName("George");
+      
+      replicateSession(1, beanManager1, 2, beanManager2);
+      
+      use(2);
+      
+      Stable stable2 = (Stable) beanManager2.getReference(stableBean2, Stable.class, beanManager2.createCreationalContext(stableBean2));
+      assert stable2.getFodder().getAmount() == stable1.getFodder().getAmount();
+      assert stable2.getHorse().getName() == null;
+      use(1);
+      container1.stopContainer();
+      use(2);
+      container2.stopContainer();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-
- at SessionScoped
-public class Stable implements Serializable
-{
-   
-   /**
-    * 
-    */
-   private static final long serialVersionUID = 4007799511309218679L;
-
-   @Inject
-   private Horse horse;
-   
-   @Inject
-   private Fodder fodder;
-   
-   public Horse getHorse()
-   {
-      return horse;
-   }
-   
-   public Fodder getFodder()
-   {
-      return fodder;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/Stable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
+
+ at SessionScoped
+public class Stable implements Serializable
+{
+   
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 4007799511309218679L;
+
+   @Inject
+   private Horse horse;
+   
+   @Inject
+   private Fodder fodder;
+   
+   public Horse getHorse()
+   {
+      return horse;
+   }
+   
+   public Fodder getFodder()
+   {
+      return fodder;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
-
-import java.util.Arrays;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-
-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.AbstractClusterTest;
-import org.jboss.weld.mock.cluster.SwitchableSingletonProvider;
-import org.testng.annotations.Test;
-
-public class SwitchableContainerTest extends AbstractClusterTest
-{
-
-   @Test
-   public void test()
-   {
-      
-      // Bootstrap container 1
-      SwitchableSingletonProvider.use(1);
-      
-      TestContainer container1 = new TestContainer(new MockEELifecycle(), Arrays.<Class<?>>asList(Foo.class), null);
-      container1.startContainer();
-      container1.ensureRequestActive();
-      
-      BeanManager beanManager1 = container1.getBeanManager();
-      Bean<?> fooBean1 = beanManager1.resolve(beanManager1.getBeans(Foo.class));
-      Foo foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
-      foo1.setName("container 1");
-      
-      // Bootstrap container 2
-      SwitchableSingletonProvider.use(2);
-      
-      TestContainer container2 = new TestContainer(new MockEELifecycle(), Arrays.<Class<?>>asList(Foo.class), null);
-      container2.startContainer();
-      container2.ensureRequestActive();
-      
-      BeanManager beanManager2 = container2.getBeanManager();
-      Bean<?> fooBean2 = beanManager2.resolve(beanManager2.getBeans(Foo.class));
-      Foo foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
-      foo2.setName("container 2");
-      
-      // Switch to container 1 and check value
-      SwitchableSingletonProvider.use(1);
-      foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
-      assert foo1.getName().equals("container 1");
-      
-      // Switch to container 2 and check value
-      SwitchableSingletonProvider.use(2);
-      foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
-      assert foo2.getName().equals("container 2");
-      SingletonProvider.reset();
-      container1.stopContainer();
-      container2.stopContainer();
-      SingletonProvider.reset();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.cluster;
+
+import java.util.Arrays;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+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.AbstractClusterTest;
+import org.jboss.weld.mock.cluster.SwitchableSingletonProvider;
+import org.testng.annotations.Test;
+
+public class SwitchableContainerTest extends AbstractClusterTest
+{
+
+   @Test
+   public void test()
+   {
+      
+      // Bootstrap container 1
+      SwitchableSingletonProvider.use(1);
+      
+      TestContainer container1 = new TestContainer(new MockEELifecycle(), Arrays.<Class<?>>asList(Foo.class), null);
+      container1.startContainer();
+      container1.ensureRequestActive();
+      
+      BeanManager beanManager1 = container1.getBeanManager();
+      Bean<?> fooBean1 = beanManager1.resolve(beanManager1.getBeans(Foo.class));
+      Foo foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
+      foo1.setName("container 1");
+      
+      // Bootstrap container 2
+      SwitchableSingletonProvider.use(2);
+      
+      TestContainer container2 = new TestContainer(new MockEELifecycle(), Arrays.<Class<?>>asList(Foo.class), null);
+      container2.startContainer();
+      container2.ensureRequestActive();
+      
+      BeanManager beanManager2 = container2.getBeanManager();
+      Bean<?> fooBean2 = beanManager2.resolve(beanManager2.getBeans(Foo.class));
+      Foo foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
+      foo2.setName("container 2");
+      
+      // Switch to container 1 and check value
+      SwitchableSingletonProvider.use(1);
+      foo1 = (Foo) beanManager1.getReference(fooBean1, Foo.class, beanManager1.createCreationalContext(fooBean1));
+      assert foo1.getName().equals("container 1");
+      
+      // Switch to container 2 and check value
+      SwitchableSingletonProvider.use(2);
+      foo2 = (Foo) beanManager2.getReference(fooBean2, Foo.class, beanManager2.createCreationalContext(fooBean2));
+      assert foo2.getName().equals("container 2");
+      SingletonProvider.reset();
+      container1.stopContainer();
+      container2.stopContainer();
+      SingletonProvider.reset();
+   }
+   
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-public class Bar
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+public class Bar
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-
-public class CountingObserver1 implements Extension
-{
-   
-   private int beforeBeanDiscovery;
-   private int processFooManagedBean;
-   private int processBarManagedBean;
-
-   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
-   {
-      beforeBeanDiscovery++;
-   }
-   
-   public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event)
-   {
-      processFooManagedBean++;
-   }
-   
-   public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event)
-   {
-      processBarManagedBean++;
-   }
-   
-   public int getBeforeBeanDiscovery()
-   {
-      return beforeBeanDiscovery;
-   }
-   
-   public int getProcessFooManagedBean()
-   {
-      return processFooManagedBean;
-   }
-   
-   public int getProcessBarManagedBean()
-   {
-      return processBarManagedBean;
-   }
-     
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+
+public class CountingObserver1 implements Extension
+{
+   
+   private int beforeBeanDiscovery;
+   private int processFooManagedBean;
+   private int processBarManagedBean;
+
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+   {
+      beforeBeanDiscovery++;
+   }
+   
+   public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event)
+   {
+      processFooManagedBean++;
+   }
+   
+   public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event)
+   {
+      processBarManagedBean++;
+   }
+   
+   public int getBeforeBeanDiscovery()
+   {
+      return beforeBeanDiscovery;
+   }
+   
+   public int getProcessFooManagedBean()
+   {
+      return processFooManagedBean;
+   }
+   
+   public int getProcessBarManagedBean()
+   {
+      return processBarManagedBean;
+   }
+     
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-
-public class CountingObserver2 implements Extension
-{
-   
-   private int beforeBeanDiscovery;
-   private int processFooManagedBean;
-   private int processBarManagedBean;
-
-   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
-   {
-      beforeBeanDiscovery++;
-      event.addAnnotatedType(beanManager.createAnnotatedType(Bar.class));
-   }
-   
-   public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event)
-   {
-      processFooManagedBean++;
-   }
-   
-   public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event)
-   {
-      processBarManagedBean++;
-   }
-   
-   public int getBeforeBeanDiscovery()
-   {
-      return beforeBeanDiscovery;
-   }
-   
-   public int getProcessFooManagedBean()
-   {
-      return processFooManagedBean;
-   }
-   
-   public int getProcessBarManagedBean()
-   {
-      return processBarManagedBean;
-   }
-     
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+
+public class CountingObserver2 implements Extension
+{
+   
+   private int beforeBeanDiscovery;
+   private int processFooManagedBean;
+   private int processBarManagedBean;
+
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
+   {
+      beforeBeanDiscovery++;
+      event.addAnnotatedType(beanManager.createAnnotatedType(Bar.class));
+   }
+   
+   public void observerProcessFooManagedBean(@Observes ProcessManagedBean<Foo> event)
+   {
+      processFooManagedBean++;
+   }
+   
+   public void observerProcessBarManagedBean(@Observes ProcessManagedBean<Bar> event)
+   {
+      processBarManagedBean++;
+   }
+   
+   public int getBeforeBeanDiscovery()
+   {
+      return beforeBeanDiscovery;
+   }
+   
+   public int getProcessFooManagedBean()
+   {
+      return processFooManagedBean;
+   }
+   
+   public int getProcessBarManagedBean()
+   {
+      return processBarManagedBean;
+   }
+     
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.inject.Produces;
-
-public class Foo
-{
-
-   @Produces
-   public String get()
-   {
-      return "Foo!";
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.inject.Produces;
+
+public class Foo
+{
+
+   @Produces
+   public String get()
+   {
+      return "Foo!";
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,159 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.inject.spi.Extension;
-
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.mock.AbstractMockDeployment;
-import org.jboss.weld.mock.MockBeanDeploymentArchive;
-import org.jboss.weld.mock.MockServletLifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.test.Utils;
-import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory;
-import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory;
-import org.testng.annotations.Test;
-
-public class NonBdaExtensionTest
-{
-   
-   @Test(description="WELD-233")
-   public void test()
-   {
-      // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar
-      final MockBeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", Observer1.class, Foo.class);
-      
-      // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar
-      // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension 
-      final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", Observer2.class);
-      
-      // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside
-      Deployment deployment = new AbstractMockDeployment(bda1)
-      {
-         
-         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
-         {
-            // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1
-            if (beanClass.equals(Observer2.class))
-            {
-               // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1
-               bda1.getBeanDeploymentArchives().add(bda2);
-               return bda2;
-            }
-            else
-            {
-               return bda1;
-            }
-         }
-
-      };
-      
-      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, bda1));
-      container.getLifecycle().initialize();
-      
-      // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services
-      // We do this after startContainer() so we replace the default impl
-      deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBdaExtensionTest.class.getPackage(), Extension.class));
-      
-      // Cause the container to deploy the beans etc.
-      container.getLifecycle().beginApplication();
-      
-      // Get the bean manager for bda1 and bda2
-      BeanManagerImpl beanManager1 = container.getBeanManager();
-      BeanManagerImpl beanManager2 = container.getLifecycle().getBootstrap().getManager(bda2);
-      
-      Observer1 observer1 = Utils.getReference(beanManager1, Observer1.class);
-      assert observer1.isBeforeBeanDiscoveryCalled();
-      assert observer1.getBeforeBeanDiscoveryBeanManager().equals(beanManager1);
-      assert observer1.isAfterBeanDiscoveryCalled();
-      assert observer1.isAfterDeploymentValidationCalled();
-      assert observer1.isProcessInjectionTargetCalled();
-      assert observer1.isProcessManagedBeanCalled();
-      assert observer1.isProcessProducerCalled();
-      
-      assert beanManager2.getBeans(Observer2.class).size() == 1;
-      // Also check that the accessibility graph has been updated
-      assert beanManager1.getBeans(Observer2.class).size() == 1;
-      
-      Observer2 observer2 = Utils.getReference(beanManager2, Observer2.class);
-      assert observer2.isBeforeBeanDiscoveryCalled();
-      assert observer2.getBeforeBeanDiscoveryBeanManager().equals(beanManager2);
-      assert observer2.isAfterBeanDiscoveryCalled();
-      assert observer2.isAfterDeploymentValidationCalled();
-      assert observer2.isProcessInjectionTargetCalled();
-      assert observer2.isProcessManagedBeanCalled();
-      assert observer2.isProcessProducerCalled();
-      
-   }
-   
-   @Test(description="WELD-258")
-   public void testEventsSentOnceOnly()
-   {
-   // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar
-      final MockBeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", CountingObserver1.class, Foo.class);
-      
-      // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar
-      // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension 
-      final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", CountingObserver2.class);
-      
-      // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside
-      Deployment deployment = new AbstractMockDeployment(bda1)
-      {
-         
-         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
-         {
-            // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1
-            if (beanClass.equals(CountingObserver2.class) || beanClass.equals(Bar.class))
-            {
-               // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1
-               bda1.getBeanDeploymentArchives().add(bda2);
-               return bda2;
-            }
-            else
-            {
-               return bda1;
-            }
-         }
-
-      };
-      
-      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, bda1));
-      container.getLifecycle().initialize();
-      
-      // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services
-      // We do this after startContainer() so we replace the default impl
-      deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBdaExtensionTest.class.getPackage(), Extension.class));
-      
-      // Cause the container to deploy the beans etc.
-      container.getLifecycle().beginApplication();
-      
-      // Get the bean manager for bda1 and bda2
-      BeanManagerImpl beanManager1 = container.getBeanManager();
-      
-      CountingObserver1 observer1 = Utils.getReference(beanManager1, CountingObserver1.class);
-      CountingObserver2 observer2 = Utils.getReference(beanManager1, CountingObserver2.class);
-      assert observer1.getBeforeBeanDiscovery() == 1;
-      assert observer1.getProcessFooManagedBean() == 1;
-      assert observer1.getProcessBarManagedBean() == 0;
-      assert observer2.getBeforeBeanDiscovery() == 1;
-      assert observer2.getProcessFooManagedBean() == 1;
-      assert observer2.getProcessBarManagedBean() == 1;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.inject.spi.Extension;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.mock.AbstractMockDeployment;
+import org.jboss.weld.mock.MockBeanDeploymentArchive;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.test.Utils;
+import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory;
+import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory;
+import org.testng.annotations.Test;
+
+public class NonBdaExtensionTest
+{
+   
+   @Test(description="WELD-233")
+   public void test()
+   {
+      // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar
+      final MockBeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", Observer1.class, Foo.class);
+      
+      // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar
+      // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension 
+      final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", Observer2.class);
+      
+      // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside
+      Deployment deployment = new AbstractMockDeployment(bda1)
+      {
+         
+         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+         {
+            // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1
+            if (beanClass.equals(Observer2.class))
+            {
+               // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1
+               bda1.getBeanDeploymentArchives().add(bda2);
+               return bda2;
+            }
+            else
+            {
+               return bda1;
+            }
+         }
+
+      };
+      
+      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, bda1));
+      container.getLifecycle().initialize();
+      
+      // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services
+      // We do this after startContainer() so we replace the default impl
+      deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBdaExtensionTest.class.getPackage(), Extension.class));
+      
+      // Cause the container to deploy the beans etc.
+      container.getLifecycle().beginApplication();
+      
+      // Get the bean manager for bda1 and bda2
+      BeanManagerImpl beanManager1 = container.getBeanManager();
+      BeanManagerImpl beanManager2 = container.getLifecycle().getBootstrap().getManager(bda2);
+      
+      Observer1 observer1 = Utils.getReference(beanManager1, Observer1.class);
+      assert observer1.isBeforeBeanDiscoveryCalled();
+      assert observer1.getBeforeBeanDiscoveryBeanManager().equals(beanManager1);
+      assert observer1.isAfterBeanDiscoveryCalled();
+      assert observer1.isAfterDeploymentValidationCalled();
+      assert observer1.isProcessInjectionTargetCalled();
+      assert observer1.isProcessManagedBeanCalled();
+      assert observer1.isProcessProducerCalled();
+      
+      assert beanManager2.getBeans(Observer2.class).size() == 1;
+      // Also check that the accessibility graph has been updated
+      assert beanManager1.getBeans(Observer2.class).size() == 1;
+      
+      Observer2 observer2 = Utils.getReference(beanManager2, Observer2.class);
+      assert observer2.isBeforeBeanDiscoveryCalled();
+      assert observer2.getBeforeBeanDiscoveryBeanManager().equals(beanManager2);
+      assert observer2.isAfterBeanDiscoveryCalled();
+      assert observer2.isAfterDeploymentValidationCalled();
+      assert observer2.isProcessInjectionTargetCalled();
+      assert observer2.isProcessManagedBeanCalled();
+      assert observer2.isProcessProducerCalled();
+      
+   }
+   
+   @Test(description="WELD-258")
+   public void testEventsSentOnceOnly()
+   {
+   // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar
+      final MockBeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", CountingObserver1.class, Foo.class);
+      
+      // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar
+      // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension 
+      final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", CountingObserver2.class);
+      
+      // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside
+      Deployment deployment = new AbstractMockDeployment(bda1)
+      {
+         
+         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+         {
+            // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1
+            if (beanClass.equals(CountingObserver2.class) || beanClass.equals(Bar.class))
+            {
+               // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1
+               bda1.getBeanDeploymentArchives().add(bda2);
+               return bda2;
+            }
+            else
+            {
+               return bda1;
+            }
+         }
+
+      };
+      
+      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, bda1));
+      container.getLifecycle().initialize();
+      
+      // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services
+      // We do this after startContainer() so we replace the default impl
+      deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBdaExtensionTest.class.getPackage(), Extension.class));
+      
+      // Cause the container to deploy the beans etc.
+      container.getLifecycle().beginApplication();
+      
+      // Get the bean manager for bda1 and bda2
+      BeanManagerImpl beanManager1 = container.getBeanManager();
+      
+      CountingObserver1 observer1 = Utils.getReference(beanManager1, CountingObserver1.class);
+      CountingObserver2 observer2 = Utils.getReference(beanManager1, CountingObserver2.class);
+      assert observer1.getBeforeBeanDiscovery() == 1;
+      assert observer1.getProcessFooManagedBean() == 1;
+      assert observer1.getProcessBarManagedBean() == 0;
+      assert observer2.getBeforeBeanDiscovery() == 1;
+      assert observer2.getProcessFooManagedBean() == 1;
+      assert observer2.getProcessBarManagedBean() == 1;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.enterprise.inject.spi.ProcessProducer;
-
-public class Observer1 extends ObserverBase implements Extension
-{
-   
-   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
-   {
-      this.afterBeanDiscoveryCalled = true;
-   }
-   
-   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
-   {
-      this.beforeBeanDiscoveryCalled = true;
-      this.beforeBeanDiscoveryBeanManager = beanManager;
-   }
-   
-   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
-   {
-      afterDeploymentValidationCalled = true;
-   }
-   
-   public void observeProcessProducer(@Observes ProcessProducer<Foo, String> event)
-   {
-      processProducerCalled = true;
-   }
-   
-   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<Foo> event)
-   {
-      processInjectionTargetCalled = true;
-   }
-   
-   public void observeProcessManagedBean(@Observes ProcessManagedBean<Foo> event)
-   {
-      processManagedBeanCalled = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+import javax.enterprise.inject.spi.ProcessProducer;
+
+public class Observer1 extends ObserverBase implements Extension
+{
+   
+   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
+   {
+      this.afterBeanDiscoveryCalled = true;
+   }
+   
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
+   {
+      this.beforeBeanDiscoveryCalled = true;
+      this.beforeBeanDiscoveryBeanManager = beanManager;
+   }
+   
+   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
+   {
+      afterDeploymentValidationCalled = true;
+   }
+   
+   public void observeProcessProducer(@Observes ProcessProducer<Foo, String> event)
+   {
+      processProducerCalled = true;
+   }
+   
+   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<Foo> event)
+   {
+      processInjectionTargetCalled = true;
+   }
+   
+   public void observeProcessManagedBean(@Observes ProcessManagedBean<Foo> event)
+   {
+      processManagedBeanCalled = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.enterprise.inject.spi.ProcessProducer;
-
-public class Observer2 extends ObserverBase implements Extension
-{
-   
-   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
-   {
-      this.afterBeanDiscoveryCalled = true;
-   }
-   
-   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
-   {
-      this.beforeBeanDiscoveryCalled = true;
-      this.beforeBeanDiscoveryBeanManager = beanManager;
-   }
-   
-   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
-   {
-      afterDeploymentValidationCalled = true;
-   }
-   
-   public void observeProcessProducer(@Observes ProcessProducer<Foo, String> event)
-   {
-      processProducerCalled = true;
-   }
-   
-   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<Foo> event)
-   {
-      processInjectionTargetCalled = true;
-   }
-   
-   public void observeProcessManagedBean(@Observes ProcessManagedBean<Foo> event)
-   {
-      processManagedBeanCalled = true;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+import javax.enterprise.inject.spi.ProcessProducer;
+
+public class Observer2 extends ObserverBase implements Extension
+{
+   
+   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
+   {
+      this.afterBeanDiscoveryCalled = true;
+   }
+   
+   public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
+   {
+      this.beforeBeanDiscoveryCalled = true;
+      this.beforeBeanDiscoveryBeanManager = beanManager;
+   }
+   
+   public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
+   {
+      afterDeploymentValidationCalled = true;
+   }
+   
+   public void observeProcessProducer(@Observes ProcessProducer<Foo, String> event)
+   {
+      processProducerCalled = true;
+   }
+   
+   public void observeProcessInjectionTarget(@Observes ProcessInjectionTarget<Foo> event)
+   {
+      processInjectionTargetCalled = true;
+   }
+   
+   public void observeProcessManagedBean(@Observes ProcessManagedBean<Foo> event)
+   {
+      processManagedBeanCalled = true;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-public class ObserverBase
-{
-
-   protected boolean afterBeanDiscoveryCalled;
-   protected boolean beforeBeanDiscoveryCalled;
-   protected boolean afterDeploymentValidationCalled;
-   protected boolean processProducerCalled;
-   protected boolean processInjectionTargetCalled;
-   protected boolean processManagedBeanCalled;
-   
-   protected BeanManager beforeBeanDiscoveryBeanManager;
-
-   public ObserverBase()
-   {
-      super();
-   }
-
-   public boolean isAfterBeanDiscoveryCalled()
-   {
-      return afterBeanDiscoveryCalled;
-   }
-
-   public boolean isBeforeBeanDiscoveryCalled()
-   {
-      return beforeBeanDiscoveryCalled;
-   }
-
-   public boolean isAfterDeploymentValidationCalled()
-   {
-      return afterDeploymentValidationCalled;
-   }
-
-   public boolean isProcessProducerCalled()
-   {
-      return processProducerCalled;
-   }
-
-   public boolean isProcessInjectionTargetCalled()
-   {
-      return processInjectionTargetCalled;
-   }
-
-   public boolean isProcessManagedBeanCalled()
-   {
-      return processManagedBeanCalled;
-   }
-   
-   public BeanManager getBeforeBeanDiscoveryBeanManager()
-   {
-      return beforeBeanDiscoveryBeanManager;
-   }
-
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.extensions;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+public class ObserverBase
+{
+
+   protected boolean afterBeanDiscoveryCalled;
+   protected boolean beforeBeanDiscoveryCalled;
+   protected boolean afterDeploymentValidationCalled;
+   protected boolean processProducerCalled;
+   protected boolean processInjectionTargetCalled;
+   protected boolean processManagedBeanCalled;
+   
+   protected BeanManager beforeBeanDiscoveryBeanManager;
+
+   public ObserverBase()
+   {
+      super();
+   }
+
+   public boolean isAfterBeanDiscoveryCalled()
+   {
+      return afterBeanDiscoveryCalled;
+   }
+
+   public boolean isBeforeBeanDiscoveryCalled()
+   {
+      return beforeBeanDiscoveryCalled;
+   }
+
+   public boolean isAfterDeploymentValidationCalled()
+   {
+      return afterDeploymentValidationCalled;
+   }
+
+   public boolean isProcessProducerCalled()
+   {
+      return processProducerCalled;
+   }
+
+   public boolean isProcessInjectionTargetCalled()
+   {
+      return processInjectionTargetCalled;
+   }
+
+   public boolean isProcessManagedBeanCalled()
+   {
+      return processManagedBeanCalled;
+   }
+   
+   public BeanManager getBeforeBeanDiscoveryBeanManager()
+   {
+      return beforeBeanDiscoveryBeanManager;
+   }
+
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
-
-import javax.enterprise.inject.Alternative;
-
- at Alternative
-public class Alt
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
+
+import javax.enterprise.inject.Alternative;
+
+ at Alternative
+public class Alt
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
-
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-
-public class Bar
-{
-   
-   @Inject private Foo foo;
-   
-   // Inject the bean manager to make sure the bean is intranstive
-   @Inject private BeanManager beanManager;
-   
-   // Inject the @New bean to make sure the bean is intranstive   
-   @Inject @New String str;
-   
-   public Foo getFoo()
-   {
-      return foo;
-   }
-   
-   public BeanManager getBeanManager()
-   {
-      return beanManager;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
+
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+public class Bar
+{
+   
+   @Inject private Foo foo;
+   
+   // Inject the bean manager to make sure the bean is intranstive
+   @Inject private BeanManager beanManager;
+   
+   // Inject the @New bean to make sure the bean is intranstive   
+   @Inject @New String str;
+   
+   public Foo getFoo()
+   {
+      return foo;
+   }
+   
+   public BeanManager getBeanManager()
+   {
+      return beanManager;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
-
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-
-public class Foo
-{
-   
-   // Inject the bean manager to make sure the bean is intranstive  
-   @Inject private BeanManager beanManager;
-   
-   // Inject the @New bean to make sure the bean is intranstive
-   @Inject @New String str;
-   
-   public BeanManager getBeanManager()
-   {
-      return beanManager;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
+
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+public class Foo
+{
+   
+   // Inject the bean manager to make sure the bean is intranstive  
+   @Inject private BeanManager beanManager;
+   
+   // Inject the @New bean to make sure the bean is intranstive
+   @Inject @New String str;
+   
+   public BeanManager getBeanManager()
+   {
+      return beanManager;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
-
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.mock.AbstractMockDeployment;
-import org.jboss.weld.mock.MockBeanDeploymentArchive;
-import org.jboss.weld.mock.MockDeployment;
-import org.jboss.weld.mock.MockServletLifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.Test;
-
-public class TransitiveResolutionTest
-{
-
-   @Test(description = "WELD-319")
-   public void testBeansXmlIsolation()
-   {
-      MockBeanDeploymentArchive jar1 = new MockBeanDeploymentArchive("first-jar", Alt.class);
-      MockBeanDeploymentArchive jar2 = new MockBeanDeploymentArchive("second-jar", Alt.class);
-      jar1.getBeansXml().add(getClass().getResource("beans.xml"));
-      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war");
-      war.getBeanDeploymentArchives().add(jar1);
-      war.getBeanDeploymentArchives().add(jar2);
-      
-      Deployment deployment = new MockDeployment(war);
-      
-      TestContainer container = null;
-      try
-      {
-         container = new TestContainer(new MockServletLifecycle(deployment, war)).startContainer().ensureRequestActive();
-         BeanManagerImpl warBeanManager = container.getBeanManager();
-         BeanManagerImpl jar1BeanManager = container.getLifecycle().getBootstrap().getManager(jar1);         
-         BeanManagerImpl jar2BeanManager = container.getLifecycle().getBootstrap().getManager(jar2);
-         assert warBeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-         assert !jar1BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-         assert jar2BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-      }
-      finally
-      {
-         if (container != null)
-         {
-            container.stopContainer();
-         }
-      }
-   }
-   
-   @Test(description = "WELD-319")
-   public void testBeansXmlMultipleEnabling()
-   {
-      MockBeanDeploymentArchive jar1 = new MockBeanDeploymentArchive("first-jar", Alt.class);
-      MockBeanDeploymentArchive jar2 = new MockBeanDeploymentArchive("second-jar", Alt.class);
-      jar1.getBeansXml().add(getClass().getResource("beans.xml"));
-      jar2.getBeansXml().add(getClass().getResource("beans.xml"));
-      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war");
-      war.getBeanDeploymentArchives().add(jar1);
-      war.getBeanDeploymentArchives().add(jar2);
-      
-      Deployment deployment = new MockDeployment(war);
-      
-      TestContainer container = null;
-      try
-      {
-         container = new TestContainer(new MockServletLifecycle(deployment, war)).startContainer().ensureRequestActive();
-         BeanManagerImpl warBeanManager = container.getBeanManager();
-         BeanManagerImpl jar1BeanManager = container.getLifecycle().getBootstrap().getManager(jar1);         
-         BeanManagerImpl jar2BeanManager = container.getLifecycle().getBootstrap().getManager(jar2);
-         assert warBeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-         assert !jar1BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-         assert !jar2BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
-      }
-      finally
-      {
-         if (container != null)
-         {
-            container.stopContainer();
-         }
-      }
-   }   
-
-   @Test(description = "WELD-236")
-   public void testTypicalEarStructure()
-   {
-
-      // Create the BDA in which we will deploy Foo. This is equivalent to a ejb
-      // jar
-      final MockBeanDeploymentArchive ejbJar = new MockBeanDeploymentArchive("ejb-jar", Foo.class);
-
-      // Create the BDA in which we will deploy Bar. This is equivalent to a war
-      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war", Bar.class);
-
-      // The war can access the ejb jar
-      war.getBeanDeploymentArchives().add(ejbJar);
-
-      // Create a deployment, any other classes are put into the ejb-jar (not
-      // relevant to test)
-      Deployment deployment = new AbstractMockDeployment(war, ejbJar)
-      {
-
-         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
-         {
-            return ejbJar;
-         }
-
-      };
-
-      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, war));
-      container.startContainer();
-      container.ensureRequestActive();
-
-      // Get the bean manager for war and ejb jar
-      BeanManagerImpl warBeanManager = container.getBeanManager();
-      BeanManagerImpl ejbJarBeanManager = container.getLifecycle().getBootstrap().getManager(ejbJar);
-
-      assert warBeanManager.getBeans(Bar.class).size() == 1;
-      assert warBeanManager.getBeans(Foo.class).size() == 1;
-      assert ejbJarBeanManager.getBeans(Foo.class).size() == 1;
-      assert ejbJarBeanManager.getBeans(Bar.class).size() == 0;
-      Bar bar = Utils.getReference(warBeanManager, Bar.class);
-      assert bar.getFoo() != null;
-      assert bar.getBeanManager() != null;
-      assert bar.getBeanManager().equals(warBeanManager);
-      assert bar.getFoo().getBeanManager().equals(ejbJarBeanManager);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.nonTransitiveResolution;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.mock.AbstractMockDeployment;
+import org.jboss.weld.mock.MockBeanDeploymentArchive;
+import org.jboss.weld.mock.MockDeployment;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.Test;
+
+public class TransitiveResolutionTest
+{
+
+   @Test(description = "WELD-319")
+   public void testBeansXmlIsolation()
+   {
+      MockBeanDeploymentArchive jar1 = new MockBeanDeploymentArchive("first-jar", Alt.class);
+      MockBeanDeploymentArchive jar2 = new MockBeanDeploymentArchive("second-jar", Alt.class);
+      jar1.getBeansXml().add(getClass().getResource("beans.xml"));
+      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war");
+      war.getBeanDeploymentArchives().add(jar1);
+      war.getBeanDeploymentArchives().add(jar2);
+      
+      Deployment deployment = new MockDeployment(war);
+      
+      TestContainer container = null;
+      try
+      {
+         container = new TestContainer(new MockServletLifecycle(deployment, war)).startContainer().ensureRequestActive();
+         BeanManagerImpl warBeanManager = container.getBeanManager();
+         BeanManagerImpl jar1BeanManager = container.getLifecycle().getBootstrap().getManager(jar1);         
+         BeanManagerImpl jar2BeanManager = container.getLifecycle().getBootstrap().getManager(jar2);
+         assert warBeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+         assert !jar1BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+         assert jar2BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+      }
+      finally
+      {
+         if (container != null)
+         {
+            container.stopContainer();
+         }
+      }
+   }
+   
+   @Test(description = "WELD-319")
+   public void testBeansXmlMultipleEnabling()
+   {
+      MockBeanDeploymentArchive jar1 = new MockBeanDeploymentArchive("first-jar", Alt.class);
+      MockBeanDeploymentArchive jar2 = new MockBeanDeploymentArchive("second-jar", Alt.class);
+      jar1.getBeansXml().add(getClass().getResource("beans.xml"));
+      jar2.getBeansXml().add(getClass().getResource("beans.xml"));
+      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war");
+      war.getBeanDeploymentArchives().add(jar1);
+      war.getBeanDeploymentArchives().add(jar2);
+      
+      Deployment deployment = new MockDeployment(war);
+      
+      TestContainer container = null;
+      try
+      {
+         container = new TestContainer(new MockServletLifecycle(deployment, war)).startContainer().ensureRequestActive();
+         BeanManagerImpl warBeanManager = container.getBeanManager();
+         BeanManagerImpl jar1BeanManager = container.getLifecycle().getBootstrap().getManager(jar1);         
+         BeanManagerImpl jar2BeanManager = container.getLifecycle().getBootstrap().getManager(jar2);
+         assert warBeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+         assert !jar1BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+         assert !jar2BeanManager.getEnabledClasses().getAlternativeClasses().isEmpty();
+      }
+      finally
+      {
+         if (container != null)
+         {
+            container.stopContainer();
+         }
+      }
+   }   
+
+   @Test(description = "WELD-236")
+   public void testTypicalEarStructure()
+   {
+
+      // Create the BDA in which we will deploy Foo. This is equivalent to a ejb
+      // jar
+      final MockBeanDeploymentArchive ejbJar = new MockBeanDeploymentArchive("ejb-jar", Foo.class);
+
+      // Create the BDA in which we will deploy Bar. This is equivalent to a war
+      MockBeanDeploymentArchive war = new MockBeanDeploymentArchive("war", Bar.class);
+
+      // The war can access the ejb jar
+      war.getBeanDeploymentArchives().add(ejbJar);
+
+      // Create a deployment, any other classes are put into the ejb-jar (not
+      // relevant to test)
+      Deployment deployment = new AbstractMockDeployment(war, ejbJar)
+      {
+
+         public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+         {
+            return ejbJar;
+         }
+
+      };
+
+      TestContainer container = new TestContainer(new MockServletLifecycle(deployment, war));
+      container.startContainer();
+      container.ensureRequestActive();
+
+      // Get the bean manager for war and ejb jar
+      BeanManagerImpl warBeanManager = container.getBeanManager();
+      BeanManagerImpl ejbJarBeanManager = container.getLifecycle().getBootstrap().getManager(ejbJar);
+
+      assert warBeanManager.getBeans(Bar.class).size() == 1;
+      assert warBeanManager.getBeans(Foo.class).size() == 1;
+      assert ejbJarBeanManager.getBeans(Foo.class).size() == 1;
+      assert ejbJarBeanManager.getBeans(Bar.class).size() == 0;
+      Bar bar = Utils.getReference(warBeanManager, Bar.class);
+      assert bar.getFoo() != null;
+      assert bar.getBeanManager() != null;
+      assert bar.getBeanManager().equals(warBeanManager);
+      assert bar.getFoo().getBeanManager().equals(ejbJarBeanManager);
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,177 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.weld.Container;
-import org.jboss.weld.bean.ManagedBean;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.bean.interceptor.InterceptionMetadataService;
-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.WeldClass;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.manager.EnabledClasses;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.metadata.cache.MetaAnnotationStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.serialization.ContextualStoreImpl;
-import org.jboss.weld.serialization.spi.ContextualStore;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class AccessibleManagerResolutionTest
-{
-   
-   private ClassTransformer classTransformer;
-   private ServiceRegistry services;
-   
-   @BeforeMethod
-   public void beforeMethod()
-   {
-      this.classTransformer = new ClassTransformer(new TypeStore());
-      this.services = new SimpleServiceRegistry();
-      this.services.add(MetaAnnotationStore.class, new MetaAnnotationStore(classTransformer));
-      this.services.add(ContextualStore.class, new ContextualStoreImpl());
-      this.services.add(InterceptionMetadataService.class, new InterceptionMetadataService());
-      this.services.add(ClassTransformer.class, classTransformer);
-   }
-   
-   private void addBean(BeanManagerImpl manager, Class<?> c)
-   {
-      WeldClass<?> clazz = WeldClassImpl.of(c, classTransformer);
-      RIBean<?> bean = ManagedBean.of(clazz, manager);
-      manager.addBean(bean);
-      BeanDeployerEnvironment environment = new BeanDeployerEnvironment(new EjbDescriptors(), manager);
-      bean.initialize(environment);
-   }
-   
-   @Test
-   public void testAccessibleDynamicallySingleLevel()
-   {
-      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
-      Container.initialize(root, services);
-      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
-      addBean(root, Cow.class);
-      assert root.getBeans(Cow.class).size() == 1;
-      assert child.getBeans(Cow.class).size() == 0;
-      child.addAccessibleBeanManager(root);
-      Set<Bean<?>> beans = child.getBeans(Cow.class);
-      assert child.getBeans(Cow.class).size() == 1;
-      addBean(child, Chicken.class);
-      assert child.getBeans(Chicken.class).size() == 1;
-      assert root.getBeans(Chicken.class).size() == 0;
-   }
-   
-   @Test
-   public void testAccessibleThreeLevelsWithMultiple()
-   {
-      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
-      Container.initialize(root, services);
-      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
-      BeanManagerImpl child1 = BeanManagerImpl.newRootManager("child1", services, new EnabledClasses());
-      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
-      BeanManagerImpl greatGrandchild = BeanManagerImpl.newRootManager("greatGrandchild", services, new EnabledClasses());
-      child.addAccessibleBeanManager(root);
-      grandchild.addAccessibleBeanManager(child1);
-      grandchild.addAccessibleBeanManager(child);
-      addBean(greatGrandchild, Cat.class);
-      greatGrandchild.addAccessibleBeanManager(grandchild);
-      addBean(root, Cow.class);
-      addBean(child, Chicken.class);
-      addBean(grandchild, Pig.class);
-      addBean(child1, Horse.class);
-      assert root.getBeans(Pig.class).size() == 0;
-      assert root.getBeans(Chicken.class).size() == 0;
-      assert root.getBeans(Cow.class).size() == 1;
-      assert root.getBeans(Horse.class).size() == 0;
-      assert root.getBeans(Cat.class).size() == 0;
-      assert child.getBeans(Pig.class).size() == 0;
-      assert child.getBeans(Chicken.class).size() == 1;
-      assert child.getBeans(Cow.class).size() == 1;
-      assert child.getBeans(Horse.class).size() == 0;
-      assert child.getBeans(Cat.class).size() == 0;
-      assert child1.getBeans(Cow.class).size() == 0;
-      assert child1.getBeans(Horse.class).size() == 1;
-      assert grandchild.getBeans(Pig.class).size() == 1;
-      assert grandchild.getBeans(Chicken.class).size() == 1;
-      assert grandchild.getBeans(Cow.class).size() == 1;
-      assert grandchild.getBeans(Horse.class).size() ==1;
-      assert grandchild.getBeans(Cat.class).size() == 0;
-      assert greatGrandchild.getBeans(Pig.class).size() == 1;
-      assert greatGrandchild.getBeans(Chicken.class).size() == 1;
-      assert greatGrandchild.getBeans(Cow.class).size() == 1;
-      assert greatGrandchild.getBeans(Horse.class).size() ==1;
-      assert greatGrandchild.getBeans(Cat.class).size() == 1;
-   }
-   
-   @Test
-   public void testSameManagerAddedTwice()
-   {
-      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
-      Container.initialize(root, services);
-      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
-      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
-      grandchild.addAccessibleBeanManager(child);
-      child.addAccessibleBeanManager(root);
-      grandchild.addAccessibleBeanManager(root);
-      addBean(root, Cow.class);
-      addBean(child, Chicken.class);
-      addBean(grandchild, Pig.class);
-      assert root.getBeans(Pig.class).size() == 0;
-      assert root.getBeans(Chicken.class).size() == 0;
-      assert root.getBeans(Cow.class).size() == 1;
-      assert child.getBeans(Pig.class).size() == 0;
-      assert child.getBeans(Chicken.class).size() == 1;
-      assert child.getBeans(Cow.class).size() == 1;
-      assert grandchild.getBeans(Pig.class).size() == 1;
-      assert grandchild.getBeans(Chicken.class).size() == 1;
-      assert grandchild.getBeans(Cow.class).size() == 1;
-   }
-   
-   @Test
-   public void testCircular()
-   {
-      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
-      Container.initialize(root, services);
-      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
-      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
-      grandchild.addAccessibleBeanManager(child);
-      child.addAccessibleBeanManager(root);
-      grandchild.addAccessibleBeanManager(root);
-      root.addAccessibleBeanManager(grandchild);
-      addBean(root, Cow.class);
-      addBean(child, Chicken.class);
-      addBean(grandchild, Pig.class);
-      assert root.getBeans(Pig.class).size() == 1;
-      assert root.getBeans(Chicken.class).size() == 1;
-      assert root.getBeans(Cow.class).size() == 1;
-      assert child.getBeans(Pig.class).size() == 1;
-      assert child.getBeans(Chicken.class).size() == 1;
-      assert child.getBeans(Cow.class).size() == 1;
-      assert grandchild.getBeans(Pig.class).size() == 1;
-      assert grandchild.getBeans(Chicken.class).size() == 1;
-      assert grandchild.getBeans(Cow.class).size() == 1;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.weld.Container;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bean.interceptor.InterceptionMetadataService;
+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.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.manager.EnabledClasses;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.metadata.cache.MetaAnnotationStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.serialization.ContextualStoreImpl;
+import org.jboss.weld.serialization.spi.ContextualStore;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class AccessibleManagerResolutionTest
+{
+   
+   private ClassTransformer classTransformer;
+   private ServiceRegistry services;
+   
+   @BeforeMethod
+   public void beforeMethod()
+   {
+      this.classTransformer = new ClassTransformer(new TypeStore());
+      this.services = new SimpleServiceRegistry();
+      this.services.add(MetaAnnotationStore.class, new MetaAnnotationStore(classTransformer));
+      this.services.add(ContextualStore.class, new ContextualStoreImpl());
+      this.services.add(InterceptionMetadataService.class, new InterceptionMetadataService());
+      this.services.add(ClassTransformer.class, classTransformer);
+   }
+   
+   private void addBean(BeanManagerImpl manager, Class<?> c)
+   {
+      WeldClass<?> clazz = WeldClassImpl.of(c, classTransformer);
+      RIBean<?> bean = ManagedBean.of(clazz, manager);
+      manager.addBean(bean);
+      BeanDeployerEnvironment environment = new BeanDeployerEnvironment(new EjbDescriptors(), manager);
+      bean.initialize(environment);
+   }
+   
+   @Test
+   public void testAccessibleDynamicallySingleLevel()
+   {
+      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
+      Container.initialize(root, services);
+      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
+      addBean(root, Cow.class);
+      assert root.getBeans(Cow.class).size() == 1;
+      assert child.getBeans(Cow.class).size() == 0;
+      child.addAccessibleBeanManager(root);
+      Set<Bean<?>> beans = child.getBeans(Cow.class);
+      assert child.getBeans(Cow.class).size() == 1;
+      addBean(child, Chicken.class);
+      assert child.getBeans(Chicken.class).size() == 1;
+      assert root.getBeans(Chicken.class).size() == 0;
+   }
+   
+   @Test
+   public void testAccessibleThreeLevelsWithMultiple()
+   {
+      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
+      Container.initialize(root, services);
+      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
+      BeanManagerImpl child1 = BeanManagerImpl.newRootManager("child1", services, new EnabledClasses());
+      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
+      BeanManagerImpl greatGrandchild = BeanManagerImpl.newRootManager("greatGrandchild", services, new EnabledClasses());
+      child.addAccessibleBeanManager(root);
+      grandchild.addAccessibleBeanManager(child1);
+      grandchild.addAccessibleBeanManager(child);
+      addBean(greatGrandchild, Cat.class);
+      greatGrandchild.addAccessibleBeanManager(grandchild);
+      addBean(root, Cow.class);
+      addBean(child, Chicken.class);
+      addBean(grandchild, Pig.class);
+      addBean(child1, Horse.class);
+      assert root.getBeans(Pig.class).size() == 0;
+      assert root.getBeans(Chicken.class).size() == 0;
+      assert root.getBeans(Cow.class).size() == 1;
+      assert root.getBeans(Horse.class).size() == 0;
+      assert root.getBeans(Cat.class).size() == 0;
+      assert child.getBeans(Pig.class).size() == 0;
+      assert child.getBeans(Chicken.class).size() == 1;
+      assert child.getBeans(Cow.class).size() == 1;
+      assert child.getBeans(Horse.class).size() == 0;
+      assert child.getBeans(Cat.class).size() == 0;
+      assert child1.getBeans(Cow.class).size() == 0;
+      assert child1.getBeans(Horse.class).size() == 1;
+      assert grandchild.getBeans(Pig.class).size() == 1;
+      assert grandchild.getBeans(Chicken.class).size() == 1;
+      assert grandchild.getBeans(Cow.class).size() == 1;
+      assert grandchild.getBeans(Horse.class).size() ==1;
+      assert grandchild.getBeans(Cat.class).size() == 0;
+      assert greatGrandchild.getBeans(Pig.class).size() == 1;
+      assert greatGrandchild.getBeans(Chicken.class).size() == 1;
+      assert greatGrandchild.getBeans(Cow.class).size() == 1;
+      assert greatGrandchild.getBeans(Horse.class).size() ==1;
+      assert greatGrandchild.getBeans(Cat.class).size() == 1;
+   }
+   
+   @Test
+   public void testSameManagerAddedTwice()
+   {
+      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
+      Container.initialize(root, services);
+      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
+      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
+      grandchild.addAccessibleBeanManager(child);
+      child.addAccessibleBeanManager(root);
+      grandchild.addAccessibleBeanManager(root);
+      addBean(root, Cow.class);
+      addBean(child, Chicken.class);
+      addBean(grandchild, Pig.class);
+      assert root.getBeans(Pig.class).size() == 0;
+      assert root.getBeans(Chicken.class).size() == 0;
+      assert root.getBeans(Cow.class).size() == 1;
+      assert child.getBeans(Pig.class).size() == 0;
+      assert child.getBeans(Chicken.class).size() == 1;
+      assert child.getBeans(Cow.class).size() == 1;
+      assert grandchild.getBeans(Pig.class).size() == 1;
+      assert grandchild.getBeans(Chicken.class).size() == 1;
+      assert grandchild.getBeans(Cow.class).size() == 1;
+   }
+   
+   @Test
+   public void testCircular()
+   {
+      BeanManagerImpl root = BeanManagerImpl.newRootManager("root", services, new EnabledClasses());
+      Container.initialize(root, services);
+      BeanManagerImpl child = BeanManagerImpl.newRootManager("child", services, new EnabledClasses());
+      BeanManagerImpl grandchild = BeanManagerImpl.newRootManager("grandchild", services, new EnabledClasses());
+      grandchild.addAccessibleBeanManager(child);
+      child.addAccessibleBeanManager(root);
+      grandchild.addAccessibleBeanManager(root);
+      root.addAccessibleBeanManager(grandchild);
+      addBean(root, Cow.class);
+      addBean(child, Chicken.class);
+      addBean(grandchild, Pig.class);
+      assert root.getBeans(Pig.class).size() == 1;
+      assert root.getBeans(Chicken.class).size() == 1;
+      assert root.getBeans(Cow.class).size() == 1;
+      assert child.getBeans(Pig.class).size() == 1;
+      assert child.getBeans(Chicken.class).size() == 1;
+      assert child.getBeans(Cow.class).size() == 1;
+      assert grandchild.getBeans(Pig.class).size() == 1;
+      assert grandchild.getBeans(Chicken.class).size() == 1;
+      assert grandchild.getBeans(Cow.class).size() == 1;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-/**
- * @author pmuir
- *
- */
-public class Cat
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Cat
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-/**
- * @author pmuir
- *
- */
-public class Chicken
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Chicken
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-/**
- * @author pmuir
- *
- */
-public class Cow
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Cow
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-/**
- * @author pmuir
- *
- */
-public class Horse
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Horse
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
-
-/**
- * @author pmuir
- *
- */
-public class Pig
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.deployment.structure.resolution;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Pig
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-interface DeadlyAnimal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+interface DeadlyAnimal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-interface DeadlySpider extends DeadlyAnimal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+interface DeadlySpider extends DeadlyAnimal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-class DefangedTarantula extends Tarantula
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+class DefangedTarantula extends Tarantula
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Named;
-
- at Stateful
- at Tame
- at Named("Pongo")
-class Hound implements HoundLocal
-{ 
-   @Remove
-   public void bye() {
-   }
-
-   public void ping()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Named;
+
+ at Stateful
+ at Tame
+ at Named("Pongo")
+class Hound implements HoundLocal
+{ 
+   @Remove
+   public void bye() {
+   }
+
+   public void ping()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.ejb.Local;
-
- at Local
-public interface HoundLocal
-{
-   
-   public void ping();
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HoundLocal
+{
+   
+   public void ping();
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.inject.Named;
-
- at Named
-class Salmon implements ScottishFish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.inject.Named;
+
+ at Named
+class Salmon implements ScottishFish
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-interface ScottishFish extends Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+interface ScottishFish extends Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class SeaBass implements Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class SeaBass implements Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,119 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.weld.bean.ManagedBean;
-import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.manager.BeanManagerImpl;
-import org.jboss.weld.mock.MockServletLifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.jboss.weld.test.Utils;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-public class ServletEnvironmentTest
-{
-   
-   private TestContainer container;
-   private BeanManagerImpl manager;
-   
-   @BeforeClass
-   public void beforeClass() throws Throwable
-   {
-      container = new TestContainer(new MockServletLifecycle(), Arrays.asList(Animal.class, DeadlyAnimal.class, DeadlySpider.class, DeadlyAnimal.class, Hound.class, HoundLocal.class, Salmon.class, ScottishFish.class, SeaBass.class, Sole.class, Spider.class, Tarantula.class, TarantulaProducer.class, Tuna.class), null);
-      container.startContainer();
-      container.ensureRequestActive();
-      manager = container.getBeanManager();
-   }
-   
-   @AfterClass(alwaysRun=true)
-   public void afterClass() throws Exception
-   {
-      container.stopContainer();
-      container = null;
-      manager = null;
-   }
-   
-   @Test
-   public void testSimpleBeans()
-   {
-      Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : manager.getBeans())
-      {
-         if (bean instanceof RIBean<?>)
-         {
-            beans.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert beans.containsKey(Tuna.class);
-      assert beans.containsKey(Salmon.class);
-      assert beans.containsKey(SeaBass.class);
-      assert beans.containsKey(Sole.class);
-      
-      assert beans.get(Tuna.class) instanceof ManagedBean<?>;
-      assert beans.get(Salmon.class) instanceof ManagedBean<?>;
-      assert beans.get(SeaBass.class) instanceof ManagedBean<?>;
-      assert beans.get(Sole.class) instanceof ManagedBean<?>;
-      Utils.getReference(manager, Sole.class, new AnnotationLiteral<Whitefish>() {}).ping();
-   }
-   
-   @Test
-   public void testProducerMethodBean()
-   {
-      Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : manager.getBeans())
-      {
-         if (bean instanceof RIBean<?>)
-         {
-            beans.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert beans.containsKey(TarantulaProducer.class);
-      assert beans.containsKey(Tarantula.class);
-      
-      beans.get(TarantulaProducer.class);
-      
-      assert beans.get(TarantulaProducer.class) instanceof ManagedBean<?>;
-      Utils.getReference(manager, Tarantula.class, new AnnotationLiteral<Tame>() {}).ping();
-   }
-   
-   public void testSingleEnterpriseBean()
-   {
-      List<Bean<?>> beans = manager.getBeans();
-      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
-      for (Bean<?> bean : beans)
-      {
-         if (bean instanceof RIBean<?>)
-         {
-            classes.put(((RIBean<?>) bean).getType(), bean);
-         }
-      }
-      assert classes.containsKey(Hound.class);
-      assert classes.get(Hound.class) instanceof ManagedBean<?>;
-      Utils.getReference(manager, HoundLocal.class, new AnnotationLiteral<Tame>() {}).ping();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.test.Utils;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ServletEnvironmentTest
+{
+   
+   private TestContainer container;
+   private BeanManagerImpl manager;
+   
+   @BeforeClass
+   public void beforeClass() throws Throwable
+   {
+      container = new TestContainer(new MockServletLifecycle(), Arrays.asList(Animal.class, DeadlyAnimal.class, DeadlySpider.class, DeadlyAnimal.class, Hound.class, HoundLocal.class, Salmon.class, ScottishFish.class, SeaBass.class, Sole.class, Spider.class, Tarantula.class, TarantulaProducer.class, Tuna.class), null);
+      container.startContainer();
+      container.ensureRequestActive();
+      manager = container.getBeanManager();
+   }
+   
+   @AfterClass(alwaysRun=true)
+   public void afterClass() throws Exception
+   {
+      container.stopContainer();
+      container = null;
+      manager = null;
+   }
+   
+   @Test
+   public void testSimpleBeans()
+   {
+      Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : manager.getBeans())
+      {
+         if (bean instanceof RIBean<?>)
+         {
+            beans.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert beans.containsKey(Tuna.class);
+      assert beans.containsKey(Salmon.class);
+      assert beans.containsKey(SeaBass.class);
+      assert beans.containsKey(Sole.class);
+      
+      assert beans.get(Tuna.class) instanceof ManagedBean<?>;
+      assert beans.get(Salmon.class) instanceof ManagedBean<?>;
+      assert beans.get(SeaBass.class) instanceof ManagedBean<?>;
+      assert beans.get(Sole.class) instanceof ManagedBean<?>;
+      Utils.getReference(manager, Sole.class, new AnnotationLiteral<Whitefish>() {}).ping();
+   }
+   
+   @Test
+   public void testProducerMethodBean()
+   {
+      Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : manager.getBeans())
+      {
+         if (bean instanceof RIBean<?>)
+         {
+            beans.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert beans.containsKey(TarantulaProducer.class);
+      assert beans.containsKey(Tarantula.class);
+      
+      beans.get(TarantulaProducer.class);
+      
+      assert beans.get(TarantulaProducer.class) instanceof ManagedBean<?>;
+      Utils.getReference(manager, Tarantula.class, new AnnotationLiteral<Tame>() {}).ping();
+   }
+   
+   public void testSingleEnterpriseBean()
+   {
+      List<Bean<?>> beans = manager.getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean<?>)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(Hound.class);
+      assert classes.get(Hound.class) instanceof ManagedBean<?>;
+      Utils.getReference(manager, HoundLocal.class, new AnnotationLiteral<Tame>() {}).ping();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * A set of tests that validates that the contexts are properly created and
- * destroyed from the perspective of a servlet environment.
- * 
- * TODO PLM this test is severely broken in design due to a lack of
- * understanding of how lifecycle is built (it is an application singleton, it
- * can't just be replaced). If it starts to fail, it needs rewriting to be an
- * i/c test that runs in a servlet container OR without using the deployment
- * arch
- * 
- * TODO Rewrite correctly
- * 
- * @author Dan Allen
- */
- at Artifact
-public class ServletLifecycleTest extends AbstractWeldTest
-{
-
-   @Test(groups = "broken")
-   public void testEndSessionWithActiveRequestAndSessionContexts()
-   {
-//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
-//      BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
-//      RequestContext.instance().setBeanStore(requestBeanStore);
-//      RequestContext.instance().setActive(true);
-//
-//      BeanStore sessionBeanStore = new ConcurrentHashMapBeanStore();
-//      SessionContext.instance().setBeanStore(sessionBeanStore);
-//      SessionContext.instance().setActive(true);
-//
-//      HttpSession session = new MockHttpSession("99");
-//      servletLifecycle.endSession(session);
-//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
-//      assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
-   }
-
-   @Test(groups = "broken")
-   public void testEndSessionWithActiveRequestContextOnly()
-   {
-//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
-//      BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
-//      RequestContext.instance().setBeanStore(requestBeanStore);
-//      RequestContext.instance().setActive(true);
-//
-//      HttpSession session = new MockHttpSession("99");
-//      servletLifecycle.endSession(session);
-//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
-//      assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
-   }
-
-   @Test(groups = "broken")
-   public void testEndSessionWithNoActiveRequestOrSessionContexts()
-   {
-//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
-//
-//      HttpSession session = new MockHttpSession("99");
-//      servletLifecycle.endSession(session);
-//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
-//      assert Boolean.FALSE.equals(RequestContext.instance().isActive()) : "Temporary request context should have been deactivated";
-   }
-
-   @BeforeMethod(groups = "broken")
-   public void beforeMethod()
-   {
-//      RequestContext.instance().setBeanStore(null);
-//      RequestContext.instance().setActive(false);
-//      SessionContext.instance().setBeanStore(null);
-//      SessionContext.instance().setActive(false);
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * A set of tests that validates that the contexts are properly created and
+ * destroyed from the perspective of a servlet environment.
+ * 
+ * TODO PLM this test is severely broken in design due to a lack of
+ * understanding of how lifecycle is built (it is an application singleton, it
+ * can't just be replaced). If it starts to fail, it needs rewriting to be an
+ * i/c test that runs in a servlet container OR without using the deployment
+ * arch
+ * 
+ * TODO Rewrite correctly
+ * 
+ * @author Dan Allen
+ */
+ at Artifact
+public class ServletLifecycleTest extends AbstractWeldTest
+{
+
+   @Test(groups = "broken")
+   public void testEndSessionWithActiveRequestAndSessionContexts()
+   {
+//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
+//      BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
+//      RequestContext.instance().setBeanStore(requestBeanStore);
+//      RequestContext.instance().setActive(true);
+//
+//      BeanStore sessionBeanStore = new ConcurrentHashMapBeanStore();
+//      SessionContext.instance().setBeanStore(sessionBeanStore);
+//      SessionContext.instance().setActive(true);
+//
+//      HttpSession session = new MockHttpSession("99");
+//      servletLifecycle.endSession(session);
+//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
+//      assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
+   }
+
+   @Test(groups = "broken")
+   public void testEndSessionWithActiveRequestContextOnly()
+   {
+//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
+//      BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
+//      RequestContext.instance().setBeanStore(requestBeanStore);
+//      RequestContext.instance().setActive(true);
+//
+//      HttpSession session = new MockHttpSession("99");
+//      servletLifecycle.endSession(session);
+//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
+//      assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
+   }
+
+   @Test(groups = "broken")
+   public void testEndSessionWithNoActiveRequestOrSessionContexts()
+   {
+//      ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
+//
+//      HttpSession session = new MockHttpSession("99");
+//      servletLifecycle.endSession(session);
+//      assert Boolean.FALSE.equals(SessionContext.instance().isActive()) : "Session context should no longer be active";
+//      assert Boolean.FALSE.equals(RequestContext.instance().isActive()) : "Temporary request context should have been deactivated";
+   }
+
+   @BeforeMethod(groups = "broken")
+   public void beforeMethod()
+   {
+//      RequestContext.instance().setBeanStore(null);
+//      RequestContext.instance().setActive(false);
+//      SessionContext.instance().setBeanStore(null);
+//      SessionContext.instance().setActive(false);
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.ejb.EJB;
-import javax.inject.Named;
-
- at Whitefish
- at Named("whitefish")
-class Sole implements ScottishFish
-{
-   
-   @EJB HoundLocal hound;
-   
-   public void ping()
-   {
-      
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.ejb.EJB;
+import javax.inject.Named;
+
+ at Whitefish
+ at Named("whitefish")
+class Sole implements ScottishFish
+{
+   
+   @EJB HoundLocal hound;
+   
+   public void ping()
+   {
+      
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-class Spider implements Animal
-{
-
-   public final void layEggs()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+class Spider implements Animal
+{
+
+   public final void layEggs()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-class Tarantula extends Spider implements DeadlySpider
-{
-
-   public void ping()
-   {
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+class Tarantula extends Spider implements DeadlySpider
+{
+
+   public void ping()
+   {
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.enterprise.inject.Produces;
-
-public class TarantulaProducer
-{
-   
-   @Produces @Tame public Tarantula produceTameTarantula()
-   {
-      return new DefangedTarantula();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.enterprise.inject.Produces;
+
+public class TarantulaProducer
+{
+   
+   @Produces @Tame public Tarantula produceTameTarantula()
+   {
+      return new DefangedTarantula();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Tuna
-{
-   
-   public String getName()
-   {
-      return "Ophir";
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+import javax.enterprise.context.RequestScoped;
+
+ at RequestScoped
+class Tuna
+{
+   
+   public String getName()
+   {
+      return "Ophir";
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Whitefish
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.environments.servlet;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Whitefish
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.jsf;
-
-import javax.faces.component.behavior.Behavior;
-import javax.faces.context.FacesContext;
-
-import org.jboss.weld.jsf.JsfApiAbstraction;
-import org.jboss.weld.resources.DefaultResourceLoader;
-import org.jboss.weld.resources.spi.ResourceLoader;
-import org.jboss.weld.resources.spi.ResourceLoadingException;
-import org.jboss.weld.util.ApiAbstraction.Dummy;
-import org.testng.annotations.Test;
-
-/**
- * @author Dan Allen
- */
-public class JsfApiAbstractionTest
-{
-   
-   @Test
-   public void testDetectsJsf12Version()
-   {
-      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoaderHidingJsf20Classes());
-      assert abstraction.MINIMUM_API_VERSION == 1.2;
-      assert abstraction.isApiVersionCompatibleWith(2.0) == false;
-   }
-
-   @Test
-   public void testLoadsJsf12Classes()
-   {
-      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoaderHidingJsf20Classes());
-      assert FacesContext.class.equals(abstraction.FACES_CONTEXT);
-      assert Dummy.class.equals(abstraction.BEHAVIOR_CLASS);
-   }
-
-   @Test
-   public void testDetectsJsf20Version()
-   {
-      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoader());
-      assert abstraction.MINIMUM_API_VERSION == 2.0;
-      assert abstraction.isApiVersionCompatibleWith(2.0);
-   }
-
-   @Test
-   public void testLoadsJsf20Classes()
-   {
-      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoader());
-      assert FacesContext.class.equals(abstraction.FACES_CONTEXT);
-      assert Behavior.class.equals(abstraction.BEHAVIOR_CLASS);
-   }
-
-   private ResourceLoader getResourceLoader()
-   {
-      return new DefaultResourceLoader();
-   }
-
-   private ResourceLoader getResourceLoaderHidingJsf20Classes()
-   {
-      return new DefaultResourceLoader()
-      {
-
-         @Override
-         public Class<?> classForName(String name)
-         {
-            if ("javax.faces.component.behavior.Behavior".equals(name))
-            {
-               throw new ResourceLoadingException("Hidden class");
-            }
-            return super.classForName(name);
-         }
-
-      };
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.jsf;
+
+import javax.faces.component.behavior.Behavior;
+import javax.faces.context.FacesContext;
+
+import org.jboss.weld.jsf.JsfApiAbstraction;
+import org.jboss.weld.resources.DefaultResourceLoader;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ResourceLoadingException;
+import org.jboss.weld.util.ApiAbstraction.Dummy;
+import org.testng.annotations.Test;
+
+/**
+ * @author Dan Allen
+ */
+public class JsfApiAbstractionTest
+{
+   
+   @Test
+   public void testDetectsJsf12Version()
+   {
+      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoaderHidingJsf20Classes());
+      assert abstraction.MINIMUM_API_VERSION == 1.2;
+      assert abstraction.isApiVersionCompatibleWith(2.0) == false;
+   }
+
+   @Test
+   public void testLoadsJsf12Classes()
+   {
+      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoaderHidingJsf20Classes());
+      assert FacesContext.class.equals(abstraction.FACES_CONTEXT);
+      assert Dummy.class.equals(abstraction.BEHAVIOR_CLASS);
+   }
+
+   @Test
+   public void testDetectsJsf20Version()
+   {
+      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoader());
+      assert abstraction.MINIMUM_API_VERSION == 2.0;
+      assert abstraction.isApiVersionCompatibleWith(2.0);
+   }
+
+   @Test
+   public void testLoadsJsf20Classes()
+   {
+      JsfApiAbstraction abstraction = new JsfApiAbstraction(getResourceLoader());
+      assert FacesContext.class.equals(abstraction.FACES_CONTEXT);
+      assert Behavior.class.equals(abstraction.BEHAVIOR_CLASS);
+   }
+
+   private ResourceLoader getResourceLoader()
+   {
+      return new DefaultResourceLoader();
+   }
+
+   private ResourceLoader getResourceLoaderHidingJsf20Classes()
+   {
+      return new DefaultResourceLoader()
+      {
+
+         @Override
+         public Class<?> classForName(String name)
+         {
+            if ("javax.faces.component.behavior.Behavior".equals(name))
+            {
+               throw new ResourceLoadingException("Hidden class");
+            }
+            return super.classForName(name);
+         }
+
+      };
+   }
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Method;
-
-import org.testng.annotations.Test;
-
- at Synchronous
-public class AnnotationTest
-{
-   
-   @Test
-   public void testSerializability() throws Throwable
-   {
-      Synchronous synchronous = AnnotationTest.class.getAnnotation(Synchronous.class);
-      deserialize(serialize(synchronous));
-   }
-   
-   @Test
-   public void testGetAnnotationDefaults() throws Throwable
-   {
-      Method method = Quality.class.getMethod("value");
-      Object value = method.getDefaultValue();
-      assert value.equals("very");
-   }
-
-   protected byte[] serialize(Object instance) throws IOException
-   {
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      ObjectOutputStream out = new ObjectOutputStream(bytes);
-      out.writeObject(instance);
-      return bytes.toByteArray();
-   }
-
-   protected <T> T deserialize(byte[] bytes) throws IOException, ClassNotFoundException
-   {
-      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
-      return (T) in.readObject();
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Method;
+
+import org.testng.annotations.Test;
+
+ at Synchronous
+public class AnnotationTest
+{
+   
+   @Test
+   public void testSerializability() throws Throwable
+   {
+      Synchronous synchronous = AnnotationTest.class.getAnnotation(Synchronous.class);
+      deserialize(serialize(synchronous));
+   }
+   
+   @Test
+   public void testGetAnnotationDefaults() throws Throwable
+   {
+      Method method = Quality.class.getMethod("value");
+      Object value = method.getDefaultValue();
+      assert value.equals("very");
+   }
+
+   protected byte[] serialize(Object instance) throws IOException
+   {
+      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+      ObjectOutputStream out = new ObjectOutputStream(bytes);
+      out.writeObject(instance);
+      return bytes.toByteArray();
+   }
+
+   protected <T> T deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+   {
+      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
+      return (T) in.readObject();
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Quality
-{
-   
-   String value() default "very";
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Quality.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Quality
+{
+   
+   String value() default "very";
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Synchronous
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.annotation;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Synchronous
+{
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-interface Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Animal.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+interface Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-
-class Antelope implements Animal
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Antelope.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+
+class Antelope implements Animal
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-
-public class Kangaroo 
-{
-   LittleKangarooInHerPouch<String> procreate()
-   {
-      return new LittleKangarooInHerPouch<String>("Joey");
-   }
-
-   public class LittleKangarooInHerPouch<T>
-   {
-      LittleKangarooInHerPouch(T formalParam)
-      {
-      }
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Kangaroo.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+
+public class Kangaroo 
+{
+   LittleKangarooInHerPouch<String> procreate()
+   {
+      return new LittleKangarooInHerPouch<String>("Joey");
+   }
+
+   public class LittleKangarooInHerPouch<T>
+   {
+      LittleKangarooInHerPouch(T formalParam)
+      {
+      }
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-public class Koala
-{
-   
-   public Animal procreate()
-   {
-      class BabyKoala implements Animal {}
-      return new BabyKoala();
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Koala.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+public class Koala
+{
+   
+   public Animal procreate()
+   {
+      class BabyKoala implements Animal {}
+      return new BabyKoala();
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-
- at Random
-class Order
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Order.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+
+ at Random
+class Order
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-
-public class Possum
-{
-   
-   public Possum procreate()
-   {
-      return new Possum() {};
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Possum.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+
+public class Possum
+{
+   
+   public Possum procreate()
+   {
+      return new Possum() {};
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-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;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
-public @interface Random
-{
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/Random.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Random
+{
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
-
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.inject.Qualifier;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.introspector.WeldClass;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.testng.annotations.Test;
-
- at Artifact
-public class WeldClassTest
-{
-	
-   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-   
-   @Test(groups = "broken", description="WELD-216")
-   public void testMemberClassWithGenericTypes()
-   {
-      AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
-      WeldClassImpl.of(at, transformer);
-   }
-   
-   @Test(description="WELD-216")
-   public void testLocalClassWithGenericTypes()
-   {
-      AnnotatedType at = WeldClassImpl.of(new Koala().procreate().getClass(), transformer);
-      WeldClassImpl.of(at, transformer);
-   }
-   
-   @Test(description="WELD-216")
-   public void testAnonymousClassWithGenericTypes()
-   {
-      AnnotatedType at = WeldClassImpl.of(new Possum().procreate().getClass(), transformer);
-      WeldClassImpl.of(at, transformer);
-   }
-   
-   @Test
-   public void testDeclaredAnnotations()
-   {
-      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
-      assert annotatedElement.getAnnotations().size() == 1;
-      assert annotatedElement.getAnnotation(Random.class) != null;
-      assert annotatedElement.getJavaClass().equals(Order.class);
-   }
-   
-   @Test
-   public void testMetaAnnotations()
-   {
-      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
-      Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
-      assert annotations.size() == 1;
-      Iterator<Annotation> it = annotations.iterator();
-      Annotation production = it.next();
-      assert Random.class.equals(production.annotationType());
-   }
-   
-   @Test
-   public void testEmpty()
-   {
-      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
-      assert annotatedElement.getAnnotation(Stereotype.class) == null;
-      assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
-      WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
-      assert classWithNoAnnotations.getAnnotations().size() == 0;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.clazz;
+
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.inject.Qualifier;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class WeldClassTest
+{
+	
+   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+   
+   @Test(groups = "broken", description="WELD-216")
+   public void testMemberClassWithGenericTypes()
+   {
+      AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
+      WeldClassImpl.of(at, transformer);
+   }
+   
+   @Test(description="WELD-216")
+   public void testLocalClassWithGenericTypes()
+   {
+      AnnotatedType at = WeldClassImpl.of(new Koala().procreate().getClass(), transformer);
+      WeldClassImpl.of(at, transformer);
+   }
+   
+   @Test(description="WELD-216")
+   public void testAnonymousClassWithGenericTypes()
+   {
+      AnnotatedType at = WeldClassImpl.of(new Possum().procreate().getClass(), transformer);
+      WeldClassImpl.of(at, transformer);
+   }
+   
+   @Test
+   public void testDeclaredAnnotations()
+   {
+      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+      assert annotatedElement.getAnnotations().size() == 1;
+      assert annotatedElement.getAnnotation(Random.class) != null;
+      assert annotatedElement.getJavaClass().equals(Order.class);
+   }
+   
+   @Test
+   public void testMetaAnnotations()
+   {
+      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+      Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
+      assert annotations.size() == 1;
+      Iterator<Annotation> it = annotations.iterator();
+      Annotation production = it.next();
+      assert Random.class.equals(production.annotationType());
+   }
+   
+   @Test
+   public void testEmpty()
+   {
+      WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+      assert annotatedElement.getAnnotation(Stereotype.class) == null;
+      assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
+      WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
+      assert classWithNoAnnotations.getAnnotations().size() == 0;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.method;
-
-abstract class ChoiceParent<T>
-{
-}
-
-
-class Choice<T, E> extends ChoiceParent<T>
-{
-   public Choice<T, E> aMethod()
-   {
-      return null;
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/Choice.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.method;
+
+abstract class ChoiceParent<T>
+{
+}
+
+
+class Choice<T, E> extends ChoiceParent<T>
+{
+   public Choice<T, E> aMethod()
+   {
+      return null;
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.method;
-
-import javax.enterprise.util.TypeLiteral;
-
-import org.jboss.weld.introspector.WeldClass;
-import org.jboss.weld.introspector.WeldMethod;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.introspector.jlr.WeldMethodImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.testng.annotations.Test;
-
-public class WeldMethodTest
-{
-	
-   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-   private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
-   
-   @Test(description = "WELD-221")
-   public void testMethodReturnsGenericTypeOfClass() throws Exception
-   {
-      WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
-      WeldMethod<Choice<?, ?>, Choice<?, ?>> method = WeldMethodImpl.of(Choice.class.getMethod("aMethod"), clazz, transformer);
-      assert method.getTypeClosure().size() == 3;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.reflection.method;
+
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.WeldMethod;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.introspector.jlr.WeldMethodImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+public class WeldMethodTest
+{
+	
+   private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+   private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
+   
+   @Test(description = "WELD-221")
+   public void testMethodReturnsGenericTypeOfClass() throws Exception
+   {
+      WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
+      WeldMethod<Choice<?, ?>, Choice<?, ?>> method = WeldMethodImpl.of(Choice.class.getMethod("aMethod"), clazz, transformer);
+      assert method.getTypeClosure().size() == 3;
+   }
+
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.jboss.weld.util.reflection.SecureReflections;
-import org.testng.annotations.Test;
-
-public class ReflectionTest
-{
-
-   @Test
-   public void testGetField() throws NoSuchFieldException
-   {
-      assert SecureReflections.getField(TestObject.class, "publicField") != null;
-   }
-
-   @Test(expectedExceptions = NoSuchFieldException.class)
-   public void testGetFieldNotFound() throws NoSuchFieldException
-   {
-      SecureReflections.getField(TestObject.class, "eioota");
-   }
-
-   @Test
-   public void testGetDeclaredField() throws SecurityException, NoSuchFieldException
-   {
-      assert SecureReflections.getDeclaredField(TestObject.class, "publicField") != null;
-   }
-
-   @Test(expectedExceptions = NoSuchFieldException.class)
-   public void testGetDeclaredFieldNotFound() throws NoSuchFieldException
-   {
-      SecureReflections.getDeclaredField(TestObject.class, "eioota");
-   }
-
-   @Test
-   public void testGetFields()
-   {
-      assert SecureReflections.getFields(TestObject.class).length == 1;
-   }
-
-   @Test
-   public void testGetDeclaredFields()
-   {
-      assert SecureReflections.getDeclaredFields(TestObject.class).length == 2;
-   }
-
-   @Test
-   public void testFieldAccess()
-   {
-      testAllAccessible(grantAccess(SecureReflections.getDeclaredFields(TestObject.class)));
-   }
-   
-   private AccessibleObject[] grantAccess(AccessibleObject[] objects) {
-      for (AccessibleObject object : objects)
-      {
-         if (object instanceof Field) {
-            SecureReflections.ensureAccessible((Field) object);
-         } else if (object instanceof Method) {
-            SecureReflections.ensureAccessible((Method) object);
-         } else if (object instanceof Constructor<?>) {
-            SecureReflections.ensureAccessible((Constructor<?>)object);
-         }
-      }
-      return objects;
-   }
-   
-   private void testAllAccessible(AccessibleObject[] objects)
-   {
-      for (AccessibleObject object : objects)
-      {
-         if (!object.isAccessible())
-         {
-            assert false;
-         }
-      }
-   }
-
-   @Test
-   public void testGetMethod() throws NoSuchMethodException
-   {
-      assert SecureReflections.getMethod(TestObject.class, "publicTest", new Class<?>[] { String.class }) != null;
-   }
-
-   @Test(expectedExceptions = NoSuchMethodException.class)
-   public void testGetMethodNotFound() throws NoSuchMethodException
-   {
-      SecureReflections.getMethod(TestObject.class, "xpublicTest", new Class<?>[] { String.class });
-   }
-
-   @Test
-   public void testGetDeclaredMethod() throws NoSuchMethodException
-   {
-      assert SecureReflections.getDeclaredMethod(TestObject.class, "publicTest", new Class<?>[] { String.class }) != null;
-   }
-
-   @Test(expectedExceptions = NoSuchMethodException.class)
-   public void testGetDeclaredMethodNotFound() throws NoSuchMethodException
-   {
-      SecureReflections.getDeclaredMethod(TestObject.class, "xpublicTest", new Class<?>[] { String.class });
-   }
-
-   @Test
-   public void testGetMethods()
-   {
-      assert SecureReflections.getMethods(TestObject.class).length == 10;
-   }
-
-   @Test
-   public void testGetDeclaredMethods()
-   {
-      assert SecureReflections.getDeclaredMethods(TestObject.class).length == 2;
-   }
-
-   @Test
-   public void testMethodAccess()
-   {
-      testAllAccessible(grantAccess(SecureReflections.getDeclaredMethods(TestObject.class)));
-   }
-
-   @Test
-   public void testGetConstructor() throws NoSuchMethodException
-   {
-      assert SecureReflections.getConstructor(TestObject.class, new Class<?>[] { Integer.class }) != null;
-   }
-
-   @Test(expectedExceptions = NoSuchMethodException.class)
-   public void testGetConstructorNotFound() throws NoSuchMethodException
-   {
-      SecureReflections.getConstructor(TestObject.class, new Class<?>[] { Float.class });
-   }
-
-   @Test
-   public void testGetDeclaredConstructor() throws NoSuchMethodException
-   {
-      assert SecureReflections.getDeclaredConstructor(TestObject.class, new Class<?>[] { String.class }) != null;
-   }
-
-   @Test(expectedExceptions = NoSuchMethodException.class)
-   public void testGetDeclaredConstructorNotFound() throws NoSuchMethodException
-   {
-      SecureReflections.getDeclaredConstructor(TestObject.class, new Class<?>[] { Float.class });
-   }
-
-   @Test
-   public void testGetConstructors()
-   {
-      assert SecureReflections.getConstructors(TestObject.class).length == 2;
-   }
-
-   @Test
-   public void testGetDeclaredConstructors()
-   {
-      assert SecureReflections.getDeclaredConstructors(TestObject.class).length == 3;
-   }
-
-   @Test
-   public void testConstructorAccess()
-   {
-      testAllAccessible(grantAccess(SecureReflections.getDeclaredConstructors(TestObject.class)));
-   }
-
-   @Test
-   public void testNewInstance() throws InstantiationException, IllegalAccessException
-   {
-      assert SecureReflections.newInstance(TestObject.class) != null;
-   }
-
-   @Test
-   public void testInvoke() throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
-   {
-      TestObject to = new TestObject();
-      Method m = TestObject.class.getMethod("publicTest", new Class<?>[] { String.class });
-      assert SecureReflections.invoke(to, m, "").equals("foo");
-   }
-   
-   @Test
-   public void testLookupMethod() throws NoSuchMethodException 
-   {
-      assert SecureReflections.lookupMethod(TestObject.class, "rootOfAllEvil", new Class<?>[]{}) != null;
-   }
-   
-   @Test(expectedExceptions = NoSuchMethodException.class)
-   public void testLookupMethodNotFound() throws NoSuchMethodException 
-   {
-      assert SecureReflections.lookupMethod(TestObject.class, "eioota", new Class<?>[]{}) != null;
-   }
-   
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/ReflectionTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,209 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.jboss.weld.util.reflection.SecureReflections;
+import org.testng.annotations.Test;
+
+public class ReflectionTest
+{
+
+   @Test
+   public void testGetField() throws NoSuchFieldException
+   {
+      assert SecureReflections.getField(TestObject.class, "publicField") != null;
+   }
+
+   @Test(expectedExceptions = NoSuchFieldException.class)
+   public void testGetFieldNotFound() throws NoSuchFieldException
+   {
+      SecureReflections.getField(TestObject.class, "eioota");
+   }
+
+   @Test
+   public void testGetDeclaredField() throws SecurityException, NoSuchFieldException
+   {
+      assert SecureReflections.getDeclaredField(TestObject.class, "publicField") != null;
+   }
+
+   @Test(expectedExceptions = NoSuchFieldException.class)
+   public void testGetDeclaredFieldNotFound() throws NoSuchFieldException
+   {
+      SecureReflections.getDeclaredField(TestObject.class, "eioota");
+   }
+
+   @Test
+   public void testGetFields()
+   {
+      assert SecureReflections.getFields(TestObject.class).length == 1;
+   }
+
+   @Test
+   public void testGetDeclaredFields()
+   {
+      assert SecureReflections.getDeclaredFields(TestObject.class).length == 2;
+   }
+
+   @Test
+   public void testFieldAccess()
+   {
+      testAllAccessible(grantAccess(SecureReflections.getDeclaredFields(TestObject.class)));
+   }
+   
+   private AccessibleObject[] grantAccess(AccessibleObject[] objects) {
+      for (AccessibleObject object : objects)
+      {
+         if (object instanceof Field) {
+            SecureReflections.ensureAccessible((Field) object);
+         } else if (object instanceof Method) {
+            SecureReflections.ensureAccessible((Method) object);
+         } else if (object instanceof Constructor<?>) {
+            SecureReflections.ensureAccessible((Constructor<?>)object);
+         }
+      }
+      return objects;
+   }
+   
+   private void testAllAccessible(AccessibleObject[] objects)
+   {
+      for (AccessibleObject object : objects)
+      {
+         if (!object.isAccessible())
+         {
+            assert false;
+         }
+      }
+   }
+
+   @Test
+   public void testGetMethod() throws NoSuchMethodException
+   {
+      assert SecureReflections.getMethod(TestObject.class, "publicTest", new Class<?>[] { String.class }) != null;
+   }
+
+   @Test(expectedExceptions = NoSuchMethodException.class)
+   public void testGetMethodNotFound() throws NoSuchMethodException
+   {
+      SecureReflections.getMethod(TestObject.class, "xpublicTest", new Class<?>[] { String.class });
+   }
+
+   @Test
+   public void testGetDeclaredMethod() throws NoSuchMethodException
+   {
+      assert SecureReflections.getDeclaredMethod(TestObject.class, "publicTest", new Class<?>[] { String.class }) != null;
+   }
+
+   @Test(expectedExceptions = NoSuchMethodException.class)
+   public void testGetDeclaredMethodNotFound() throws NoSuchMethodException
+   {
+      SecureReflections.getDeclaredMethod(TestObject.class, "xpublicTest", new Class<?>[] { String.class });
+   }
+
+   @Test
+   public void testGetMethods()
+   {
+      assert SecureReflections.getMethods(TestObject.class).length == 10;
+   }
+
+   @Test
+   public void testGetDeclaredMethods()
+   {
+      assert SecureReflections.getDeclaredMethods(TestObject.class).length == 2;
+   }
+
+   @Test
+   public void testMethodAccess()
+   {
+      testAllAccessible(grantAccess(SecureReflections.getDeclaredMethods(TestObject.class)));
+   }
+
+   @Test
+   public void testGetConstructor() throws NoSuchMethodException
+   {
+      assert SecureReflections.getConstructor(TestObject.class, new Class<?>[] { Integer.class }) != null;
+   }
+
+   @Test(expectedExceptions = NoSuchMethodException.class)
+   public void testGetConstructorNotFound() throws NoSuchMethodException
+   {
+      SecureReflections.getConstructor(TestObject.class, new Class<?>[] { Float.class });
+   }
+
+   @Test
+   public void testGetDeclaredConstructor() throws NoSuchMethodException
+   {
+      assert SecureReflections.getDeclaredConstructor(TestObject.class, new Class<?>[] { String.class }) != null;
+   }
+
+   @Test(expectedExceptions = NoSuchMethodException.class)
+   public void testGetDeclaredConstructorNotFound() throws NoSuchMethodException
+   {
+      SecureReflections.getDeclaredConstructor(TestObject.class, new Class<?>[] { Float.class });
+   }
+
+   @Test
+   public void testGetConstructors()
+   {
+      assert SecureReflections.getConstructors(TestObject.class).length == 2;
+   }
+
+   @Test
+   public void testGetDeclaredConstructors()
+   {
+      assert SecureReflections.getDeclaredConstructors(TestObject.class).length == 3;
+   }
+
+   @Test
+   public void testConstructorAccess()
+   {
+      testAllAccessible(grantAccess(SecureReflections.getDeclaredConstructors(TestObject.class)));
+   }
+
+   @Test
+   public void testNewInstance() throws InstantiationException, IllegalAccessException
+   {
+      assert SecureReflections.newInstance(TestObject.class) != null;
+   }
+
+   @Test
+   public void testInvoke() throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
+   {
+      TestObject to = new TestObject();
+      Method m = TestObject.class.getMethod("publicTest", new Class<?>[] { String.class });
+      assert SecureReflections.invoke(to, m, "").equals("foo");
+   }
+   
+   @Test
+   public void testLookupMethod() throws NoSuchMethodException 
+   {
+      assert SecureReflections.lookupMethod(TestObject.class, "rootOfAllEvil", new Class<?>[]{}) != null;
+   }
+   
+   @Test(expectedExceptions = NoSuchMethodException.class)
+   public void testLookupMethodNotFound() throws NoSuchMethodException 
+   {
+      assert SecureReflections.lookupMethod(TestObject.class, "eioota", new Class<?>[]{}) != null;
+   }
+   
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
-
-import java.lang.reflect.Field;
-
-import org.testng.annotations.Test;
-
-/**
- * @author pmuir
- *
- */
-public class SecurityTest
-{
-   
-   private String foo;
-   
-   @Test
-   public void testSetAccessibleDoesNotPropagate() throws Exception
-   {
-      Field field = SecurityTest.class.getDeclaredField("foo");
-      assert !field.isAccessible();
-      field.setAccessible(true);
-      assert field.isAccessible();
-      assert !SecurityTest.class.getDeclaredField("foo").isAccessible();
-      assert SecurityTest.class.getDeclaredField("foo") != SecurityTest.class.getDeclaredField("foo");
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SecurityTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
+
+import java.lang.reflect.Field;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+public class SecurityTest
+{
+   
+   private String foo;
+   
+   @Test
+   public void testSetAccessibleDoesNotPropagate() throws Exception
+   {
+      Field field = SecurityTest.class.getDeclaredField("foo");
+      assert !field.isAccessible();
+      field.setAccessible(true);
+      assert field.isAccessible();
+      assert !SecurityTest.class.getDeclaredField("foo").isAccessible();
+      assert SecurityTest.class.getDeclaredField("foo") != SecurityTest.class.getDeclaredField("foo");
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
-
-public class SuperTestObject
-{
-   protected void rootOfAllEvil() {};
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/SuperTestObject.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
+
+public class SuperTestObject
+{
+   protected void rootOfAllEvil() {};
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
-
-public class TestObject extends SuperTestObject
-{
-   private String privateField;
-   public String publicField;
-   
-   private TestObject(String test)
-   {
-   }
-   
-   public TestObject() {};
-   
-   public TestObject(Integer test) {
-   }
-
-   private void privateTest(String test)
-   {
-   }
-   
-   public String publicTest(String test) 
-   {
-      return "foo";
-   }
-}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/security/TestObject.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.security;
+
+public class TestObject extends SuperTestObject
+{
+   private String privateField;
+   public String publicField;
+   
+   private TestObject(String test)
+   {
+   }
+   
+   public TestObject() {};
+   
+   public TestObject(Integer test) {
+   }
+
+   private void privateTest(String test)
+   {
+   }
+   
+   public String publicTest(String test) 
+   {
+      return "foo";
+   }
+}
\ No newline at end of file

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,168 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
-
-import java.util.Iterator;
-
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.weld.introspector.WeldClass;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
-import org.jboss.weld.util.AnnotatedTypes;
-import org.testng.annotations.Test;
-
-/**
- * Test comparison and id creation for AnnotatedTypes
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- *
- */
-public class AnnotatedTypesTest
-{
-   /**
-    * tests the AnnotatedTypes.compareAnnotatedTypes 
-    */
-   @Test
-   public void testComparison() throws SecurityException, NoSuchFieldException, NoSuchMethodException
-   {
-      //check that two weld classes on the same underlying are equal
-      TypeStore ts = new TypeStore();
-      ClassTransformer ct =new ClassTransformer(ts);
-      WeldClass<Chair> chair1 = WeldClassImpl.of(Chair.class,ct);
-      WeldClass<Chair> chair2 = WeldClassImpl.of(Chair.class,ct);
-      assert AnnotatedTypes.compareAnnotatedTypes(chair1, chair2);
-      
-      //check that a different implementation of annotated type is equal to the weld implementation
-      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToClass(new DefaultLiteral());
-      builder.addToField(Chair.class.getField("legs"), new ProducesLiteral());
-      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
-      AnnotatedType<Chair> chair3 = builder.create();
-      assert AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
-      
-      //check that the implementation returns false if a field annotation changes
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToClass(new DefaultLiteral());
-      builder.addToField(Chair.class.getField("legs"), new DefaultLiteral());
-      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());     
-      chair3 = builder.create();
-      assert !AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
-      
-      //check that the implementation returns false if a class level annotation changes
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToClass(new ProducesLiteral());
-      builder.addToField(Chair.class.getField("legs"), new DefaultLiteral());
-      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral()); 
-      chair3 = builder.create();
-      assert !AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
-      
-   }
-   
-   @Test
-   public void testFieldId() throws SecurityException, NoSuchFieldException
-   {
-      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToField(Chair.class.getField("legs"), new ProducesLiteral());
-      AnnotatedType<Chair> chair3 = builder.create();
-      AnnotatedField<? super Chair> field = chair3.getFields().iterator().next();
-      String id = AnnotatedTypes.createFieldId(field);
-      assert "org.jboss.weld.tests.unit.util.Chair.legs[@javax.enterprise.inject.Produces()]".equals(id): "wrong id for field :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      chair3 = builder.create();
-      field = chair3.getFields().iterator().next();
-      id = AnnotatedTypes.createFieldId(field);
-      assert "org.jboss.weld.tests.unit.util.Chair.legs".equals(id) : "wrong id for field :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToField(Chair.class.getField("legs"), new ComfyChairLiteral());
-      chair3 = builder.create();
-      field = chair3.getFields().iterator().next();
-      id = AnnotatedTypes.createFieldId(field);
-      assert "org.jboss.weld.tests.unit.util.Chair.legs[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]".equals(id) : "wrong id for field :" + id;
-   }
-   
-   @Test
-   public void testMethodId() throws SecurityException, NoSuchMethodException
-   {
-      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
-      AnnotatedType<Chair> chair3 = builder.create();
-      Iterator<AnnotatedMethod<? super Chair>> it = chair3.getMethods().iterator();
-      AnnotatedMethod<? super Chair> method = it.next();
-      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
-      String id = AnnotatedTypes.createCallableId(method);
-      assert "org.jboss.weld.tests.unit.util.Chair.sit[@javax.enterprise.inject.Produces()]()".equals(id): "wrong id for method :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      chair3 = builder.create();
-      it = chair3.getMethods().iterator();
-      method = it.next();
-      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
-      id = AnnotatedTypes.createCallableId(method);
-      assert "org.jboss.weld.tests.unit.util.Chair.sit()".equals(id) : "wrong id for method :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToMethod(Chair.class.getMethod("sit"), new ComfyChairLiteral());
-      chair3 = builder.create();
-      it = chair3.getMethods().iterator();
-      method = it.next();
-      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
-      id = AnnotatedTypes.createCallableId(method);
-      assert "org.jboss.weld.tests.unit.util.Chair.sit[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]()".equals(id) : "wrong id for method :" + id;
-   }
-   
-   @Test
-   public void testTypeId() throws SecurityException, NoSuchMethodException
-   {
-      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
-      AnnotatedType<Chair> chair3 = builder.create();
-      String id = AnnotatedTypes.createTypeId(chair3);
-      assert "org.jboss.weld.tests.unit.util.Chair{org.jboss.weld.tests.unit.util.Chair.sit[@javax.enterprise.inject.Produces()]();}".equals(id): "wrong id for type :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      chair3 = builder.create();
-      id = AnnotatedTypes.createTypeId(chair3);
-      assert "org.jboss.weld.tests.unit.util.Chair{}".equals(id) : "wrong id for type :" + id;
-      
-      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
-      builder.addToMethod(Chair.class.getMethod("sit"), new ComfyChairLiteral());
-      chair3 = builder.create();
-      id = AnnotatedTypes.createTypeId(chair3);
-      assert "org.jboss.weld.tests.unit.util.Chair{org.jboss.weld.tests.unit.util.Chair.sit[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]();}".equals(id) : "wrong id for type :" + id;
-   }
-   
-   private static class DefaultLiteral extends AnnotationLiteral<Default> implements Default {}
-   private static class ProducesLiteral extends AnnotationLiteral<Produces> implements Produces {}
-   private static class ComfyChairLiteral extends AnnotationLiteral<ComfyChair> implements ComfyChair 
-   {
-      public int softness()
-      {
-         return 1;
-      }
-      
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,168 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
+
+import java.util.Iterator;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
+import org.jboss.weld.util.AnnotatedTypes;
+import org.testng.annotations.Test;
+
+/**
+ * Test comparison and id creation for AnnotatedTypes
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ *
+ */
+public class AnnotatedTypesTest
+{
+   /**
+    * tests the AnnotatedTypes.compareAnnotatedTypes 
+    */
+   @Test
+   public void testComparison() throws SecurityException, NoSuchFieldException, NoSuchMethodException
+   {
+      //check that two weld classes on the same underlying are equal
+      TypeStore ts = new TypeStore();
+      ClassTransformer ct =new ClassTransformer(ts);
+      WeldClass<Chair> chair1 = WeldClassImpl.of(Chair.class,ct);
+      WeldClass<Chair> chair2 = WeldClassImpl.of(Chair.class,ct);
+      assert AnnotatedTypes.compareAnnotatedTypes(chair1, chair2);
+      
+      //check that a different implementation of annotated type is equal to the weld implementation
+      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToClass(new DefaultLiteral());
+      builder.addToField(Chair.class.getField("legs"), new ProducesLiteral());
+      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
+      AnnotatedType<Chair> chair3 = builder.create();
+      assert AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
+      
+      //check that the implementation returns false if a field annotation changes
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToClass(new DefaultLiteral());
+      builder.addToField(Chair.class.getField("legs"), new DefaultLiteral());
+      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());     
+      chair3 = builder.create();
+      assert !AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
+      
+      //check that the implementation returns false if a class level annotation changes
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToClass(new ProducesLiteral());
+      builder.addToField(Chair.class.getField("legs"), new DefaultLiteral());
+      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral()); 
+      chair3 = builder.create();
+      assert !AnnotatedTypes.compareAnnotatedTypes(chair1, chair3);
+      
+   }
+   
+   @Test
+   public void testFieldId() throws SecurityException, NoSuchFieldException
+   {
+      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToField(Chair.class.getField("legs"), new ProducesLiteral());
+      AnnotatedType<Chair> chair3 = builder.create();
+      AnnotatedField<? super Chair> field = chair3.getFields().iterator().next();
+      String id = AnnotatedTypes.createFieldId(field);
+      assert "org.jboss.weld.tests.unit.util.Chair.legs[@javax.enterprise.inject.Produces()]".equals(id): "wrong id for field :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      chair3 = builder.create();
+      field = chair3.getFields().iterator().next();
+      id = AnnotatedTypes.createFieldId(field);
+      assert "org.jboss.weld.tests.unit.util.Chair.legs".equals(id) : "wrong id for field :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToField(Chair.class.getField("legs"), new ComfyChairLiteral());
+      chair3 = builder.create();
+      field = chair3.getFields().iterator().next();
+      id = AnnotatedTypes.createFieldId(field);
+      assert "org.jboss.weld.tests.unit.util.Chair.legs[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]".equals(id) : "wrong id for field :" + id;
+   }
+   
+   @Test
+   public void testMethodId() throws SecurityException, NoSuchMethodException
+   {
+      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
+      AnnotatedType<Chair> chair3 = builder.create();
+      Iterator<AnnotatedMethod<? super Chair>> it = chair3.getMethods().iterator();
+      AnnotatedMethod<? super Chair> method = it.next();
+      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
+      String id = AnnotatedTypes.createCallableId(method);
+      assert "org.jboss.weld.tests.unit.util.Chair.sit[@javax.enterprise.inject.Produces()]()".equals(id): "wrong id for method :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      chair3 = builder.create();
+      it = chair3.getMethods().iterator();
+      method = it.next();
+      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
+      id = AnnotatedTypes.createCallableId(method);
+      assert "org.jboss.weld.tests.unit.util.Chair.sit()".equals(id) : "wrong id for method :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToMethod(Chair.class.getMethod("sit"), new ComfyChairLiteral());
+      chair3 = builder.create();
+      it = chair3.getMethods().iterator();
+      method = it.next();
+      while(!method.getJavaMember().getName().equals("sit"))method = it.next();
+      id = AnnotatedTypes.createCallableId(method);
+      assert "org.jboss.weld.tests.unit.util.Chair.sit[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]()".equals(id) : "wrong id for method :" + id;
+   }
+   
+   @Test
+   public void testTypeId() throws SecurityException, NoSuchMethodException
+   {
+      TestAnnotatedTypeBuilder<Chair> builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToMethod(Chair.class.getMethod("sit"), new ProducesLiteral());
+      AnnotatedType<Chair> chair3 = builder.create();
+      String id = AnnotatedTypes.createTypeId(chair3);
+      assert "org.jboss.weld.tests.unit.util.Chair{org.jboss.weld.tests.unit.util.Chair.sit[@javax.enterprise.inject.Produces()]();}".equals(id): "wrong id for type :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      chair3 = builder.create();
+      id = AnnotatedTypes.createTypeId(chair3);
+      assert "org.jboss.weld.tests.unit.util.Chair{}".equals(id) : "wrong id for type :" + id;
+      
+      builder = new TestAnnotatedTypeBuilder<Chair>(Chair.class);
+      builder.addToMethod(Chair.class.getMethod("sit"), new ComfyChairLiteral());
+      chair3 = builder.create();
+      id = AnnotatedTypes.createTypeId(chair3);
+      assert "org.jboss.weld.tests.unit.util.Chair{org.jboss.weld.tests.unit.util.Chair.sit[@org.jboss.weld.tests.unit.util.ComfyChair(softness=1)]();}".equals(id) : "wrong id for type :" + id;
+   }
+   
+   private static class DefaultLiteral extends AnnotationLiteral<Default> implements Default {}
+   private static class ProducesLiteral extends AnnotationLiteral<Produces> implements Produces {}
+   private static class ComfyChairLiteral extends AnnotationLiteral<ComfyChair> implements ComfyChair 
+   {
+      public int softness()
+      {
+         return 1;
+      }
+      
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
-
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-
- at Default
-public class Chair
-{
-   @Produces
-   public int legs;
-   
-   @Produces
-   public String sit()
-   {
-      return "sitting";
-   }
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+
+ at Default
+public class Chair
+{
+   @Produces
+   public int legs;
+   
+   @Produces
+   public String sit()
+   {
+      return "sitting";
+   }
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
-
-public @interface ComfyChair
-{
-   int softness();
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.unit.util;
+
+public @interface ComfyChair
+{
+   int softness();
+}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util)

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated)

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Member;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author Stuart Douglas
- * 
- */
-abstract class AbstractTestAnnotatedCallable<X, Y extends Member> extends AbstractTestAnnotatedMember<X, Y> implements AnnotatedCallable<X>
-{
-
-   private final List<AnnotatedParameter<X>> parameters;
-
-   protected AbstractTestAnnotatedCallable(AnnotatedType<X> declaringType, Y member, Class<?> memberType, Class<?>[] parameterTypes, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
-   {
-      super(declaringType, member, memberType, annotations);
-      this.parameters = getAnnotatedParameters(this, parameterTypes, parameterAnnotations);
-   }
-
-   public List<AnnotatedParameter<X>> getParameters()
-   {
-      return Collections.unmodifiableList(parameters);
-   }
-
-   public AnnotatedParameter<X> getParameter(int index)
-   {
-      return parameters.get(index);
-
-   }  
-   
-   private static <X, Y extends Member> List<AnnotatedParameter<X>> getAnnotatedParameters(AbstractTestAnnotatedCallable<X, Y> callable, Class<?>[] parameterTypes, Map<Integer, TestAnnotationStore> parameterAnnotations)
-   {
-      List<AnnotatedParameter<X>> parameters = new ArrayList<AnnotatedParameter<X>>();
-      int len = parameterTypes.length;
-      for (int i = 0; i < len; ++i)
-      {
-         TestAnnotationBuilder builder = new TestAnnotationBuilder();
-         if (parameterAnnotations != null && parameterAnnotations.containsKey(i))
-         {
-            builder.addAll(parameterAnnotations.get(i));
-         }
-         TestAnnotatedParameter<X> p = new TestAnnotatedParameter<X>(callable, parameterTypes[i], i, builder.create());
-         parameters.add(p);
-      }
-      return parameters;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Member;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+abstract class AbstractTestAnnotatedCallable<X, Y extends Member> extends AbstractTestAnnotatedMember<X, Y> implements AnnotatedCallable<X>
+{
+
+   private final List<AnnotatedParameter<X>> parameters;
+
+   protected AbstractTestAnnotatedCallable(AnnotatedType<X> declaringType, Y member, Class<?> memberType, Class<?>[] parameterTypes, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
+   {
+      super(declaringType, member, memberType, annotations);
+      this.parameters = getAnnotatedParameters(this, parameterTypes, parameterAnnotations);
+   }
+
+   public List<AnnotatedParameter<X>> getParameters()
+   {
+      return Collections.unmodifiableList(parameters);
+   }
+
+   public AnnotatedParameter<X> getParameter(int index)
+   {
+      return parameters.get(index);
+
+   }  
+   
+   private static <X, Y extends Member> List<AnnotatedParameter<X>> getAnnotatedParameters(AbstractTestAnnotatedCallable<X, Y> callable, Class<?>[] parameterTypes, Map<Integer, TestAnnotationStore> parameterAnnotations)
+   {
+      List<AnnotatedParameter<X>> parameters = new ArrayList<AnnotatedParameter<X>>();
+      int len = parameterTypes.length;
+      for (int i = 0; i < len; ++i)
+      {
+         TestAnnotationBuilder builder = new TestAnnotationBuilder();
+         if (parameterAnnotations != null && parameterAnnotations.containsKey(i))
+         {
+            builder.addAll(parameterAnnotations.get(i));
+         }
+         TestAnnotatedParameter<X> p = new TestAnnotatedParameter<X>(callable, parameterTypes[i], i, builder.create());
+         parameters.add(p);
+      }
+      return parameters;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Annotated;
-
-/**
- * The base class for all New Annotated types.
- * 
- * @author Stuart Douglas
- * 
- */
-abstract class AbstractTestAnnotatedElement implements Annotated
-{
-
-   private final Class<?> type;
-   private final Set<Type> typeClosure;
-   private final TestAnnotationStore annotations;
-
-   protected AbstractTestAnnotatedElement(Class<?> type, TestAnnotationStore annotations)
-   {
-      this.typeClosure = new TestTypeClosureBuilder().add(type).getTypes();
-      if (annotations == null)
-      {
-         this.annotations = new TestAnnotationStore();
-      }
-      else
-      {
-         this.annotations = annotations;
-      }
-      this.type = type;
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
-   {
-      return annotations.getAnnotation(annotationType);
-   }
-
-   public Set<Annotation> getAnnotations()
-   {
-      return annotations.getAnnotations();
-   }
-
-   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
-   {
-      return annotations.isAnnotationPresent(annotationType);
-   }
-
-   public Set<Type> getTypeClosure()
-   {
-      return Collections.unmodifiableSet(typeClosure);
-   }
-
-   public Type getBaseType()
-   {
-      return type;
-   }
-   
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Annotated;
+
+/**
+ * The base class for all New Annotated types.
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+abstract class AbstractTestAnnotatedElement implements Annotated
+{
+
+   private final Class<?> type;
+   private final Set<Type> typeClosure;
+   private final TestAnnotationStore annotations;
+
+   protected AbstractTestAnnotatedElement(Class<?> type, TestAnnotationStore annotations)
+   {
+      this.typeClosure = new TestTypeClosureBuilder().add(type).getTypes();
+      if (annotations == null)
+      {
+         this.annotations = new TestAnnotationStore();
+      }
+      else
+      {
+         this.annotations = annotations;
+      }
+      this.type = type;
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      return annotations.getAnnotation(annotationType);
+   }
+
+   public Set<Annotation> getAnnotations()
+   {
+      return annotations.getAnnotations();
+   }
+
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      return annotations.isAnnotationPresent(annotationType);
+   }
+
+   public Set<Type> getTypeClosure()
+   {
+      return Collections.unmodifiableSet(typeClosure);
+   }
+
+   public Type getBaseType()
+   {
+      return type;
+   }
+   
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Member;
-import java.lang.reflect.Modifier;
-
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author Stuart Douglas
- * 
- */
-abstract class AbstractTestAnnotatedMember<X, M extends Member> extends AbstractTestAnnotatedElement implements AnnotatedMember<X>
-{
-   private final AnnotatedType<X> declaringType;
-   private final M javaMember;
-
-   protected AbstractTestAnnotatedMember(AnnotatedType<X> declaringType, M member, Class<?> memberType, TestAnnotationStore annotations)
-   {
-      super(memberType, annotations);
-      this.declaringType = declaringType;
-      this.javaMember = member;
-   }
-
-   public AnnotatedType<X> getDeclaringType()
-   {
-      return declaringType;
-   }
-
-   public M getJavaMember()
-   {
-      return javaMember;
-   }
-
-   public boolean isStatic()
-   {
-      return Modifier.isStatic(javaMember.getModifiers());
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
+
+import javax.enterprise.inject.spi.AnnotatedMember;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+abstract class AbstractTestAnnotatedMember<X, M extends Member> extends AbstractTestAnnotatedElement implements AnnotatedMember<X>
+{
+   private final AnnotatedType<X> declaringType;
+   private final M javaMember;
+
+   protected AbstractTestAnnotatedMember(AnnotatedType<X> declaringType, M member, Class<?> memberType, TestAnnotationStore annotations)
+   {
+      super(memberType, annotations);
+      this.declaringType = declaringType;
+      this.javaMember = member;
+   }
+
+   public AnnotatedType<X> getDeclaringType()
+   {
+      return declaringType;
+   }
+
+   public M getJavaMember()
+   {
+      return javaMember;
+   }
+
+   public boolean isStatic()
+   {
+      return Modifier.isStatic(javaMember.getModifiers());
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Constructor;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-
-/**
- * 
- * @author Stuart Douglas
- * 
- */
-class TestAnnotatedConstructor<X> extends AbstractTestAnnotatedCallable<X, Constructor<X>> implements AnnotatedConstructor<X>
-{
-
-   TestAnnotatedConstructor(TestAnnotatedType<X> type, Constructor<?> constructor, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
-   {
-      super(type, (Constructor<X>) constructor, constructor.getDeclaringClass(), constructor.getParameterTypes(), annotations, parameterAnnotations);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Constructor;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+
+/**
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+class TestAnnotatedConstructor<X> extends AbstractTestAnnotatedCallable<X, Constructor<X>> implements AnnotatedConstructor<X>
+{
+
+   TestAnnotatedConstructor(TestAnnotatedType<X> type, Constructor<?> constructor, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
+   {
+      super(type, (Constructor<X>) constructor, constructor.getDeclaringClass(), constructor.getParameterTypes(), annotations, parameterAnnotations);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Field;
-
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author Stuart Douglas
- *
- */
-class TestAnnotatedField<X> extends AbstractTestAnnotatedMember<X, Field> implements AnnotatedField<X>
-{
-
-   TestAnnotatedField(AnnotatedType<X> declaringType, Field field, TestAnnotationStore annotations)
-   {
-      super(declaringType, field, field.getType(), annotations);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Field;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author Stuart Douglas
+ *
+ */
+class TestAnnotatedField<X> extends AbstractTestAnnotatedMember<X, Field> implements AnnotatedField<X>
+{
+
+   TestAnnotatedField(AnnotatedType<X> declaringType, Field field, TestAnnotationStore annotations)
+   {
+      super(declaringType, field, field.getType(), annotations);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * 
- * @author Stuart Douglas
- * 
- */
-class TestAnnotatedMethod<X> extends AbstractTestAnnotatedCallable<X, Method> implements AnnotatedMethod<X>
-{
-   TestAnnotatedMethod(AnnotatedType<X> type, Method method, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
-   {
-      super(type, method, method.getReturnType(), method.getParameterTypes(), annotations, parameterAnnotations);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+class TestAnnotatedMethod<X> extends AbstractTestAnnotatedCallable<X, Method> implements AnnotatedMethod<X>
+{
+   TestAnnotatedMethod(AnnotatedType<X> type, Method method, TestAnnotationStore annotations, Map<Integer, TestAnnotationStore> parameterAnnotations)
+   {
+      super(type, method, method.getReturnType(), method.getParameterTypes(), annotations, parameterAnnotations);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-
-/**
- * 
- * @author Stuart Douglas
- * 
- */
-class TestAnnotatedParameter<X> extends AbstractTestAnnotatedElement implements AnnotatedParameter<X>
-{
-
-   private final int position;
-   private final AnnotatedCallable<X> declaringCallable;
-
-   TestAnnotatedParameter(AnnotatedCallable<X> declaringCallable, Class<?> type, int position, TestAnnotationStore annotations)
-   {
-      super(type, annotations);
-      this.declaringCallable = declaringCallable;
-      this.position = position;
-   }
-
-   public AnnotatedCallable<X> getDeclaringCallable()
-   {
-      return declaringCallable;
-   }
-
-   public int getPosition()
-   {
-      return position;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+
+/**
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+class TestAnnotatedParameter<X> extends AbstractTestAnnotatedElement implements AnnotatedParameter<X>
+{
+
+   private final int position;
+   private final AnnotatedCallable<X> declaringCallable;
+
+   TestAnnotatedParameter(AnnotatedCallable<X> declaringCallable, Class<?> type, int position, TestAnnotationStore annotations)
+   {
+      super(type, annotations);
+      this.declaringCallable = declaringCallable;
+      this.position = position;
+   }
+
+   public AnnotatedCallable<X> getDeclaringCallable()
+   {
+      return declaringCallable;
+   }
+
+   public int getPosition()
+   {
+      return position;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * AnnotatedType implementation for adding beans in the BeforeBeanDiscovery
- * event
- * 
- * @author Stuart Douglas
- * 
- */
-class TestAnnotatedType<X> extends AbstractTestAnnotatedElement implements AnnotatedType<X>
-{
-
-   private final Set<AnnotatedConstructor<X>> constructors;
-   private final Set<AnnotatedField<? super X>> fields;
-   private final Set<AnnotatedMethod<? super X>> methods;
-
-   private final Class<X> javaClass;
-
-   TestAnnotatedType(Class<X> clazz, TestAnnotationStore typeAnnotations, Map<Field, TestAnnotationStore> fieldAnnotations, Map<Method, TestAnnotationStore> methodAnnotations, Map<Method, Map<Integer, TestAnnotationStore>> methodParameterAnnotations, Map<Constructor<X>, TestAnnotationStore> constructorAnnotations, Map<Constructor<X>, Map<Integer, TestAnnotationStore>> constructorParameterAnnotations)
-   {
-      super(clazz, typeAnnotations);
-      this.javaClass = clazz;
-      this.constructors = new HashSet<AnnotatedConstructor<X>>();
-      for (Constructor<?> c : clazz.getDeclaredConstructors())
-      {
-         TestAnnotatedConstructor<X> nc = new TestAnnotatedConstructor<X>(this, c, constructorAnnotations.get(c), constructorParameterAnnotations.get(c));
-         constructors.add(nc);
-      }
-      this.methods = new HashSet<AnnotatedMethod<? super X>>();
-      for (Method m : clazz.getDeclaredMethods())
-      {
-         TestAnnotatedMethod<X> met = new TestAnnotatedMethod<X>(this, m, methodAnnotations.get(m), methodParameterAnnotations.get(m));
-         methods.add(met);
-      }
-      this.fields = new HashSet<AnnotatedField<? super X>>();
-      for (Field f : clazz.getDeclaredFields())
-      {
-         TestAnnotatedField<X> b = new TestAnnotatedField<X>(this, f, fieldAnnotations.get(f));
-         fields.add(b);
-      }
-   }
-
-   public Set<AnnotatedConstructor<X>> getConstructors()
-   {
-      return Collections.unmodifiableSet(constructors);
-   }
-
-   public Set<AnnotatedField<? super X>> getFields()
-   {
-      return Collections.unmodifiableSet(fields);
-   }
-
-   public Class<X> getJavaClass()
-   {
-      return javaClass;
-   }
-
-   public Set<AnnotatedMethod<? super X>> getMethods()
-   {
-      return Collections.unmodifiableSet(methods);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * AnnotatedType implementation for adding beans in the BeforeBeanDiscovery
+ * event
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+class TestAnnotatedType<X> extends AbstractTestAnnotatedElement implements AnnotatedType<X>
+{
+
+   private final Set<AnnotatedConstructor<X>> constructors;
+   private final Set<AnnotatedField<? super X>> fields;
+   private final Set<AnnotatedMethod<? super X>> methods;
+
+   private final Class<X> javaClass;
+
+   TestAnnotatedType(Class<X> clazz, TestAnnotationStore typeAnnotations, Map<Field, TestAnnotationStore> fieldAnnotations, Map<Method, TestAnnotationStore> methodAnnotations, Map<Method, Map<Integer, TestAnnotationStore>> methodParameterAnnotations, Map<Constructor<X>, TestAnnotationStore> constructorAnnotations, Map<Constructor<X>, Map<Integer, TestAnnotationStore>> constructorParameterAnnotations)
+   {
+      super(clazz, typeAnnotations);
+      this.javaClass = clazz;
+      this.constructors = new HashSet<AnnotatedConstructor<X>>();
+      for (Constructor<?> c : clazz.getDeclaredConstructors())
+      {
+         TestAnnotatedConstructor<X> nc = new TestAnnotatedConstructor<X>(this, c, constructorAnnotations.get(c), constructorParameterAnnotations.get(c));
+         constructors.add(nc);
+      }
+      this.methods = new HashSet<AnnotatedMethod<? super X>>();
+      for (Method m : clazz.getDeclaredMethods())
+      {
+         TestAnnotatedMethod<X> met = new TestAnnotatedMethod<X>(this, m, methodAnnotations.get(m), methodParameterAnnotations.get(m));
+         methods.add(met);
+      }
+      this.fields = new HashSet<AnnotatedField<? super X>>();
+      for (Field f : clazz.getDeclaredFields())
+      {
+         TestAnnotatedField<X> b = new TestAnnotatedField<X>(this, f, fieldAnnotations.get(f));
+         fields.add(b);
+      }
+   }
+
+   public Set<AnnotatedConstructor<X>> getConstructors()
+   {
+      return Collections.unmodifiableSet(constructors);
+   }
+
+   public Set<AnnotatedField<? super X>> getFields()
+   {
+      return Collections.unmodifiableSet(fields);
+   }
+
+   public Class<X> getJavaClass()
+   {
+      return javaClass;
+   }
+
+   public Set<AnnotatedMethod<? super X>> getMethods()
+   {
+      return Collections.unmodifiableSet(methods);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,178 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * Class for constructing a new AnnotatedType. A new instance of builder must be
- * used for each annotated type.
- * 
- * No annotations will be read from the underlying class definition, all
- * annotations must be added explicitly
- * 
- * @author Stuart Douglas
- * @author Pete Muir
- * 
- */
-public class TestAnnotatedTypeBuilder<X>
-{
-   private Map<Field, TestAnnotationBuilder> fields = new HashMap<Field, TestAnnotationBuilder>();
-   private Map<Method, TestAnnotationBuilder> methods = new HashMap<Method, TestAnnotationBuilder>();
-   private Map<Method, Map<Integer, TestAnnotationBuilder>> methodParameters = new HashMap<Method, Map<Integer, TestAnnotationBuilder>>();
-   private Map<Constructor<X>, TestAnnotationBuilder> constructors = new HashMap<Constructor<X>, TestAnnotationBuilder>();
-   private Map<Constructor<X>, Map<Integer, TestAnnotationBuilder>> constructorParameters = new HashMap<Constructor<X>, Map<Integer, TestAnnotationBuilder>>();
-   private TestAnnotationBuilder typeAnnotations = new TestAnnotationBuilder();
-   private Class<X> underlying;
-
-   public TestAnnotatedTypeBuilder(Class<X> underlying)
-   {
-      this.underlying = underlying;
-   
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToClass(Annotation a)
-   {
-      typeAnnotations.add(a);
-      return this;
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToField(Field field, Annotation a)
-   {
-      TestAnnotationBuilder annotations = fields.get(field);
-      if (annotations == null)
-      {
-         annotations = new TestAnnotationBuilder();
-         fields.put(field, annotations);
-      }
-      annotations.add(a);
-      return this;
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToMethod(Method method, Annotation a)
-   {
-      TestAnnotationBuilder annotations = methods.get(method);
-      if (annotations == null)
-      {
-         annotations = new TestAnnotationBuilder();
-         methods.put(method, annotations);
-      }
-      annotations.add(a);
-      return this;
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToMethodParameter(Method method, int parameter, Annotation a)
-   {
-      Map<Integer, TestAnnotationBuilder> anmap = methodParameters.get(method);
-      if (anmap == null)
-      {
-         anmap = new HashMap<Integer, TestAnnotationBuilder>();
-         methodParameters.put(method, anmap);
-      }
-      TestAnnotationBuilder annotations = anmap.get(parameter);
-      if (annotations == null)
-      {
-         annotations = new TestAnnotationBuilder();
-         anmap.put(parameter, annotations);
-      }
-      annotations.add(a);
-      return this;
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToConstructor(Constructor<X> constructor, Annotation a)
-   {
-      TestAnnotationBuilder annotations = constructors.get(constructor);
-      if (annotations == null)
-      {
-         annotations = new TestAnnotationBuilder();
-         constructors.put(constructor, annotations);
-      }
-      annotations.add(a);
-      return this;
-   }
-
-   public TestAnnotatedTypeBuilder<X> addToConstructorParameter(Constructor<X> constructor, int parameter, Annotation a)
-   {
-      Map<Integer, TestAnnotationBuilder> anmap = constructorParameters.get(constructor);
-      if (anmap == null)
-      {
-         anmap = new HashMap<Integer, TestAnnotationBuilder>();
-         constructorParameters.put(constructor, anmap);
-      }
-      TestAnnotationBuilder annotations = anmap.get(parameter);
-      if (annotations == null)
-      {
-         annotations = new TestAnnotationBuilder();
-         anmap.put(parameter, annotations);
-      }
-      annotations.add(a);
-      return this;
-   }
-
-   public AnnotatedType<X> create()
-   {
-      Map<Constructor<X>, Map<Integer, TestAnnotationStore>> constructorParameterAnnnotations = new HashMap<Constructor<X>, Map<Integer,TestAnnotationStore>>();
-      Map<Constructor<X>, TestAnnotationStore> constructorAnnotations = new HashMap<Constructor<X>, TestAnnotationStore>();
-      Map<Method, Map<Integer, TestAnnotationStore>> methodParameterAnnnotations = new HashMap<Method, Map<Integer,TestAnnotationStore>>();
-      Map<Method, TestAnnotationStore> methodAnnotations = new HashMap<Method, TestAnnotationStore>();
-      Map<Field, TestAnnotationStore> fieldAnnotations = new HashMap<Field, TestAnnotationStore>();
-      
-      for (Entry<Field, TestAnnotationBuilder> e : fields.entrySet())
-      {
-         fieldAnnotations.put(e.getKey(), e.getValue().create());
-      }
-      
-      for (Entry<Method, TestAnnotationBuilder> e : methods.entrySet())
-      {
-         methodAnnotations.put(e.getKey(), e.getValue().create());
-      }
-      for (Entry<Method, Map<Integer, TestAnnotationBuilder>> e : methodParameters.entrySet())
-      {
-         Map<Integer, TestAnnotationStore> parameterAnnotations = new HashMap<Integer, TestAnnotationStore>();
-         methodParameterAnnnotations.put(e.getKey(), parameterAnnotations);
-         for (Entry<Integer, TestAnnotationBuilder> pe : e.getValue().entrySet())
-         {
-            parameterAnnotations.put(pe.getKey(), pe.getValue().create());
-         }
-      }
-      
-      for (Entry<Constructor<X>, TestAnnotationBuilder> e : constructors.entrySet())
-      {
-         constructorAnnotations.put(e.getKey(), e.getValue().create());
-      }
-      for (Entry<Constructor<X>, Map<Integer, TestAnnotationBuilder>> e : constructorParameters.entrySet())
-      {
-         Map<Integer, TestAnnotationStore> parameterAnnotations = new HashMap<Integer, TestAnnotationStore>();
-         constructorParameterAnnnotations.put(e.getKey(), parameterAnnotations);
-         for (Entry<Integer, TestAnnotationBuilder> pe : e.getValue().entrySet())
-         {
-            parameterAnnotations.put(pe.getKey(), pe.getValue().create());
-         }
-      }
-
-      return new TestAnnotatedType<X>(underlying, typeAnnotations.create(), fieldAnnotations, methodAnnotations, methodParameterAnnnotations, constructorAnnotations, constructorParameterAnnnotations);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,178 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * Class for constructing a new AnnotatedType. A new instance of builder must be
+ * used for each annotated type.
+ * 
+ * No annotations will be read from the underlying class definition, all
+ * annotations must be added explicitly
+ * 
+ * @author Stuart Douglas
+ * @author Pete Muir
+ * 
+ */
+public class TestAnnotatedTypeBuilder<X>
+{
+   private Map<Field, TestAnnotationBuilder> fields = new HashMap<Field, TestAnnotationBuilder>();
+   private Map<Method, TestAnnotationBuilder> methods = new HashMap<Method, TestAnnotationBuilder>();
+   private Map<Method, Map<Integer, TestAnnotationBuilder>> methodParameters = new HashMap<Method, Map<Integer, TestAnnotationBuilder>>();
+   private Map<Constructor<X>, TestAnnotationBuilder> constructors = new HashMap<Constructor<X>, TestAnnotationBuilder>();
+   private Map<Constructor<X>, Map<Integer, TestAnnotationBuilder>> constructorParameters = new HashMap<Constructor<X>, Map<Integer, TestAnnotationBuilder>>();
+   private TestAnnotationBuilder typeAnnotations = new TestAnnotationBuilder();
+   private Class<X> underlying;
+
+   public TestAnnotatedTypeBuilder(Class<X> underlying)
+   {
+      this.underlying = underlying;
+   
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToClass(Annotation a)
+   {
+      typeAnnotations.add(a);
+      return this;
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToField(Field field, Annotation a)
+   {
+      TestAnnotationBuilder annotations = fields.get(field);
+      if (annotations == null)
+      {
+         annotations = new TestAnnotationBuilder();
+         fields.put(field, annotations);
+      }
+      annotations.add(a);
+      return this;
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToMethod(Method method, Annotation a)
+   {
+      TestAnnotationBuilder annotations = methods.get(method);
+      if (annotations == null)
+      {
+         annotations = new TestAnnotationBuilder();
+         methods.put(method, annotations);
+      }
+      annotations.add(a);
+      return this;
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToMethodParameter(Method method, int parameter, Annotation a)
+   {
+      Map<Integer, TestAnnotationBuilder> anmap = methodParameters.get(method);
+      if (anmap == null)
+      {
+         anmap = new HashMap<Integer, TestAnnotationBuilder>();
+         methodParameters.put(method, anmap);
+      }
+      TestAnnotationBuilder annotations = anmap.get(parameter);
+      if (annotations == null)
+      {
+         annotations = new TestAnnotationBuilder();
+         anmap.put(parameter, annotations);
+      }
+      annotations.add(a);
+      return this;
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToConstructor(Constructor<X> constructor, Annotation a)
+   {
+      TestAnnotationBuilder annotations = constructors.get(constructor);
+      if (annotations == null)
+      {
+         annotations = new TestAnnotationBuilder();
+         constructors.put(constructor, annotations);
+      }
+      annotations.add(a);
+      return this;
+   }
+
+   public TestAnnotatedTypeBuilder<X> addToConstructorParameter(Constructor<X> constructor, int parameter, Annotation a)
+   {
+      Map<Integer, TestAnnotationBuilder> anmap = constructorParameters.get(constructor);
+      if (anmap == null)
+      {
+         anmap = new HashMap<Integer, TestAnnotationBuilder>();
+         constructorParameters.put(constructor, anmap);
+      }
+      TestAnnotationBuilder annotations = anmap.get(parameter);
+      if (annotations == null)
+      {
+         annotations = new TestAnnotationBuilder();
+         anmap.put(parameter, annotations);
+      }
+      annotations.add(a);
+      return this;
+   }
+
+   public AnnotatedType<X> create()
+   {
+      Map<Constructor<X>, Map<Integer, TestAnnotationStore>> constructorParameterAnnnotations = new HashMap<Constructor<X>, Map<Integer,TestAnnotationStore>>();
+      Map<Constructor<X>, TestAnnotationStore> constructorAnnotations = new HashMap<Constructor<X>, TestAnnotationStore>();
+      Map<Method, Map<Integer, TestAnnotationStore>> methodParameterAnnnotations = new HashMap<Method, Map<Integer,TestAnnotationStore>>();
+      Map<Method, TestAnnotationStore> methodAnnotations = new HashMap<Method, TestAnnotationStore>();
+      Map<Field, TestAnnotationStore> fieldAnnotations = new HashMap<Field, TestAnnotationStore>();
+      
+      for (Entry<Field, TestAnnotationBuilder> e : fields.entrySet())
+      {
+         fieldAnnotations.put(e.getKey(), e.getValue().create());
+      }
+      
+      for (Entry<Method, TestAnnotationBuilder> e : methods.entrySet())
+      {
+         methodAnnotations.put(e.getKey(), e.getValue().create());
+      }
+      for (Entry<Method, Map<Integer, TestAnnotationBuilder>> e : methodParameters.entrySet())
+      {
+         Map<Integer, TestAnnotationStore> parameterAnnotations = new HashMap<Integer, TestAnnotationStore>();
+         methodParameterAnnnotations.put(e.getKey(), parameterAnnotations);
+         for (Entry<Integer, TestAnnotationBuilder> pe : e.getValue().entrySet())
+         {
+            parameterAnnotations.put(pe.getKey(), pe.getValue().create());
+         }
+      }
+      
+      for (Entry<Constructor<X>, TestAnnotationBuilder> e : constructors.entrySet())
+      {
+         constructorAnnotations.put(e.getKey(), e.getValue().create());
+      }
+      for (Entry<Constructor<X>, Map<Integer, TestAnnotationBuilder>> e : constructorParameters.entrySet())
+      {
+         Map<Integer, TestAnnotationStore> parameterAnnotations = new HashMap<Integer, TestAnnotationStore>();
+         constructorParameterAnnnotations.put(e.getKey(), parameterAnnotations);
+         for (Entry<Integer, TestAnnotationBuilder> pe : e.getValue().entrySet())
+         {
+            parameterAnnotations.put(pe.getKey(), pe.getValue().create());
+         }
+      }
+
+      return new TestAnnotatedType<X>(underlying, typeAnnotations.create(), fieldAnnotations, methodAnnotations, methodParameterAnnnotations, constructorAnnotations, constructorParameterAnnnotations);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 
- * @author Stuart Douglas
- *
- */
-class TestAnnotationBuilder
-{
-   private HashMap<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
-   private Set<Annotation> annotationSet = new HashSet<Annotation>();
-
-   public TestAnnotationBuilder add(Annotation a)
-   {
-      annotationSet.add(a);
-      annotationMap.put(a.getClass(), a);
-      return this;
-   }
-
-   public TestAnnotationStore create()
-   {
-      return new TestAnnotationStore(annotationMap, annotationSet);
-   }
-   
-   public TestAnnotationBuilder addAll(Set<Annotation> annotations)
-   {
-      for (Annotation annotation : annotations)
-      {
-         add(annotation);
-      }
-      return this;
-   }
-   
-   public TestAnnotationBuilder addAll(TestAnnotationStore annotations)
-   {
-      for (Annotation annotation : annotations.getAnnotations())
-      {
-         add(annotation);
-      }
-      return this;
-   }
-
-   public TestAnnotationBuilder addAll(AnnotatedElement element)
-   {
-      for (Annotation a : element.getAnnotations())
-      {
-         add(a);
-      }
-      return this;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 
+ * @author Stuart Douglas
+ *
+ */
+class TestAnnotationBuilder
+{
+   private HashMap<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+   private Set<Annotation> annotationSet = new HashSet<Annotation>();
+
+   public TestAnnotationBuilder add(Annotation a)
+   {
+      annotationSet.add(a);
+      annotationMap.put(a.getClass(), a);
+      return this;
+   }
+
+   public TestAnnotationStore create()
+   {
+      return new TestAnnotationStore(annotationMap, annotationSet);
+   }
+   
+   public TestAnnotationBuilder addAll(Set<Annotation> annotations)
+   {
+      for (Annotation annotation : annotations)
+      {
+         add(annotation);
+      }
+      return this;
+   }
+   
+   public TestAnnotationBuilder addAll(TestAnnotationStore annotations)
+   {
+      for (Annotation annotation : annotations.getAnnotations())
+      {
+         add(annotation);
+      }
+      return this;
+   }
+
+   public TestAnnotationBuilder addAll(AnnotatedElement element)
+   {
+      for (Annotation a : element.getAnnotations())
+      {
+         add(a);
+      }
+      return this;
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 
- * @author Stuart Douglas
- *
- */
-class TestAnnotationStore
-{
-   
-   private final HashMap<Class<? extends Annotation>, Annotation> annotationMap;
-   private final Set<Annotation> annotationSet;
-
-   TestAnnotationStore(HashMap<Class<? extends Annotation>, Annotation> annotationMap, Set<Annotation> annotationSet)
-   {
-      this.annotationMap = annotationMap;
-      this.annotationSet = annotationSet;
-   }
-   
-   TestAnnotationStore()
-   {
-      this.annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
-      this.annotationSet = new HashSet<Annotation>();
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
-   {
-      return annotationType.cast(annotationMap.get(annotationType));
-   }
-
-   public Set<Annotation> getAnnotations()
-   {
-      return Collections.unmodifiableSet(annotationSet);
-   }
-
-   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
-   {
-      return annotationMap.containsKey(annotationType);
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 
+ * @author Stuart Douglas
+ *
+ */
+class TestAnnotationStore
+{
+   
+   private final HashMap<Class<? extends Annotation>, Annotation> annotationMap;
+   private final Set<Annotation> annotationSet;
+
+   TestAnnotationStore(HashMap<Class<? extends Annotation>, Annotation> annotationMap, Set<Annotation> annotationSet)
+   {
+      this.annotationMap = annotationMap;
+      this.annotationSet = annotationSet;
+   }
+   
+   TestAnnotationStore()
+   {
+      this.annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+      this.annotationSet = new HashSet<Annotation>();
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      return annotationType.cast(annotationMap.get(annotationType));
+   }
+
+   public Set<Annotation> getAnnotations()
+   {
+      return Collections.unmodifiableSet(annotationSet);
+   }
+
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      return annotationMap.containsKey(annotationType);
+   }
+
+}

Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
-
-import java.lang.reflect.Type;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A type closure builder
- * 
- * @author Stuart Douglas
- * 
- */
-class TestTypeClosureBuilder
-{
-
-   final Set<Type> types = new HashSet<Type>();
-
-   public TestTypeClosureBuilder add(Class<?> beanType)
-   {
-      Class<?> c = beanType;
-      do
-      {
-         types.add(c);
-         c = c.getSuperclass();
-      }
-      while (c != null);
-      for (Class<?> i : beanType.getInterfaces())
-      {
-         types.add(i);
-      }
-      return this;
-   }
-
-   public TestTypeClosureBuilder addInterfaces(Class<?> beanType)
-   {
-      for (Class<?> i : beanType.getInterfaces())
-      {
-         types.add(i);
-      }
-      return this;
-   }
-
-   public Set<Type> getTypes()
-   {
-      return types;
-   }
-
-}

Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java (from rev 6821, core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.util.annotated;
+
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A type closure builder
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+class TestTypeClosureBuilder
+{
+
+   final Set<Type> types = new HashSet<Type>();
+
+   public TestTypeClosureBuilder add(Class<?> beanType)
+   {
+      Class<?> c = beanType;
+      do
+      {
+         types.add(c);
+         c = c.getSuperclass();
+      }
+      while (c != null);
+      for (Class<?> i : beanType.getInterfaces())
+      {
+         types.add(i);
+      }
+      return this;
+   }
+
+   public TestTypeClosureBuilder addInterfaces(Class<?> beanType)
+   {
+      for (Class<?> i : beanType.getInterfaces())
+      {
+         types.add(i);
+      }
+      return this;
+   }
+
+   public Set<Type> getTypes()
+   {
+      return types;
+   }
+
+}

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-   <alternatives>
-      <stereotype>org.jboss.weld.tests.alternatives.Test</stereotype>
-   </alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/alternatives/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+   <alternatives>
+      <stereotype>org.jboss.weld.tests.alternatives.Test</stereotype>
+   </alternatives>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-             version="1.0">
-   <persistence-unit name="test">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-   </persistence-unit>
-</persistence>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
+             version="1.0">
+   <persistence-unit name="test">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+   </persistence-unit>
+</persistence>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-simple.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegateAndAbstractMethod</class>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegateAndAbstractMethod</class>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithInitializerMethodInjectedDelegateAndAbstractMethod</class>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withAbstractMethodAndInitializerMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithInitializerMethodInjectedDelegateAndAbstractMethod</class>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod</class>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withCallToItself.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod</class>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithFieldInjectedDelegate</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithConstructorInjectedDelegateAndAbstractMethod</class>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithConstructorInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withConstructor.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithConstructorInjectedDelegateAndAbstractMethod</class>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithConstructorInjectedDelegate</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithInitializerMethodInjectedDelegate</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/beans-withInitializerMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.FrameWithInitializerMethodInjectedDelegate</class>
+   </decorators>
+</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.abstractDecorator.broken.Frame</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/abstractDecorator/broken/beans-withInvalidAbstractMethod.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.abstractDecorator.broken.Frame</class>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans> 
-   <decorators>
-      <class>org.jboss.weld.tests.decorators.SimpleDecorator1</class>
-      <class>org.jboss.weld.tests.decorators.SimpleDecorator2</class>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans> 
+   <decorators>
+      <class>org.jboss.weld.tests.decorators.SimpleDecorator1</class>
+      <class>org.jboss.weld.tests.decorators.SimpleDecorator2</class>
+   </decorators>
+</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-   <decorators>
-      <decorator>org.jboss.weld.tests.decorators.custom.CustomWindowFrame</decorator>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans-custom-only.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+   <decorators>
+      <decorator>org.jboss.weld.tests.decorators.custom.CustomWindowFrame</decorator>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,24 +0,0 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright <Year>, Red Hat, Inc. and/or its affiliates, 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.
-  -->
-
-<beans>
-   <decorators>
-      <decorator>org.jboss.weld.tests.decorators.custom.OuterWindowFrame</decorator>
-      <decorator>org.jboss.weld.tests.decorators.custom.CustomWindowFrame</decorator>
-      <decorator>org.jboss.weld.tests.decorators.custom.InnerWindowFrame</decorator>
-   </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,24 @@
+<!--
+  ~ JBoss, Home of Professional Open Source
+  ~ Copyright <Year>, Red Hat, Inc. and/or its affiliates, 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.
+  -->
+
+<beans>
+   <decorators>
+      <decorator>org.jboss.weld.tests.decorators.custom.OuterWindowFrame</decorator>
+      <decorator>org.jboss.weld.tests.decorators.custom.CustomWindowFrame</decorator>
+      <decorator>org.jboss.weld.tests.decorators.custom.InnerWindowFrame</decorator>
+   </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.decorators.custom.CustomDecoratorDeploymentObserver

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/custom/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.decorators.custom.CustomDecoratorDeploymentObserver

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-    <decorators>
-        <decorator>org.jboss.weld.tests.decorators.decoratedTypes.PartialDecorator</decorator>
-    </decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/decoratedTypes/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+    <decorators>
+        <decorator>org.jboss.weld.tests.decorators.decoratedTypes.PartialDecorator</decorator>
+    </decorators>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans>
-    <decorators>
-        <decorator>org.jboss.weld.tests.decorators.generic.PartialDecorator</decorator>
-        <decorator>org.jboss.weld.tests.decorators.generic.StringPartialDecorator</decorator>
-    </decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans>
+    <decorators>
+        <decorator>org.jboss.weld.tests.decorators.generic.PartialDecorator</decorator>
+        <decorator>org.jboss.weld.tests.decorators.generic.StringPartialDecorator</decorator>
+    </decorators>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-    <decorators>
-        <decorator>org.jboss.weld.tests.decorators.generic.extend.ExtendsDecoratedDecorator</decorator>
-    </decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+    <decorators>
+        <decorator>org.jboss.weld.tests.decorators.generic.extend.ExtendsDecoratedDecorator</decorator>
+    </decorators>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,8 +0,0 @@
-<beans>
-    <decorators>
-        <class>org.jboss.weld.tests.decorators.interceptor.ServiceDecorator</class>
-    </decorators>
-    <interceptors>
-       <class>org.jboss.weld.tests.decorators.interceptor.ServiceInterceptor</class>
-    </interceptors>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,8 @@
+<beans>
+    <decorators>
+        <class>org.jboss.weld.tests.decorators.interceptor.ServiceDecorator</class>
+    </decorators>
+    <interceptors>
+       <class>org.jboss.weld.tests.decorators.interceptor.ServiceInterceptor</class>
+    </interceptors>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<decorators>
-		<class>org.jboss.weld.tests.decorators.multidelegate.AccountDecorator</class>
-	</decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/multidelegate/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<decorators>
+		<class>org.jboss.weld.tests.decorators.multidelegate.AccountDecorator</class>
+	</decorators>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,23 +0,0 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.
-  -->
-
-<beans>
-    <decorators>
-        <decorator>org.jboss.weld.tests.decorators.resolution.SimpleDecorator</decorator>
-        <decorator>org.jboss.weld.tests.decorators.resolution.ComplexDecorator</decorator>
-    </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/resolution/beans-basic.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,23 @@
+<!--
+  ~ JBoss, Home of Professional Open Source
+  ~ Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.
+  -->
+
+<beans>
+    <decorators>
+        <decorator>org.jboss.weld.tests.decorators.resolution.SimpleDecorator</decorator>
+        <decorator>org.jboss.weld.tests.decorators.resolution.ComplexDecorator</decorator>
+    </decorators>
+</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans>
-    <decorators>
-        <class>org.jboss.weld.tests.decorators.stackoverflow.SecurePaymentService</class>
-    </decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans>
+    <decorators>
+        <class>org.jboss.weld.tests.decorators.stackoverflow.SecurePaymentService</class>
+    </decorators>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" 
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
-         version="3.1">
-   
-</ejb-jar>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+         version="3.1">
+   
+</ejb-jar>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans> 
-   <alternatives>
-      <class>org.jboss.weld.tests.examples.MockSentenceTranslator</class>
-   </alternatives>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/examples/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans> 
+   <alternatives>
+      <class>org.jboss.weld.tests.examples.MockSentenceTranslator</class>
+   </alternatives>
+</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.extensions.annotatedType.ejb.AnnotatedTypeEjbExtension
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/ejb/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.annotatedType.ejb.AnnotatedTypeEjbExtension
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/annotatedType/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.annotatedType.AnnotatedTypeExtension

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,8 +0,0 @@
-<beans>
-  <interceptors>
-    <class>org.jboss.weld.tests.extensions.injectionTarget.SecurityInterceptor</class>
-  </interceptors>
-  <decorators>
-  	<class>org.jboss.weld.tests.extensions.injectionTarget.AircraftDecorator</class>
-  </decorators>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,8 @@
+<beans>
+  <interceptors>
+    <class>org.jboss.weld.tests.extensions.injectionTarget.SecurityInterceptor</class>
+  </interceptors>
+  <decorators>
+  	<class>org.jboss.weld.tests.extensions.injectionTarget.AircraftDecorator</class>
+  </decorators>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.extensions.injectionTarget.InjectionTargetExtension

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/injectionTarget/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.injectionTarget.InjectionTargetExtension

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,6 +0,0 @@
-<beans>
-    <interceptors>
-        <class>org.jboss.weld.tests.extensions.interceptors.IncrementingInterceptor</class>
-        <class>org.jboss.weld.tests.extensions.interceptors.LifecycleInterceptor</class>
-    </interceptors>
-</beans>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,6 @@
+<beans>
+    <interceptors>
+        <class>org.jboss.weld.tests.extensions.interceptors.IncrementingInterceptor</class>
+        <class>org.jboss.weld.tests.extensions.interceptors.LifecycleInterceptor</class>
+    </interceptors>
+</beans>

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.extensions.interceptors.InterceptorExtension
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.interceptors.InterceptorExtension
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,3 @@
+org.jboss.weld.tests.extensions.SimpleExtension
+org.jboss.weld.tests.extensions.ExtensionObserver
+org.jboss.weld.tests.extensions.WoodlandExtension
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.extensions.multipleBeans.MultipleBeansExtension

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/multipleBeans/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.multipleBeans.MultipleBeansExtension

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5"
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-   
-   <display-name>JBoss Test Harness</display-name>
-   
-   <listener>
-      <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
-   </listener>
-   
-   <listener>
-      <listener-class>org.jboss.weld.tests.nonContextual.ServletContextListenerImpl</listener-class>
-   </listener>
-   
-   <servlet>
-      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
-      <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>
-   </servlet>
-   
-   <servlet-mapping>
-      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
-      <url-pattern>/*</url-pattern>
-   </servlet-mapping>
-
-</web-app>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+   
+   <display-name>JBoss Test Harness</display-name>
+   
+   <listener>
+      <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+   </listener>
+   
+   <listener>
+      <listener-class>org.jboss.weld.tests.nonContextual.ServletContextListenerImpl</listener-class>
+   </listener>
+   
+   <servlet>
+      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+      <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>
+   </servlet>
+   
+   <servlet-mapping>
+      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+      <url-pattern>/*</url-pattern>
+   </servlet-mapping>
+
+</web-app>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-             version="1.0">
-   <persistence-unit name="test">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-   </persistence-unit>
-</persistence>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
+             version="1.0">
+   <persistence-unit name="test">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+   </persistence-unit>
+</persistence>

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-org.jboss.weld.tests.unit.bootstrap.InitializedObserver

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+org.jboss.weld.tests.unit.bootstrap.InitializedObserver

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<alternatives>
-		<class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<alternatives>
+		<class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class>
+	</alternatives>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<decorators>
-		<class>org.jboss.weld.tests.unit.bootstrap.xml.Dec</class>
-	</decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<decorators>
+		<class>org.jboss.weld.tests.unit.bootstrap.xml.Dec</class>
+	</decorators>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<interceptors>
-		<class>org.jboss.weld.tests.unit.bootstrap.xml.Int</class>
-	</interceptors>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<interceptors>
+		<class>org.jboss.weld.tests.unit.bootstrap.xml.Int</class>
+	</interceptors>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,8 +0,0 @@
-<beans>
-	<alternatives>
-		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
-	</alternatives>
-	<alternatives>
-		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,8 @@
+<beans>
+	<alternatives>
+		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
+	</alternatives>
+	<alternatives>
+		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
+	</alternatives>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,8 +0,0 @@
-<beans>
-	<decorators>
-		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
-	</decorators>
-	<decorators>
-		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
-	</decorators>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,8 @@
+<beans>
+	<decorators>
+		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
+	</decorators>
+	<decorators>
+		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
+	</decorators>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,8 +0,0 @@
-<beans>
-	<interceptors>
-		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
-	</interceptors>
-	<interceptors>
-		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
-	</interceptors>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,8 @@
+<beans>
+	<interceptors>
+		<class>org.jboss.weld.tests.unit.bootstrap.Foo</class>
+	</interceptors>
+	<interceptors>
+		<class>org.jboss.weld.tests.unit.bootstrap.Bar</class>
+	</interceptors>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,11 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:s="urn:java:seam:core" 
-   xmlns:p="org.jboss.seam.xml.examples.princess"
-   xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee 
-      http://docs.jboss.org/cdi/beans_1_0.xsd">
-	<alternatives>
-		<class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,11 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:s="urn:java:seam:core" 
+   xmlns:p="org.jboss.seam.xml.examples.princess"
+   xsi:schemaLocation="
+      http://java.sun.com/xml/ns/javaee 
+      http://docs.jboss.org/cdi/beans_1_0.xsd">
+	<alternatives>
+		<class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class>
+	</alternatives>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,12 +0,0 @@
-<ee:beans xmlns:ee="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns="urn:java:seam:core" 
-   xmlns:p="org.jboss.seam.xml.examples.princess"
-   xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee 
-      http://docs.jboss.org/cdi/beans_1_0.xsd">
-	<ee:alternatives>
-		<ee:class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</ee:class>
-	</ee:alternatives>
-   <foo />
-</ee:beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,12 @@
+<ee:beans xmlns:ee="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns="urn:java:seam:core" 
+   xmlns:p="org.jboss.seam.xml.examples.princess"
+   xsi:schemaLocation="
+      http://java.sun.com/xml/ns/javaee 
+      http://docs.jboss.org/cdi/beans_1_0.xsd">
+	<ee:alternatives>
+		<ee:class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</ee:class>
+	</ee:alternatives>
+   <foo />
+</ee:beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1 +0,0 @@
-<beans><alternatives><class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class></alternatives></beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1 @@
+<beans><alternatives><class>org.jboss.weld.tests.unit.bootstrap.xml.Alt</class></alternatives></beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<alternatives>
-		<class>foo.Bar</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<alternatives>
+		<class>foo.Bar</class>
+	</alternatives>
+</beans>
\ No newline at end of file

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<alternatives
-		<class>foo.Bar</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<alternatives
+		<class>foo.Bar</class>
+	</alternatives>
+</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure)

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,4 +0,0 @@
-org.jboss.weld.tests.unit.deployment.structure.extensions.Observer1
-org.jboss.weld.tests.unit.deployment.structure.extensions.Observer2
-org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver1
-org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver2

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,4 @@
+org.jboss.weld.tests.unit.deployment.structure.extensions.Observer1
+org.jboss.weld.tests.unit.deployment.structure.extensions.Observer2
+org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver1
+org.jboss.weld.tests.unit.deployment.structure.extensions.CountingObserver2

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution)

Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml	2010-07-28 11:35:11 UTC (rev 6821)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -1,5 +0,0 @@
-<beans>
-	<alternatives>
-		<class>org.jboss.weld.tests.unit.deployment.structure.nonTransitiveResolution.Alt</class>
-	</alternatives>
-</beans>
\ No newline at end of file

Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml (from rev 6821, core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml	2010-07-28 19:55:56 UTC (rev 6828)
@@ -0,0 +1,5 @@
+<beans>
+	<alternatives>
+		<class>org.jboss.weld.tests.unit.deployment.structure.nonTransitiveResolution.Alt</class>
+	</alternatives>
+</beans>
\ No newline at end of file