Author: marius.bogoevici Date: 2009-12-15 00:05:36 -0500 (Tue, 15 Dec 2009) New Revision: 5286 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java Log: CDITCK-84. Adding constructors to generic classes in order to avoid ambiguous definitions. Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -1,6 +1,14 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; +import javax.enterprise.inject.Alternative; + class FunnelWeaver<T> { + String name; + + FunnelWeaver(String name) + { + this.name = name; + } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -28,7 +28,7 @@ @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() { - return new FunnelWeaver<Spider>(); + return new FunnelWeaver<Spider>("Weaver"); } @Produces public Animal makeASpider() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -2,5 +2,8 @@ class AnimalFarmer extends Farmer<Animal> { - + AnimalFarmer() + { + super("AnimalFarmer"); + } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -2,5 +2,10 @@ public class Cat<T> { + String name; + public Cat(String name) + { + this.name = name; + } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -6,7 +6,7 @@ public DomesticCat(String name) { - // TODO Auto-generated constructor stub + super(name); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -5,5 +5,8 @@ @Typed(FlightlessBird.class) public class Emu extends FlightlessBird<Australian> { - + public Emu() + { + super("Emu"); + } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -2,5 +2,11 @@ class Farmer<T> { + String name; + Farmer(String name) + { + this.name = name; + } + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -3,4 +3,11 @@ public class FlightlessBird<T> { + String name; + + public FlightlessBird(String name) + { + this.name = name; + } + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -5,7 +5,7 @@ public Lion(String name) { - // TODO Auto-generated constructor stub + super(name); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-12-14 19:09:35 UTC (rev 5285) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-12-15 05:05:36 UTC (rev 5286) @@ -2,5 +2,8 @@ class ScottishFishFarmer extends Farmer<ScottishFish> { - + ScottishFishFarmer() + { + super("ScottishFishFarmer"); + } }