[weld-commits] Weld SVN: r4426 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/passivating and 28 other directories.

Author: pete.muir(a)jboss.org Date: 2009-10-29 17:53:12 -0400 (Thu, 29 Oct 2009) New Revision: 4426 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/CatDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/CatDecorator.java Log: use @Inject @Delegate Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -4,13 +4,14 @@ import java.util.List; import javax.annotation.PreDestroy; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class InteriorDecorator { - @Delegate @Room Interior interior; + @Inject @Delegate @Room Interior interior; private static List<InteriorDecorator> instances = new ArrayList<InteriorDecorator>(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,14 +2,15 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.Any; +import javax.inject.Inject; @Decorator class CityDecorator implements CityInterface, Serializable { - @Delegate @Any CityInterface city; + @Inject @Delegate @Any CityInterface city; public void foo() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,8 +2,8 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.Any; import javax.inject.Inject; @@ -11,7 +11,7 @@ @Decorator public class CityDecorator implements CityInterface, Serializable { - @Delegate @Any CityInterface city; + @Inject @Delegate @Any CityInterface city; @Inject public CityDecorator(NonPassivating nonPassivating) {} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,8 +2,8 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.Any; import javax.inject.Inject; @@ -11,7 +11,7 @@ @Decorator class CityDecorator implements CityInterface, Serializable { - @Delegate @Any CityInterface city; + @Inject @Delegate @Any CityInterface city; @Inject public void init(NonPassivating nonPassivating) {} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,8 +2,8 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.Any; import javax.inject.Inject; @@ -11,7 +11,7 @@ @Decorator class CityDecorator implements CityInterface, Serializable { - @Delegate @Any CityInterface city; + @Inject @Delegate @Any CityInterface city; @Inject NonPassivating nonPassivating; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,14 +2,14 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; @Decorator class BrokenDecorator implements EspooLocal_Broken, Serializable { - @Delegate EspooLocal_Broken espooLocal; + @Inject @Delegate EspooLocal_Broken espooLocal; @Inject public BrokenDecorator(District district) {} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,11 +1,12 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class MaarianhaminaDecorator implements MaarianHaminaLocal_Broken { - @Delegate MaarianHaminaLocal_Broken maarianHamina; + @Inject @Delegate MaarianHaminaLocal_Broken maarianHamina; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,14 +2,14 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; @Decorator class BrokenDecorator implements EspooLocal_Broken, Serializable { - @Delegate EspooLocal_Broken espooLocal; + @Inject @Delegate EspooLocal_Broken espooLocal; @Inject public void init(District district) {} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,14 +2,14 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; @Decorator class BrokenDecorator implements EspooLocal_Broken, Serializable { - @Delegate EspooLocal_Broken espooLocal; + @Inject @Delegate EspooLocal_Broken espooLocal; @Inject District district; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class MaarianhaminaDecorator { - @Delegate Maarianhamina_Broken maarianHamina; + @Inject @Delegate Maarianhamina_Broken maarianHamina; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,6 +28,6 @@ public class BazDecorator implements Baz { - @Delegate Bazt bazt; + @Inject @Delegate Bazt bazt; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,6 +28,6 @@ public class BazDecorator1 implements Baz { - @Delegate Bazt bazt; + @Inject @Delegate Bazt bazt; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,6 +28,6 @@ public class FieldDecorator implements Field { - @Delegate Field field; + @Inject @Delegate Field field; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -17,8 +17,9 @@ package org.jboss.jsr299.tck.tests.decorators.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -33,6 +34,6 @@ * */ private static final long serialVersionUID = -2253839366401409666L; - @Delegate FooBar foobar; + @Inject @Delegate FooBar foobar; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,6 +28,6 @@ public abstract class TimestampLogger implements Logger { - @Delegate Logger logger; + @Inject @Delegate Logger logger; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class PresentDecorator { - @Delegate Present present; + @Inject @Delegate Present present; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,7 +28,7 @@ public abstract class TimestampLogger implements Logger { - @Delegate private Logger logger; + @Inject @Delegate private Logger logger; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,7 +28,7 @@ public abstract class TimestampLogger implements Logger { - @Delegate private Logger logger; + @Inject @Delegate private Logger logger; public void log(String string) { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,7 +28,7 @@ public abstract class TimestampLogger implements Logger { - @Delegate Logger logger; - @Delegate Logger logger2; + @Inject @Delegate Logger logger; + @Inject @Delegate Logger logger2; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,8 +1,9 @@ package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates; import javax.decorator.Delegate; +import javax.inject.Inject; class Elf { - @Delegate ChristmasTree tree; + @Inject @Delegate ChristmasTree tree; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** * @author pmuir @@ -27,6 +28,6 @@ public abstract class TimestampLogger implements Logger, EnhancedLogger { - @Delegate private Logger logger; + @Inject @Delegate private Logger logger; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.Produces; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateField; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** @@ -30,7 +31,7 @@ public static final String PREFIX = TimestampLogger.class.getSimpleName(); - @Delegate + @Inject @Delegate private Logger instanceField; private static Logger field; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -17,14 +17,15 @@ package org.jboss.jsr299.tck.tests.decorators.interceptor; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator public class FooDecorator implements Foo { public static String NAME = "FooDecorator"; - @Delegate Foo foo; + @Inject @Delegate Foo foo; public void doSomething() { CallOrder.addCaller(NAME); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; @@ -63,7 +63,7 @@ FooDecorator1.injectionPoint = null; } - @Delegate Foo foo; + @Inject @Delegate Foo foo; public void log(String message) { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; @@ -59,7 +59,7 @@ FooDecorator2.injectionPoint = null; } - @Delegate Foo foo; + @Inject @Delegate Foo foo; public void log(String message) { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,8 +2,9 @@ import java.io.Serializable; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator public class PigStyDecorator implements PigSty, Serializable @@ -20,7 +21,7 @@ decoratorCalled = false; } - @Delegate + @Inject @Delegate transient PigSty pigSty; public void clean() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** @@ -34,7 +35,7 @@ private static boolean initializeCalled; - @Delegate + @Inject @Delegate private Logger logger; public void log(String message) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation.observer; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** @@ -28,7 +29,7 @@ public class ObserverDecorator { - @Delegate + @Inject @Delegate private Observer observer; public void observe(Foo foo) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -16,8 +16,9 @@ */ package org.jboss.jsr299.tck.tests.decorators.invocation.producer.method; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; /** @@ -28,7 +29,7 @@ public class ProducerDecorator { - @Delegate + @Inject @Delegate private Producer producer; public Foo produce() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,13 +1,13 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; import javax.inject.Inject; @Decorator class DataAccessAuthorizationDecorator implements DataAccess { - @Delegate + @Inject @Delegate DataAccess delegate; @Inject Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,11 +1,12 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator abstract class AnimalDecorator implements Animal { - @Delegate Animal delegate; + @Inject @Delegate Animal delegate; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,12 +1,13 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; import javax.interceptor.Interceptor; @Decorator @Interceptor class InterceptingDecorator { - @Delegate Automobile automobile; + @Inject @Delegate Automobile automobile; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,12 +1,13 @@ package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class FooDecorator { - @Delegate Foo delegate; + @Inject @Delegate Foo delegate; public void bar() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -72,7 +72,7 @@ validateServletListenerAnnotatedType(ProcessInjectionTargetObserver.getListenerEvent().getAnnotatedType()); } - @Test + @Test(groups = "ri-broken") @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aad"), @SpecAssertion(section = "11.5.6", id = "abd"), @@ -152,7 +152,7 @@ validateServletListenerAnnotatedType(ProcessAnnotatedTypeObserver.getListenerEvent().getAnnotatedType()); } - @Test + @Test(groups = "ri-broken") @SpecAssertion(section = "12.3", id = "bf") public void testProcessAnnotatedTypeEventFiredForTagHandler() { assert ProcessAnnotatedTypeObserver.getTagHandlerEvent() != null; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/CatDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/CatDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/CatDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,13 +1,15 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class CatDecorator extends Cat { - @Delegate Cat bean; + @Inject @Delegate Cat bean; + @Override public String hello() { return bean.hello() + " world!"; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -2,13 +2,14 @@ import java.util.Date; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class TimestampLogger implements Logger { - @Delegate + @Inject @Delegate private Logger logger; private static Logger staticLogger; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/CatDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/CatDecorator.java 2009-10-29 21:50:36 UTC (rev 4425) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/CatDecorator.java 2009-10-29 21:53:12 UTC (rev 4426) @@ -1,13 +1,15 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator; +import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.decorator.Decorator; +import javax.inject.Inject; @Decorator class CatDecorator extends Cat { - @Delegate Cat bean; + @Inject @Delegate Cat bean; + @Override public String hello() { return bean.hello() + " world!";