[weld-commits] Weld SVN: r4422 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/passivating and 29 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Oct 29 16:04:35 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-10-29 16:04:32 -0400 (Thu, 29 Oct 2009)
New Revision: 4422
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/DecoratorDefinitionTest.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/delegateConstructor/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/definition/inject/delegateInitializerMethod/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/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:
@Decorates -> @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -4,13 +4,13 @@
import java.util.List;
import javax.annotation.PreDestroy;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class InteriorDecorator
{
- @Decorates @Room Interior interior;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,14 +2,14 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.inject.Any;
@Decorator
class CityDecorator implements CityInterface, Serializable
{
- @Decorates @Any CityInterface city;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+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
{
- @Decorates @Any CityInterface city;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+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
{
- @Decorates @Any CityInterface city;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+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
{
- @Decorates @Any CityInterface city;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/BrokenDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,14 +2,14 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
- @Decorates EspooLocal_Broken espooLocal;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class MaarianhaminaDecorator implements MaarianHaminaLocal_Broken
{
- @Decorates MaarianHaminaLocal_Broken maarianHamina;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,14 +2,14 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
- @Decorates EspooLocal_Broken espooLocal;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,14 +2,14 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@Decorator
class BrokenDecorator implements EspooLocal_Broken, Serializable
{
- @Decorates EspooLocal_Broken espooLocal;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/MaarianhaminaDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class MaarianhaminaDecorator
{
- @Decorates Maarianhamina_Broken maarianHamina;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,6 +27,6 @@
public class BazDecorator implements Baz
{
- @Decorates Bazt bazt;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,6 +27,6 @@
public class BazDecorator1 implements Baz
{
- @Decorates Bazt bazt;
+ @Delegate Bazt bazt;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-29 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -22,7 +22,7 @@
import java.util.HashSet;
import java.util.List;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.util.AnnotationLiteral;
@@ -105,7 +105,7 @@
Decorator<?> decorator = decorators.get(0);
assert decorator.getInjectionPoints().size() == 1;
assert decorator.getInjectionPoints().iterator().next().getType().equals(Logger.class);
- assert decorator.getInjectionPoints().iterator().next().getAnnotated().isAnnotationPresent(Decorates.class);
+ assert decorator.getInjectionPoints().iterator().next().getAnnotated().isAnnotationPresent(Delegate.class);
assert decorator.getDelegateType().equals(Logger.class);
assert decorator.getDelegateQualifiers().size() == 1;
assert annotationSetMatches(decorator.getDelegateQualifiers(), Default.class);
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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,6 +27,6 @@
public class FieldDecorator implements Field
{
- @Decorates Field field;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -33,6 +33,6 @@
*
*/
private static final long serialVersionUID = -2253839366401409666L;
- @Decorates FooBar foobar;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,6 +27,6 @@
public abstract class TimestampLogger implements Logger
{
- @Decorates Logger logger;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,10 +1,10 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class PresentDecorator
{
- @Decorates Present present;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,7 +27,7 @@
public abstract class TimestampLogger implements Logger
{
- @Decorates private Logger logger;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,7 +27,7 @@
public abstract class TimestampLogger implements Logger
{
- @Decorates private Logger logger;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,7 +27,7 @@
public abstract class TimestampLogger implements Logger
{
- @Decorates Logger logger;
- @Decorates Logger logger2;
+ @Delegate Logger logger;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
class Elf
{
- @Decorates ChristmasTree tree;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -27,6 +27,6 @@
public abstract class TimestampLogger implements Logger, EnhancedLogger
{
- @Decorates private Logger logger;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.broken.delegateProducerMethod;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.inject.Produces;
@@ -30,7 +30,7 @@
{
@Produces
- public String setLogger(@Decorates Logger logger)
+ public String setLogger(@Delegate Logger logger)
{
return "";
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-10-29 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@@ -34,7 +34,7 @@
private static Logger constructor;
@Inject
- public TimestampLogger(@Decorates Logger logger)
+ public TimestampLogger(@Delegate Logger logger)
{
constructor = logger;
}
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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateField;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@@ -30,7 +30,7 @@
public static final String PREFIX = TimestampLogger.class.getSimpleName();
- @Decorates
+ @Delegate
private Logger instanceField;
private static Logger field;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-10-29 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@@ -34,7 +34,7 @@
private static Logger initializerMethod;
@Inject
- public void setLogger(@Decorates Logger logger)
+ public void setLogger(@Delegate Logger logger)
{
initializerMethod = logger;
}
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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -17,14 +17,14 @@
package org.jboss.jsr299.tck.tests.decorators.interceptor;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
public class FooDecorator implements Foo {
public static String NAME = "FooDecorator";
- @Decorates Foo foo;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.decorator.Decorates;
+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;
}
- @Decorates Foo foo;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.decorator.Decorates;
+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;
}
- @Decorates Foo foo;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
@@ -20,7 +20,7 @@
decoratorCalled = false;
}
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@@ -34,7 +34,7 @@
private static boolean initializeCalled;
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation.observer;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@@ -28,7 +28,7 @@
public class ObserverDecorator
{
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation.producer.method;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@@ -28,7 +28,7 @@
public class ProducerDecorator
{
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,13 +1,13 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.inject.Inject;
@Decorator
class DataAccessAuthorizationDecorator implements DataAccess
{
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
abstract class AnimalDecorator implements Animal
{
- @Decorates Animal delegate;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.broken.interceptorCanNotBeDecorator;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.interceptor.Interceptor;
@@ -8,5 +8,5 @@
@Interceptor
class InterceptingDecorator
{
- @Decorates Automobile automobile;
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class FooDecorator
{
- @Decorates Foo delegate;
+ @Delegate Foo delegate;
public void bar()
{
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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/CatDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class CatDecorator extends Cat
{
- @Decorates Cat bean;
+ @Delegate Cat bean;
public String hello()
{
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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/TimestampLogger.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -2,13 +2,13 @@
import java.util.Date;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class TimestampLogger implements Logger
{
- @Decorates
+ @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 20:01:08 UTC (rev 4421)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/CatDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
@Decorator
class CatDecorator extends Cat
{
- @Decorates Cat bean;
+ @Delegate Cat bean;
public String hello()
{
More information about the weld-commits
mailing list