Weld SVN: r4431 - cdi-tck/trunk/doc/reference/en-US.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 19:15:12 -0400 (Thu, 29 Oct 2009)
New Revision: 4431
Modified:
cdi-tck/trunk/doc/reference/en-US/introduction.xml
Log:
Document JSR-330 requirement
Modified: cdi-tck/trunk/doc/reference/en-US/introduction.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/introduction.xml 2009-10-29 23:00:15 UTC (rev 4430)
+++ cdi-tck/trunk/doc/reference/en-US/introduction.xml 2009-10-29 23:15:12 UTC (rev 4431)
@@ -206,6 +206,20 @@
(<ulink url="http://java.sun.com/javaee/6/docs/api/">http://java.sun.com/javaee/6/docs/api/</ulink>).
</para>
</listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">JSR-330</emphasis> - CDI builds on JSR-330,
+ and as such JSR-299 implementations must additionally pass the
+ JSR-330 TCK.
+ </para>
+ <tip>
+ <para>
+ The TCK distribution includes <literal>weld/porting-package-lib/weld-inject-tck-runner-X.Y.Z-Q-tests.jar</literal>
+ which contains two classes showing how the CDI RI passes the JSR-330
+ TCK. The source for these classes is available from <ulink url="http://anonsvn.jboss.org/repos/weld/tags/1.0.0-CR2/inject-tck-runner/src/..." />
+ </para>
+ </tip>
+ </listitem>
</itemizedlist>
</section>
15 years, 3 months
Weld SVN: r4430 - cdi-tck/trunk/dist/porting-package.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 19:00:15 -0400 (Thu, 29 Oct 2009)
New Revision: 4430
Modified:
cdi-tck/trunk/dist/porting-package/pom.xml
Log:
WELD-235
Modified: cdi-tck/trunk/dist/porting-package/pom.xml
===================================================================
--- cdi-tck/trunk/dist/porting-package/pom.xml 2009-10-29 22:58:59 UTC (rev 4429)
+++ cdi-tck/trunk/dist/porting-package/pom.xml 2009-10-29 23:00:15 UTC (rev 4430)
@@ -13,7 +13,7 @@
<name>JSR-299 TCK Distribution - Weld Porting Package</name>
<properties>
- <weld.version>1.0.0-CR1</weld.version>
+ <weld.version>1.0.0-SNAPSHOT</weld.version>
</properties>
<dependencies>
@@ -24,6 +24,14 @@
<optional>true</optional>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-inject-tck-runner</artifactId>
+ <version>${weld.version}</version>
+ <optional>true</optional>
+ <scope>compile</scope>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
<build>
15 years, 3 months
Weld SVN: r4429 - in core/trunk/inject-tck-runner: src and 1 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 18:58:59 -0400 (Thu, 29 Oct 2009)
New Revision: 4429
Removed:
core/trunk/inject-tck-runner/src/main/
core/trunk/inject-tck-runner/src/test/resources/
Modified:
core/trunk/inject-tck-runner/pom.xml
Log:
cleanup, WELD-235
Modified: core/trunk/inject-tck-runner/pom.xml
===================================================================
--- core/trunk/inject-tck-runner/pom.xml 2009-10-29 22:36:36 UTC (rev 4428)
+++ core/trunk/inject-tck-runner/pom.xml 2009-10-29 22:58:59 UTC (rev 4429)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
@@ -10,7 +11,7 @@
<artifactId>weld-inject-tck-runner</artifactId>
<name>AtInject TCK runner for Weld</name>
<description>Aggregates dependencies and run's the AtInject TCK for Weld</description>
-
+
<dependencies>
<dependency>
@@ -33,26 +34,26 @@
<groupId>org.atinject</groupId>
<artifactId>inject-tck</artifactId>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
-
+
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -64,7 +65,18 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
+
</project>
15 years, 3 months
Weld SVN: r4428 - in core/trunk/tests/src: test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 18:36:36 -0400 (Thu, 29 Oct 2009)
New Revision: 4428
Modified:
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java
core/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java
Log:
WELD-220
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java 2009-10-29 22:28:49 UTC (rev 4427)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java 2009-10-29 22:36:36 UTC (rev 4428)
@@ -79,7 +79,7 @@
return deployment;
}
- protected WeldBootstrap getBootstrap()
+ public WeldBootstrap getBootstrap()
{
return bootstrap;
}
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java 2009-10-29 22:28:49 UTC (rev 4427)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java 2009-10-29 22:36:36 UTC (rev 4428)
@@ -8,6 +8,19 @@
/**
* Control of the container, used for tests. Wraps up common operations.
*
+ * If you require more control over the container bootstrap lifecycle you should
+ * use the {@link #getLifecycle()} method. For example:
+ *
+ * <code>TestContainer container = new TestContainer(...);
+ * container.getLifecycle().initialize();
+ * container.getLifecycle().getBootstrap().startInitialization();
+ * container.getLifecycle().getBootstrap().deployBeans();
+ * container.getLifecycle().getBootstrap().validateBeans();
+ * container.getLifecycle().getBootstrap().endInitialization();
+ * container.getLifecycle().stopContainer();</code>
+ *
+ * Note that we can easily mix fine-grained calls to bootstrap, and coarse grained calls to {@link TestContainer}.
+ *
* @author pmuir
*
*/
@@ -52,6 +65,7 @@
this.lifecycle = lifecycle;
this.classes = classes;
this.beansXml = beansXml;
+ configureArchive();
}
/**
@@ -77,14 +91,14 @@
*/
public void startContainer()
{
- startContainer(true);
+ getLifecycle().initialize();
+ getLifecycle().beginApplication();
}
/**
- * Starts the container
- * @param beginApplication whether or not beginApplication() should be called
+ * Configure's the archive with the classes and beans.xml
*/
- public void startContainer(boolean beginApplication)
+ protected void configureArchive()
{
MockBeanDeploymentArchive archive = lifecycle.getDeployment().getArchive();
archive.setBeanClasses(classes);
@@ -92,23 +106,9 @@
{
archive.setBeansXmlFiles(beansXml);
}
- lifecycle.initialize();
- if (beginApplication)
- {
- beginApplication();
- }
}
/**
- * Deploys the application. Intended use is in conjunction with {@link #startContainer(boolean)}.
- * {@link #startContainer()} does this step automatically
- */
- public void beginApplication()
- {
- lifecycle.beginApplication();
- }
-
- /**
* Get the context lifecycle, allowing fine control over the contexts' state
*
* @return
@@ -120,12 +120,12 @@
public BeanManagerImpl getBeanManager()
{
- return lifecycle.getBootstrap().getManager(getDeployment().getArchive());
+ return getLifecycle().getBootstrap().getManager(getDeployment().getArchive());
}
public MockDeployment getDeployment()
{
- return lifecycle.getDeployment();
+ return getLifecycle().getDeployment();
}
/**
@@ -134,13 +134,13 @@
*/
public void ensureRequestActive()
{
- if (!lifecycle.isSessionActive())
+ if (!getLifecycle().isSessionActive())
{
- lifecycle.beginSession();
+ getLifecycle().beginSession();
}
- if (!lifecycle.isRequestActive())
+ if (!getLifecycle().isRequestActive())
{
- lifecycle.beginRequest();
+ getLifecycle().beginRequest();
}
}
@@ -150,17 +150,17 @@
*/
public void stopContainer()
{
- if (lifecycle.isRequestActive())
+ if (getLifecycle().isRequestActive())
{
- lifecycle.endRequest();
+ getLifecycle().endRequest();
}
- if (lifecycle.isSessionActive())
+ if (getLifecycle().isSessionActive())
{
- lifecycle.endSession();
+ getLifecycle().endSession();
}
- if (lifecycle.isApplicationActive())
+ if (getLifecycle().isApplicationActive())
{
- lifecycle.endApplication();
+ getLifecycle().endApplication();
}
}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java 2009-10-29 22:28:49 UTC (rev 4427)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java 2009-10-29 22:36:36 UTC (rev 4428)
@@ -41,7 +41,7 @@
List<Class<?>> classes = new ArrayList<Class<?>>();
classes.add(WeldBean.class);
TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
- container.startContainer(false);
+ container.getLifecycle().initialize();
BeanManager bootstrapManager = container.getBeanManager();
assert bootstrapManager != null;
@@ -52,7 +52,7 @@
//Start the application
- container.beginApplication();
+ container.getLifecycle().beginApplication();
container.ensureRequestActive();
//Check the manager is the same as before
15 years, 3 months
Weld SVN: r4427 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 18:28:49 -0400 (Thu, 29 Oct 2009)
New Revision: 4427
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
Log:
WELD-236
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-29 21:53:12 UTC (rev 4426)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-29 22:28:49 UTC (rev 4427)
@@ -57,7 +57,6 @@
import org.jboss.weld.context.SessionContext;
import org.jboss.weld.context.SingletonContext;
import org.jboss.weld.context.api.BeanStore;
-import org.jboss.weld.serialization.spi.ContextualStore;
import org.jboss.weld.ejb.EJBApiAbstraction;
import org.jboss.weld.ejb.EjbDescriptors;
import org.jboss.weld.jsf.JsfApiAbstraction;
@@ -67,6 +66,7 @@
import org.jboss.weld.resources.ClassTransformer;
import org.jboss.weld.resources.DefaultResourceLoader;
import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.serialization.spi.ContextualStore;
import org.jboss.weld.servlet.ServletApiAbstraction;
import org.jboss.weld.transaction.spi.TransactionServices;
import org.jboss.weld.util.Names;
@@ -111,11 +111,10 @@
public Map<BeanDeploymentArchive, BeanDeployment> visit()
{
- Set<BeanDeploymentArchive> seenBeanDeploymentArchives = new HashSet<BeanDeploymentArchive>();
Map<BeanDeploymentArchive, BeanDeployment> managerAwareBeanDeploymentArchives = new HashMap<BeanDeploymentArchive, BeanDeployment>();
for (BeanDeploymentArchive archvive : deployment.getBeanDeploymentArchives())
{
- visit(archvive, managerAwareBeanDeploymentArchives, seenBeanDeploymentArchives);
+ visit(archvive, managerAwareBeanDeploymentArchives, new HashSet<BeanDeploymentArchive>());
}
return managerAwareBeanDeploymentArchives;
}
15 years, 3 months
Weld SVN: r4426 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/passivating and 28 other directories.
by weld-commits@lists.jboss.org
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!";
15 years, 3 months
Weld SVN: r4425 - in core/trunk: impl/src/main/java/org/jboss/weld/introspector and 3 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 17:50:36 -0400 (Thu, 29 Oct 2009)
New Revision: 4425
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
Log:
use @Inject @Delegate
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -28,11 +28,9 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.introspector.ForwardingWeldConstructor;
@@ -67,7 +65,6 @@
private final Bean<T> declaringBean;
private final WeldConstructor<T> constructor;
- private final boolean delegate;
public static <T> ConstructorInjectionPoint<T> of(Bean<T> declaringBean, WeldConstructor<T> constructor)
{
@@ -78,7 +75,6 @@
{
this.declaringBean = declaringBean;
this.constructor = constructor;
- this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
@@ -196,7 +192,7 @@
public boolean isDelegate()
{
- return delegate;
+ return false;
}
public boolean isTransient()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -29,6 +29,7 @@
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Decorator;
+import javax.inject.Inject;
import org.jboss.interceptor.util.InterceptionUtils;
import org.jboss.weld.BeanManagerImpl;
@@ -53,7 +54,7 @@
{
this.declaringBean = declaringBean;
this.field = field;
- this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
+ this.delegate = isAnnotationPresent(Inject.class) && isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
@@ -67,6 +68,7 @@
return declaringBean;
}
+ @Override
public Set<Annotation> getQualifiers()
{
return delegate().getQualifiers();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -28,11 +28,9 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.introspector.ForwardingWeldMethod;
@@ -67,7 +65,6 @@
private final Bean<?> declaringBean;
private final WeldMethod<T, X> method;
- private final boolean delegate;
public static <T, X> MethodInjectionPoint<T, X> of(Bean<?> declaringBean, WeldMethod<T, X> method)
{
@@ -78,7 +75,6 @@
{
this.declaringBean = declaringBean;
this.method = method;
- this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
@@ -278,7 +274,7 @@
public boolean isDelegate()
{
- return delegate;
+ return false;
}
public boolean isTransient()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -63,6 +63,7 @@
return declaringBean;
}
+ @Override
public Set<Annotation> getQualifiers()
{
return delegate().getQualifiers();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -19,11 +19,9 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.Collections;
import java.util.Set;
-import javax.decorator.Delegate;
import javax.enterprise.inject.spi.AnnotatedConstructor;
/**
@@ -36,7 +34,7 @@
{
@SuppressWarnings("unchecked")
- public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Delegate.class));
+ public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = Collections.emptySet();
/**
* Creates a new instance of the class, using this constructor
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -39,7 +39,6 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
@@ -169,13 +168,6 @@
addFieldInjectionPoint(annotatedField, fields, declaringBean);
}
}
- for (WeldField<?, ?> annotatedField : t.getAnnotatedWeldFields(Delegate.class))
- {
- if (!annotatedField.isStatic())
- {
- addFieldInjectionPoint(annotatedField, fields, declaringBean);
- }
- }
t = t.getWeldSuperclass();
}
return injectableFieldsList;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -21,8 +21,9 @@
*/
package org.jboss.weld.test.unit.decorator.simple;
+import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.decorator.Decorator;
+import javax.inject.Inject;
/**
*
@@ -32,7 +33,7 @@
@Decorator
public class SimpleDecorator1
{
- @Delegate
+ @Inject @Delegate
SimpleBean delegate;
public static boolean echo1;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -21,8 +21,9 @@
*/
package org.jboss.weld.test.unit.decorator.simple;
+import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.decorator.Decorator;
+import javax.inject.Inject;
/**
*
@@ -32,7 +33,7 @@
@Decorator
public class SimpleDecorator2
{
- @Delegate
+ @Inject @Delegate
SimpleBean delegate;
public static boolean echo2;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-29 20:12:22 UTC (rev 4424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-29 21:50:36 UTC (rev 4425)
@@ -16,10 +16,9 @@
*/
package org.jboss.weld.test.unit.interceptor.simple;
-import org.jboss.weld.test.unit.interceptor.simple.SimpleBean;
-
-import javax.decorator.Delegate;
import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
/**
*
@@ -29,7 +28,7 @@
@Decorator
public class SimpleDecorator
{
- @Delegate
+ @Inject @Delegate
SimpleBean delegate;
public String doSomething()
15 years, 3 months
Weld SVN: r4424 - examples/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 16:12:22 -0400 (Thu, 29 Oct 2009)
New Revision: 4424
Modified:
examples/trunk/pom.xml
Log:
use snapshot api
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2009-10-29 20:11:59 UTC (rev 4423)
+++ examples/trunk/pom.xml 2009-10-29 20:12:22 UTC (rev 4424)
@@ -86,7 +86,7 @@
<properties>
<jsf.version>2.0.0-RC</jsf.version>
- <weld.api.version>1.0-CR1</weld.api.version>
+ <weld.api.version>1.0-SNAPSHOT</weld.api.version>
<weld.core.version>1.0.0-CR1</weld.core.version>
<weld.extensions.version>1.0.0-CR1</weld.extensions.version>
<jetty.version>6.1.21</jetty.version>
15 years, 3 months
Weld SVN: r4423 - in core/trunk: impl/src/main/java/org/jboss/weld/injection and 4 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 16:11:59 -0400 (Thu, 29 Oct 2009)
New Revision: 4423
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
Log:
@Decorates -> @Delegate
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -31,7 +31,7 @@
import java.util.Map;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.New;
@@ -163,7 +163,7 @@
protected void addInjectionPoint(WeldInjectionPoint<?, ?> injectionPoint)
{
- if (injectionPoint.isAnnotationPresent(Decorates.class))
+ if (injectionPoint.isAnnotationPresent(Delegate.class))
{
this.delegateInjectionPoints.add(injectionPoint);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
@@ -78,7 +78,7 @@
{
this.declaringBean = declaringBean;
this.constructor = constructor;
- this.delegate = isAnnotationPresent(Decorates.class) && declaringBean instanceof Decorator<?>;
+ this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -24,7 +24,7 @@
import java.lang.reflect.Type;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
@@ -53,7 +53,7 @@
{
this.declaringBean = declaringBean;
this.field = field;
- this.delegate = isAnnotationPresent(Decorates.class) && declaringBean instanceof Decorator<?>;
+ this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
@@ -78,7 +78,7 @@
{
this.declaringBean = declaringBean;
this.method = method;
- this.delegate = isAnnotationPresent(Decorates.class) && declaringBean instanceof Decorator<?>;
+ this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -21,7 +21,7 @@
import java.lang.reflect.Type;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
@@ -49,7 +49,7 @@
{
this.declaringBean = declaringBean;
this.parameter = parameter;
- this.delegate = isAnnotationPresent(Decorates.class) && declaringBean instanceof Decorator<?>;
+ this.delegate = isAnnotationPresent(Delegate.class) && declaringBean instanceof Decorator<?>;
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldConstructor.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -23,7 +23,7 @@
import java.util.HashSet;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.inject.spi.AnnotatedConstructor;
/**
@@ -36,7 +36,7 @@
{
@SuppressWarnings("unchecked")
- public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Decorates.class));
+ public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Delegate.class));
/**
* Creates a new instance of the class, using this constructor
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -39,7 +39,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
@@ -169,7 +169,7 @@
addFieldInjectionPoint(annotatedField, fields, declaringBean);
}
}
- for (WeldField<?, ?> annotatedField : t.getAnnotatedWeldFields(Decorates.class))
+ for (WeldField<?, ?> annotatedField : t.getAnnotatedWeldFields(Delegate.class))
{
if (!annotatedField.isStatic())
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -21,7 +21,7 @@
*/
package org.jboss.weld.test.unit.decorator.simple;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -32,7 +32,7 @@
@Decorator
public class SimpleDecorator1
{
- @Decorates
+ @Delegate
SimpleBean delegate;
public static boolean echo1;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -21,7 +21,7 @@
*/
package org.jboss.weld.test.unit.decorator.simple;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -32,7 +32,7 @@
@Decorator
public class SimpleDecorator2
{
- @Decorates
+ @Delegate
SimpleBean delegate;
public static boolean echo2;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-29 20:04:32 UTC (rev 4422)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-29 20:11:59 UTC (rev 4423)
@@ -18,7 +18,7 @@
import org.jboss.weld.test.unit.interceptor.simple.SimpleBean;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
/**
@@ -29,7 +29,7 @@
@Decorator
public class SimpleDecorator
{
- @Decorates
+ @Delegate
SimpleBean delegate;
public String doSomething()
15 years, 3 months
Weld SVN: r4422 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/passivating and 29 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)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()
{
15 years, 3 months