Author: pete.muir(a)jboss.org Date: 2009-02-25 10:40:48 -0500 (Wed, 25 Feb 2009) New Revision: 1707 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java Log: tidy up Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.inject.Initializer; -import javax.inject.New; - - -class AnnotatedConstructorParameter -{ - @Initializer - public AnnotatedConstructorParameter(@New WrappedEnterpriseBean reference) - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.inject.New; - - -class AnnotatedField -{ - @New - WrappedEnterpriseBean reference; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.inject.Initializer; -import javax.inject.New; - - -class AnnotatedInitializerParameter -{ - @Initializer - public void init(@New WrappedEnterpriseBean reference) - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.inject.New; -import javax.inject.Produces; - - -class AnnotatedProducerParameter -{ - @Produces - Object produce(@New WrappedEnterpriseBean reference) - { - return new Object(); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Remove; -import javax.ejb.Stateless; - -@Stateless -class Armant_Broken -{ - @Remove - public void bye() { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,44 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.testng.annotations.Test; - -/** - * - * @author Nicklas Karlsson - * - * Spec version: PRD2 - */ -public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest -{ - - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) - @SpecAssertion(section = "3.3.1", id = "da") - public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class) - @SpecAssertion(section = "3.3.1", id = "c") - public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) - @SpecAssertion(section = "3.3.1", id = "db") - public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed() - { - assert false; - } - - @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" }) - @SpecAssertion(section = "3.3.1", id = "b") - public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateless; - -@Stateless -class Giraffe -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.event.Observes; -import javax.inject.Disposes; - -@Stateful -@RequestScoped -class GoldenRetriever -{ - @Remove - public void bye(@Disposes Object something) { - - } - - public void anObserverMethod(@Observes String event) - { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -class GoodDoggie implements LocalGoodDoggie -{ - - public static boolean destructorCalled = false; - - @Remove - public void bye() { - destructorCalled = true; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - - -class GreatDane -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateless; -import javax.inject.Specializes; - -@Specializes -@Stateless -class GreaterDane extends GreatDane -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.annotation.Named; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@Tame -@Named("Pongo") -class Hound -{ - @Remove - public void bye() { - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Specializes; - -@Specializes -@Stateful -class HoundOfBaskerville extends Hound -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.event.Observes; - -@Stateful -@RequestScoped -class JackRussellTerrier -{ - @Remove - public void bye(@Observes Object something) { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.Dependent; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@Dependent -class Koirus -{ - - public static boolean removeCalled = false; - - @Remove - public void bye(Object param) - { - removeCalled = true; - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.Dependent; -import javax.ejb.Singleton; - -@Singleton -@Dependent -class Labrador -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.ApplicationScoped; -import javax.ejb.Remove; - -//@Singleton -@ApplicationScoped -class Laika -{ - - @Remove - public void remove() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.MessageDriven; -import javax.inject.Production; - -@Production -@MessageDriven -class Leopard /*implements MessageListener*/ -{ - - public void onMessage(/*Message message*/) - { - // TODO Auto-generated method stub - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateful; - -@Tame -@Stateful -class Lion -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Local; -import javax.ejb.Remove; - -@Local -public interface LocalGoodDoggie -{ - @Remove - public void bye(); -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateful; -import javax.inject.Production; - -@Production -@Stateful -class Order -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.annotation.Named; -import javax.context.ApplicationScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@ApplicationScoped -@Named -class Pitbull -{ - - public static boolean destructorCalled = false; - - @Remove - public void bye() - { - destructorCalled = true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Stateful; - -@Stateful -@RequestScoped -class Pumi_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Stateful; - -@Stateful -@RequestScoped -class Rottweiler -{ - public void bye() { - - } - - public void bye2() { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Stateful; - -@Stateful -@RequestScoped -class RussellTerrier -{ - public void bye() { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.inject.Initializer; - -@Stateful -@RequestScoped -class Saluki -{ - @Remove @Initializer - public void bye() { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.inject.Produces; - -@Stateful -@RequestScoped -class Spitz -{ - @Remove @Produces - public void bye() { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -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 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@RequestScoped -class Toller -{ - - public static boolean removeCalled = false; - - @Remove - public void bye() - { - removeCalled = true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.Dependent; -import javax.ejb.Stateful; - -@Stateful -@Dependent -class WelshCorgie -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-02-25 15:24:51 UTC (rev 1706) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.annotation.Named; -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@SessionScoped -@Stateful -@Named("John") -class WrappedEnterpriseBean -{ - @Remove - public void bye() { - } -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:40:48 UTC (rev 1707) @@ -0,0 +1,44 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.remove; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.testng.annotations.Test; + +/** + * + * @author Nicklas Karlsson + * + * Spec version: PRD2 + */ +public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) + @SpecAssertion(section = "3.3.1", id = "da") + public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class) + @SpecAssertion(section = "3.3.1", id = "c") + public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) + @SpecAssertion(section = "3.3.1", id = "db") + public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed() + { + assert false; + } + + @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" }) + @SpecAssertion(section = "3.3.1", id = "b") + public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails() + { + assert false; + } + +}