Author: dallen6 Date: 2009-03-11 13:34:29 -0400 (Wed, 11 Mar 2009) New Revision: 1929 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java Log: Changing scopes on test beans. Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-11 17:14:55 UTC (rev 1928) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-11 17:34:29 UTC (rev 1929) @@ -6,7 +6,7 @@ import javax.context.Context; import javax.context.CreationalContext; -import javax.context.SessionScoped; +import javax.context.RequestScoped; import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; @@ -80,17 +80,17 @@ GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; - Context sessionContext = getCurrentManager().getContext(SessionScoped.class); + Context requestContext = getCurrentManager().getContext(RequestScoped.class); CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); - KleinStadt kassel = sessionContext.get(stadtBean, creationalContext); + KleinStadt kassel = requestContext.get(stadtBean, creationalContext); kassel.zustandVergessen(); //assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed"; - kassel = sessionContext.get(stadtBean); + kassel = requestContext.get(stadtBean); assert kassel == null : "SFSB bean should not exist after being destroyed"; frankfurt.dispose(); } - @Test(groups = { "enterpriseBeans", "lifecycle", "integration", "ri-broken" }) + @Test(groups = { "enterpriseBeans", "lifecycle", "integration" }) @SpecAssertion(section = "6.5", id = "c") public void testRemovedEjbIgnored() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-03-11 17:14:55 UTC (rev 1928) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-03-11 17:34:29 UTC (rev 1929) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.SessionScoped; +import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; @Stateful -@SessionScoped +@RequestScoped public class FrankfurtAmMain implements GrossStadt { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-03-11 17:14:55 UTC (rev 1928) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-03-11 17:34:29 UTC (rev 1929) @@ -2,13 +2,13 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.SessionScoped; +import javax.context.RequestScoped; import javax.ejb.EJB; import javax.ejb.Remove; import javax.ejb.Stateful; @Stateful -@SessionScoped +@RequestScoped public class Kassel implements KleinStadt, SchoeneStadt { @EJB