[webbeans-commits] Webbeans SVN: r1719 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/producer/field and 4 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-26 10:02:21 -0500 (Thu, 26 Feb 2009) New Revision: 1719 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/OtherSpiderProducer.java Log: Migrate more tests to @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -3,7 +3,7 @@ import javax.inject.Produces; @AnotherDeploymentType -public class OtherSpiderProducer +class OtherSpiderProducer { @Produces @Tame public Tarantula produceTarantula = new Tarantula(); } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -interface Animal -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class BlackWidow extends Spider implements DeadlySpider -{ - public void bite() - { - // Test method used for proxy instances to force - // creation of the instance. - } -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +class BlackWidow extends Spider implements DeadlySpider +{ + public void bite() + { + // Test method used for proxy instances to force + // creation of the instance. + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.annotation.Named; -import javax.inject.Produces; - -public class BlackWidowProducer -{ - public static BlackWidow blackWidow = new BlackWidow(); - @Produces - @Named("blackWidow") - public BlackWidow produceBlackWidow = blackWidow; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Chicken.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Chicken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -class Chicken -{ - - @Produces - private Egg egg = new Egg(); - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DaddyLongLegs.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DaddyLongLegs.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,5 +1,6 @@ package org.jboss.jsr299.tck.unit.implementation.producer.field; + class DaddyLongLegs extends Spider { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -interface DeadlyAnimal -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,5 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; -class DefangedTarantula extends Tarantula -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + + +class DefangedTarantula extends Tarantula +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Egg.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Egg.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class Egg -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Current; - -public class FunnelWeaverSpiderConsumer -{ - @Current - private FunnelWeaver<Spider> injectedSpider; - - public FunnelWeaver<Spider> getInjectedSpider() - { - return injectedSpider; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -public class FunnelWeaverSpiderProducer -{ - private static FunnelWeaver<Spider> spider; - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); - - public FunnelWeaverSpiderProducer() - { - spider = this.getFunnelWeaverSpider; - } - - public static FunnelWeaver<Spider> getSpider() - { - return spider; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/InfertileChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/InfertileChicken.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/InfertileChicken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class InfertileChicken extends Chicken -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -10,6 +10,7 @@ { private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + @Produces public Spider[] getSpiders = ALL_SPIDERS; @Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula(); @@ -28,8 +29,8 @@ @Produces @Named("SpiderSize") public int getWolfSpiderSize = 4; - @Produces public Spider[] getSpiders = ALL_SPIDERS; + @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); @Produces public Spider getNullSpider = null; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,251 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import javax.context.RequestScoped; -import javax.inject.DefinitionException; -import javax.inject.Production; -import javax.inject.Standard; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.literals.CurrentBinding; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class ProducerFieldDefinitionTest extends AbstractDeclarativeTest -{ - - /* - * (non-Javadoc) - * - * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes() - */ - @SuppressWarnings("unchecked") - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - // Add a local deployment type used in tests - return Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class)); - } - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "2.5.3", id = "h") - public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception - { - deployBeans(TarantulaProducer.class, TarantulaConsumer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5", id = "f") - public void testParameterizedReturnType() throws Exception - { - deployBeans(FunnelWeaverSpiderProducer.class, FunnelWeaverSpiderConsumer.class); - new RunInDependentContext() - { - public void execute() - { - FunnelWeaverSpiderConsumer spiderConsumer = getCurrentManager().getInstanceByType(FunnelWeaverSpiderConsumer.class); - assert spiderConsumer != null; - assert spiderConsumer.getInjectedSpider() != null; - assert spiderConsumer.getInjectedSpider().equals(FunnelWeaverSpiderProducer.getSpider()); - } - }.run(); - } - - @Test(groups = "producerField", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.5", id = "g") - public void testParameterizedReturnTypeWithWildcard() - { - deployBeans(SpiderProducerWildCardType_Broken.class); - } - - @Test(groups = { "producerField", "deployment" }) - @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "j"), - @SpecAssertion(section = "3.5", id = "c"), - @SpecAssertion(section = "3.5.2", id ="a") - }) - public void testBeanDeclaresMultipleProducerFields() - { - deployBeans(OtherSpiderProducer.class); - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "2.3.1", id = "a") - }) - public void testDefaultBindingType() - { - deployBeans(StaticTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.1", id = "c") - public void testApiTypeForClassReturn() - { - deployBeans(StaticTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getTypes().size() == 6; - assert tarantulaModel.getTypes().contains(Tarantula.class); - assert tarantulaModel.getTypes().contains(DeadlySpider.class); - assert tarantulaModel.getTypes().contains(Spider.class); - assert tarantulaModel.getTypes().contains(Animal.class); - assert tarantulaModel.getTypes().contains(DeadlyAnimal.class); - assert tarantulaModel.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "a") - public void testApiTypeForInterfaceReturn() - { - deployBeans(SpiderAsAnimalProducer.class); - Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class); - assert !animalBeans.isEmpty(); - Bean<Animal> animalModel = animalBeans.iterator().next(); - assert animalModel.getTypes().size() == 2; - assert animalModel.getTypes().contains(Animal.class); - assert animalModel.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.5.1", id = "b") - public void testApiTypeForPrimitiveReturn() - { - deployBeans(OtherSpiderProducer.class); - Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize"); - assert !beans.isEmpty(); - Bean<?> intModel = beans.iterator().next(); - assert intModel.getTypes().size() == 2; - assert intModel.getTypes().contains(int.class); - assert intModel.getTypes().contains(Object.class); - } - - @Test(groups = { "producerField" }) - @SpecAssertions({ - @SpecAssertion(section = "3.5.1", id = "b"), - @SpecAssertion(section = "2.2", id = "j") - }) - public void testApiTypeForArrayTypeReturn() - { - deployBeans(OtherSpiderProducer.class); - Set<Bean<Spider[]>> spidersModels = getCurrentManager().resolveByType(Spider[].class); - assert !spidersModels.isEmpty(); - Bean<Spider[]> spidersModel = spidersModels.iterator().next(); - assert spidersModel.getTypes().size() == 2; - assert spidersModel.getTypes().contains(Spider[].class); - assert spidersModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "f"), - @SpecAssertion(section="2.3.3", id="c") - }) - public void testBindingType() - { - deployBeans(TameTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "b") - public void testScopeType() - { - deployBeans(TameTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - - // TODO Inherit scope from returned web bean? - } - - @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "d") - public void testDeploymentType() - { - deployBeans(TameTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "3.5.2", id = "c"), - @SpecAssertion(section="2.6.1", id = "d") - }) - public void testNamedField() - { - deployBeans(BlackWidowProducer.class); - Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow"); - assert !beans.isEmpty(); - - @SuppressWarnings("unchecked") - Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); - assert blackWidowModel.getName().equals("blackWidow"); - } - - @Test(groups = { "producerField" }) - @SpecAssertions({ - @SpecAssertion(section = "2.6.3", id = "b"), - @SpecAssertion(section = "3.5.4", id = "a"), - @SpecAssertion(section = "2.6.1", id = "d") - }) - public void testDefaultNamedField() - { - deployBeans(StaticTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getName().equals("produceTarantula"); - } - - // review 2.2 - @Test(groups = "producerField") - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "c"), - @SpecAssertion(section = "3.5.2", id = "e") - }) - public void testStereotype() - { - deployBeans(StaticTarantulaProducer.class); - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); - assert !tarantulaBeans.isEmpty(); - Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); - assert tarantulaModel.getScopeType().equals(RequestScoped.class); - assert tarantulaModel.getDeploymentType().equals(Production.class); - } - - @Test(groups = "producerField") - @SpecAssertion(section = "4.2", id = "k") - public void testNonStaticProducerFieldNotInherited() - { - deployBeans(InfertileChicken.class); - assert getCurrentManager().resolveByType(Egg.class).size() == 0; - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class Spider implements Animal -{ - - private static final long serialVersionUID = 1L; - - public void layEggs() - { - - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +class Spider implements Animal +{ + + private static final long serialVersionUID = 1L; + + public void layEggs() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -public class SpiderAsAnimalProducer -{ - @Produces - public Animal makeASpider = new WolfSpider(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -public class SpiderProducerWildCardType_Broken -{ - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderStereotype.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderStereotype.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; -import javax.inject.Production; - -/** - * Test stereotype used to change the scope type and deployment type - * of another bean, in particular a producer field bean. - * - * @author David Allen - * - */ -(a)Stereotype(requiredTypes=Spider.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@Production -@Named -public @interface SpiderStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/StaticTarantulaProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/StaticTarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,26 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -public class StaticTarantulaProducer -{ - @Produces @SpiderStereotype public static Tarantula produceTarantula = new Tarantula(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameAnnotationLiteral.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameAnnotationLiteral.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.AnnotationLiteral; - -class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameTarantulaProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameTarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.context.RequestScoped; -import javax.inject.Produces; -import javax.inject.Production; - -public class TameTarantulaProducer -{ - @Produces @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Current; - -/** - * This bean contains an injection point for a Tarantula that must be provided - * by the container via a (static) producer field. - * - * @author David Allen - * - */ -public class TarantulaConsumer -{ - @Current - private Tarantula consumedTarantula; - - public Tarantula getConsumedTarantula() - { - return consumedTarantula; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -import javax.inject.Produces; - -@AnotherDeploymentType -public class TarantulaProducer -{ - @Produces public Tarantula produceTarantula = new Tarantula(); - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + +import javax.inject.Produces; + +@AnotherDeploymentType +class TarantulaProducer +{ + @Produces public Tarantula produceTarantula = new Tarantula(); + +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java 2009-02-26 12:22:44 UTC (rev 1718) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.field; - -class WolfSpider implements Animal -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field; + + +class WolfSpider implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Animal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AnotherDeploymentType.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface AsAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/AsAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidow.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +class BlackWidow extends Spider implements DeadlySpider +{ + public void bite() + { + // Test method used for proxy instances to force + // creation of the instance. + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.annotation.Named; +import javax.inject.Produces; + +public class BlackWidowProducer +{ + public static BlackWidow blackWidow = new BlackWidow(); + @Produces + @Named("blackWidow") + public BlackWidow produceBlackWidow = blackWidow; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/BlackWidowProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Chicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Chicken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Produces; + + +class Chicken +{ + + @Produces @Foo + private Egg egg = new Egg(this); + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + + +class DaddyLongLegs extends Spider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DaddyLongLegs.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlyAnimal.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DeadlySpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/DefangedTarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + + +class DefangedTarantula extends Tarantula +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Egg.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Egg.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +class Egg +{ + + private final Chicken mother; + + public Egg(Chicken mother) + { + super(); + this.mother = mother; + } + + public Chicken getMother() + { + return mother; + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Foo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Current; + +class FunnelWeaverSpiderConsumer +{ + @Current + private FunnelWeaver<Spider> injectedSpider; + + public FunnelWeaver<Spider> getInjectedSpider() + { + return injectedSpider; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/FunnelWeaverSpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Produces; + +class FunnelWeaverSpiderProducer +{ + private static FunnelWeaver<Spider> spider; + @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); + + public FunnelWeaverSpiderProducer() + { + spider = this.getFunnelWeaverSpider; + } + + public static FunnelWeaver<Spider> getSpider() + { + return spider; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/InfertileChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/InfertileChicken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + + +@AnotherDeploymentType +class InfertileChicken extends Chicken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class LadybirdSpider extends Spider +{ + + public void spinWeb() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/LadybirdSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.annotation.Named; +import javax.inject.Produces; + +@AnotherDeploymentType +class OtherSpiderProducer +{ + + public static final Tarantula TARANTULA = new Tarantula(); + public static final BlackWidow BLACK_WIDOW = new BlackWidow(); + + @Produces @Tame public Tarantula produceTarantula = TARANTULA; + + @Produces @Tame private BlackWidow produceBlackWidow = BLACK_WIDOW; + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + @Produces public Spider[] getSpiders = ALL_SPIDERS; + + @Produces @Named("SpiderSize") public int getWolfSpiderSize = 4; +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/OtherSpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,222 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.context.RequestScoped; +import javax.inject.AnnotationLiteral; +import javax.inject.Production; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class ProducerFieldDefinitionTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; + private static final Annotation STATIC_LITERAL = new AnnotationLiteral<Static>() {}; + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "2.5.3", id = "h") + public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5", id = "f") + public void testParameterizedReturnType() throws Exception + { + new RunInDependentContext() + { + public void execute() + { + FunnelWeaverSpiderConsumer spiderConsumer = getCurrentManager().getInstanceByType(FunnelWeaverSpiderConsumer.class); + assert spiderConsumer != null; + assert spiderConsumer.getInjectedSpider() != null; + assert spiderConsumer.getInjectedSpider().equals(FunnelWeaverSpiderProducer.getSpider()); + } + }.run(); + } + + @Test(groups = { "producerField", "deployment" }) + @SpecAssertions({ + @SpecAssertion(section = "3.5", id = "j"), + @SpecAssertion(section = "3.5", id = "c"), + @SpecAssertion(section = "3.5.2", id ="a") + }) + public void testBeanDeclaresMultipleProducerFields() + { + assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL).equals(OtherSpiderProducer.TARANTULA) ; + assert getCurrentManager().resolveByType(BlackWidow.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getInstanceByType(BlackWidow.class, TAME_LITERAL).equals(OtherSpiderProducer.BLACK_WIDOW) ; + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "2.3.1", id = "a") + }) + public void testDefaultBindingType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentBinding()); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.1", id = "c") + public void testApiTypeForClassReturn() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaBean = tarantulaBeans.iterator().next(); + assert tarantulaBean.getTypes().size() == 6; + assert tarantulaBean.getTypes().contains(Tarantula.class); + assert tarantulaBean.getTypes().contains(DeadlySpider.class); + assert tarantulaBean.getTypes().contains(Spider.class); + assert tarantulaBean.getTypes().contains(Animal.class); + assert tarantulaBean.getTypes().contains(DeadlyAnimal.class); + assert tarantulaBean.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "3.5.1", id = "a") + public void testApiTypeForInterfaceReturn() + { + Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<AsAnimal>() {}); + assert animalBeans.size() == 1; + Bean<Animal> animalModel = animalBeans.iterator().next(); + assert animalModel.getTypes().size() == 2; + assert animalModel.getTypes().contains(Animal.class); + assert animalModel.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertion(section = "3.5.1", id = "b") + public void testApiTypeForPrimitiveReturn() + { + Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize"); + assert beans.size() == 1; + Bean<?> intModel = beans.iterator().next(); + assert intModel.getTypes().size() == 2; + assert intModel.getTypes().contains(int.class); + assert intModel.getTypes().contains(Object.class); + } + + @Test(groups = { "producerField" }) + @SpecAssertions({ + @SpecAssertion(section = "3.5.1", id = "b"), + @SpecAssertion(section = "2.2", id = "j") + }) + public void testApiTypeForArrayTypeReturn() + { + Set<Bean<Spider[]>> spidersBeans = getCurrentManager().resolveByType(Spider[].class); + assert spidersBeans.size() == 1; + Bean<Spider[]> spidersModel = spidersBeans.iterator().next(); + assert spidersModel.getTypes().size() == 2; + assert spidersModel.getTypes().contains(Spider[].class); + assert spidersModel.getTypes().contains(Object.class); + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "f"), + @SpecAssertion(section="2.3.3", id="c") + }) + public void testBindingType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getBindings().size() == 1; + assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.2", id = "b") + public void testScopeType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5.2", id = "d") + public void testDeploymentType() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getDeploymentType().equals(Production.class); + } + + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "c"), + @SpecAssertion(section="2.6.1", id = "d") + }) + public void testNamedField() + { + Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow"); + assert beans.size() == 1; + + @SuppressWarnings("unchecked") + Bean<BlackWidow> blackWidowModel = (Bean<BlackWidow>) beans.iterator().next(); + assert blackWidowModel.getName().equals("blackWidow"); + } + + @Test(groups = { "producerField" }) + @SpecAssertions({ + @SpecAssertion(section = "2.6.3", id = "b"), + @SpecAssertion(section = "3.5.4", id = "a"), + @SpecAssertion(section = "2.6.1", id = "d") + }) + public void testDefaultNamedField() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + assert tarantulaBeans.size() == 1; + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getName().equals("produceTarantula"); + } + + // review 2.2 + @Test(groups = "producerField") + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "c"), + @SpecAssertion(section = "3.5.2", id = "e") + }) + public void testStereotype() + { + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + assert !tarantulaBeans.isEmpty(); + Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); + assert tarantulaModel.getScopeType().equals(RequestScoped.class); + assert tarantulaModel.getDeploymentType().equals(Production.class); + } + + @Test(groups = "producerField") + @SpecAssertion(section = "4.2", id = "k") + public void testNonStaticProducerFieldNotInherited() + { + assert !(getCurrentManager().getInstanceByType(Egg.class, FOO_LITERAL).getMother() instanceof InfertileChicken); + } +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Spider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +class Spider implements Animal +{ + + private static final long serialVersionUID = 1L; + + public void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderAsAnimalProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Produces; + + +@AnotherDeploymentType +class SpiderAsAnimalProducer +{ + @Produces @AsAnimal + public Animal makeASpider = new WolfSpider(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderAsAnimalProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.RequestScoped; +import javax.inject.Production; + +/** + * Test stereotype used to change the scope type and deployment type + * of another bean, in particular a producer field bean. + * + * @author David Allen + * + */ +(a)Stereotype(requiredTypes=Spider.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@Named +@Production +@interface SpiderStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/SpiderStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Static +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Static.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/StaticTarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,28 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Produces; + + +@AnotherDeploymentType +class StaticTarantulaProducer +{ + @Produces @SpiderStereotype @Static public static Tarantula produceTarantula = new Tarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/StaticTarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tame.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameAnnotationLiteral.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.AnnotationLiteral; + +class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TameTarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.context.RequestScoped; +import javax.inject.Produces; +import javax.inject.Production; + + +@AnotherDeploymentType +class TameTarantulaProducer +{ + @Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TameTarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/Tarantula.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaConsumer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Current; + +/** + * This bean contains an injection point for a Tarantula that must be provided + * by the container via a (static) producer field. + * + * @author David Allen + * + */ +class TarantulaConsumer +{ + @Current + private Tarantula consumedTarantula; + + public Tarantula getConsumedTarantula() + { + return consumedTarantula; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/TarantulaProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + +import javax.inject.Produces; + +@AnotherDeploymentType +class TarantulaProducer +{ + @Produces public Tarantula produceTarantula = new Tarantula(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/TarantulaProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/WolfSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/WolfSpider.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition; + + +class WolfSpider implements Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class ParameterizedReturnTypeWithWildcardTest extends AbstractDeclarativeTest +{ + + + @Test(groups = "producerField") + @SpecAssertion(section = "3.5", id = "g") + public void testParameterizedReturnTypeWithWildcard() + { + assert false; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java (from rev 1718, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/SpiderProducerWildCardType_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; + +import javax.inject.Produces; + +public class SpiderProducerWildCardType_Broken +{ + @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml 2009-02-26 15:02:21 UTC (rev 1719) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.field.definition"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/definition/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain