[webbeans-commits] Webbeans SVN: r1014 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation: producer and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2009-01-16 08:21:41 -0500 (Fri, 16 Jan 2009) New Revision: 1014 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java Log: Clean up TCK beans Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Disposes; import javax.webbeans.Initializer; -public class Capercaillie +class Capercaillie { @Initializer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Production; @Production -public class Chicken +class Chicken { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -2,7 +2,7 @@ import javax.webbeans.Initializer; -public class ChickenHutch +class ChickenHutch { public Fox fox; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Production; @Production -public class DangerCall +class DangerCall { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -2,7 +2,7 @@ import javax.webbeans.Initializer; -public class Dottrel +class Dottrel { @Initializer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Dependent; @Dependent -public class Fox +class Fox { public String getName() Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Initializer; import javax.webbeans.Observes; -public class Grouse +class Grouse { @Initializer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Initializer; import javax.webbeans.Produces; -public class Pheasant +class Pheasant { @Initializer Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.Destructor; import javax.webbeans.Initializer; -public class Shrike +class Shrike { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public interface Animal +interface Animal { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -14,7 +14,7 @@ @Retention(RUNTIME) @Documented @DeploymentType -public @interface AnotherDeploymentType +@interface AnotherDeploymentType { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class BlackWidow extends Spider implements DeadlySpider +class BlackWidow extends Spider implements DeadlySpider { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class DaddyLongLegs extends Spider +class DaddyLongLegs extends Spider { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public interface DeadlyAnimal +interface DeadlyAnimal { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public interface DeadlySpider extends DeadlyAnimal +interface DeadlySpider extends DeadlyAnimal { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class FunnelWeaver<T> +class FunnelWeaver<T> { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -3,7 +3,7 @@ import javax.webbeans.ApplicationScoped; @ApplicationScoped -public class LadybirdSpider extends Spider +class LadybirdSpider extends Spider { public void spinWeb() Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,34 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import javax.webbeans.Destructor; -import javax.webbeans.Disposes; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -public class OtherBrokenSpiderProducer -{ - - @Produces - public String observe(@Observes String foo) - { - return "foo"; - } - - @Produces - public String dispose(@Disposes String foo) - { - return "foo"; - } - - @Produces @Destructor - public String destroy() - { - return "foo"; - } - - @Produces @RequestScoped public Spider getRequestScopedSpider = null; - -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,13 +1,13 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -import javax.webbeans.Dependent; import javax.webbeans.Named; import javax.webbeans.Produces; import javax.webbeans.Production; import javax.webbeans.RequestScoped; + @AnotherDeploymentType -public class OtherSpiderProducer +class OtherSpiderProducer { private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; @@ -16,15 +16,11 @@ @Produces public Tarantula produceTarantula = new Tarantula(); - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider = new TrapdoorSpider(); - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow(); @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs = new DaddyLongLegs(); @Produces @Named @Production public LadybirdSpider getLadybirdSpider = new LadybirdSpider(); - - @Produces @Named("Shelob") public Tarantula produceShelob; @Produces @AnimalStereotype public WolfSpider produceWolfSpider = new WolfSpider(); @@ -34,8 +30,6 @@ @Produces public Spider[] getSpiders = ALL_SPIDERS; - @Produces public String[] getStrings = new String[0]; - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java (from rev 1012, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -0,0 +1,34 @@ +package org.jboss.webbeans.tck.tests.implementation.producer; + +import javax.webbeans.Destructor; +import javax.webbeans.Disposes; +import javax.webbeans.Observes; +import javax.webbeans.Produces; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +class OtherSpiderProducer_Broken +{ + + @Produces + public String observe(@Observes String foo) + { + return "foo"; + } + + @Produces + public String dispose(@Disposes String foo) + { + return "foo"; + } + + @Produces @Destructor + public String destroy() + { + return "foo"; + } + + @Produces @RequestScoped public Spider getRequestScopedSpider = null; + +} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -49,9 +49,9 @@ @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"}) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { - Bean<OtherBrokenSpiderProducer> spiderProducer = getSimpleBean(OtherBrokenSpiderProducer.class); + Bean<OtherSpiderProducer_Broken> spiderProducer = getSimpleBean(OtherSpiderProducer_Broken.class); manager.addBean(spiderProducer); - Field method = OtherBrokenSpiderProducer.class.getField("getRequestScopedSpider"); + Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider"); getProducerFieldBean(method, spiderProducer).create(); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class Spider implements Animal +class Spider implements Animal { public final void layEggs() Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -16,7 +16,7 @@ @Retention(RUNTIME) @Documented @BindingType -public @interface Tame +@interface Tame { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class Tarantula extends Spider implements DeadlySpider +class Tarantula extends Spider implements DeadlySpider { } Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -public class TrapdoorSpider -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 13:06:02 UTC (rev 1013) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 13:21:41 UTC (rev 1014) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.implementation.producer; -public class WolfSpider implements Animal +class WolfSpider implements Animal { }