[webbeans-commits] Webbeans SVN: r2756 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 19:00:24 -0400 (Wed, 03 Jun 2009)
New Revision: 2756
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/IntermediateOrderProcessor.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/…
[View More]EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-03 22:46:13 UTC (rev 2755)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-03 23:00:24 UTC (rev 2756)
@@ -214,19 +214,20 @@
assert OrderProcessor.preDestroyCalled;
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "4.2", id = "bbd")
public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception
{
OrderProcessor.preDestroyCalled = false;
- assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1;
+ assert getCurrentManager().getBeans(OrderProcessorLocal.class).size() == 1;
new RunInDependentContext()
{
@Override
protected void execute() throws Exception
{
- Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next();
- IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class);
+ Bean<OrderProcessorLocal> bean = getCurrentManager().getBeans(OrderProcessorLocal.class).iterator().next();
+ OrderProcessorLocal instance = getCurrentManager().getInstanceByType(OrderProcessorLocal.class);
+ instance.order();
destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-03 22:46:13 UTC (rev 2755)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-03 23:00:24 UTC (rev 2756)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
-class IntermediateOrderProcessor extends OrderProcessor
+public class IntermediateOrderProcessor extends OrderProcessor
{
}
\ No newline at end of file
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2755 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 9 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 18:46:13 -0400 (Wed, 03 Jun 2009)
New Revision: 2755
Modified:
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
tck/trunk/impl/src/main/java/…
[View More]org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
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/Kassel.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
Log:
updates for ejb remove methods
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -72,7 +72,7 @@
*/
public <T> T getEnterpriseBean(Class<? extends T> beanType, Class<T> localInterface);
- public <T> void destroyBeanInstance(Bean<T> bean, T instance);
+ public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance);
public <T> T createBeanInstance(Bean<T> bean);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -163,8 +163,8 @@
* @param bean the bean
* @param instance the instance to destroy
*/
- public <T> void destroyBeanInstance(Bean<T> bean, T instance)
+ public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance)
{
- getCurrentConfiguration().getBeans().destroyBeanInstance(bean, instance);
+ getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -97,7 +97,7 @@
Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
Tarantula tarantula = createBeanInstance(tarantulaBean);
assert tarantula != null;
- destroyBeanInstance(tarantulaBean, tarantula);
+ destroyAndRemoveBeanInstance(tarantulaBean, tarantula);
assert SpiderProducer.getInstanceUsedForDisposal() != null;
assert SpiderProducer.getInstanceUsedForDisposal() != spiderProducer;
}
@@ -204,7 +204,7 @@
Tarantula tarantula = createBeanInstance(tarantulaBean);
assert tarantula != null;
SpiderProducer.setDependentContextActive(false);
- destroyBeanInstance(tarantulaBean, tarantula);
+ destroyAndRemoveBeanInstance(tarantulaBean, tarantula);
assert SpiderProducer.isDependentContextActive();
}
@@ -288,7 +288,7 @@
farm.open();
Stable.destroyed = false;
Horse.destroyed = false;
- destroyBeanInstance(farmBean, farm);
+ destroyAndRemoveBeanInstance(farmBean, farm);
assert Stable.destroyed;
assert Horse.destroyed;
}
@@ -317,7 +317,7 @@
Bean<FoxRun> bean = getCurrentManager().getBeans(FoxRun.class).iterator().next();
FoxRun instance = createBeanInstance(bean);
assert instance.fox != instance.anotherFox;
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
assert Fox.isDestroyed();
assert Fox.getDestroyCount() == 2;
}
@@ -405,7 +405,7 @@
// Reset test class state
SpiderProducer.setDestroyed(false);
- destroyBeanInstance(tarantulaBean, tarantula);
+ destroyAndRemoveBeanInstance(tarantulaBean, tarantula);
assert SpiderProducer.isDestroyed();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -68,7 +68,7 @@
HouseLocal instance = createBeanInstance(bean);
Room.destroyed = false;
Table.destroyed = false;
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
assert Room.destroyed;
assert Table.destroyed;
}
@@ -91,7 +91,7 @@
FarmLocal farm = createBeanInstance(farmBean);
Horse.destroyed = false;
Stable.destroyed = false;
- destroyBeanInstance(farmBean, farm);
+ destroyAndRemoveBeanInstance(farmBean, farm);
assert Horse.destroyed;
assert Stable.destroyed;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -38,7 +38,7 @@
{
Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
Tarantula instance = getCurrentManager().getInstance(tarantula);
- destroyBeanInstance(tarantula, instance);
+ destroyAndRemoveBeanInstance(tarantula, instance);
}
}.run();
@@ -61,7 +61,7 @@
{
Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
Tarantula instance = getCurrentManager().getInstance(tarantula);
- destroyBeanInstance(tarantula, instance);
+ destroyAndRemoveBeanInstance(tarantula, instance);
}
}.run();
@@ -88,7 +88,7 @@
{
Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next();
Tarantula instance = getCurrentManager().getInstance(tarantula);
- destroyBeanInstance(tarantula, instance);
+ destroyAndRemoveBeanInstance(tarantula, instance);
}
}.run();
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-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -81,7 +81,7 @@
//frankfurt.dispose();
}
- @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration", "ri-broken" })
+ @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions({
@SpecAssertion(section = "6.5", id = "b"),
@SpecAssertion(section = "6", id = "e")
@@ -93,7 +93,8 @@
assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
Context requestContext = getCurrentManager().getContext(RequestScoped.class);
KleinStadt kassel = createBeanInstance(stadtBean);
- destroyBeanInstance(stadtBean, kassel);
+ kassel.ping();
+ destroyAndRemoveBeanInstance(stadtBean, kassel);
assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed";
kassel = requestContext.get(stadtBean);
@@ -148,14 +149,14 @@
assert alteStadt.getAnotherPlaceOfInterest() != null;
}
- @Test(groups = { "enterpriseBeans", "lifecycle", "ri-broken" })
+ @Test(groups = { "enterpriseBeans", "lifecycle" })
@SpecAssertion(section = "6.11", id = "f")
public void testDependentObjectsDestroyed()
{
UniStadt marburg = getCurrentManager().getInstanceByType(UniStadt.class);
assert marburg != null : "Couldn't find the main SFSB";
Bean<UniStadt> uniStadtBean = getCurrentManager().getBeans(UniStadt.class).iterator().next();
- destroyBeanInstance(uniStadtBean, marburg);
+ destroyAndRemoveBeanInstance(uniStadtBean, marburg);
GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
assert frankfurt.isSchlossDestroyed();
}
@@ -194,7 +195,7 @@
assert OrderProcessor.postConstructCalled;
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "4.2", id = "bbb")
public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
{
@@ -207,7 +208,7 @@
{
Bean<DirectOrderProcessorLocal> bean = getCurrentManager().getBeans(DirectOrderProcessorLocal.class).iterator().next();
DirectOrderProcessorLocal instance = getCurrentManager().getInstanceByType(DirectOrderProcessorLocal.class);
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
assert OrderProcessor.preDestroyCalled;
@@ -226,7 +227,7 @@
{
Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next();
IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class);
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
assert OrderProcessor.preDestroyCalled;
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-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -2,16 +2,16 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
@Stateful
@RequestScoped
public class Kassel implements KleinStadt, SchoeneStadt
{
- @EJB
+ @Current
private GrossStadt grossStadt;
@PostConstruct
@@ -30,5 +30,7 @@
{
grossStadt.kleinStadtDestroyed();
}
+
+ public void ping() {}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -11,4 +11,6 @@
public void zustandVerloren();
+ public void ping();
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -94,7 +94,7 @@
FoxLocal newFox = getCurrentManager().getInstanceByType(FoxLocal.class, new NewLiteral());
Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next();
Litter litter = getCurrentManager().getInstanceByType(Litter.class);
- destroyBeanInstance(litterBean, litter);
+ destroyAndRemoveBeanInstance(litterBean, litter);
assert fox.isLitterDisposed();
assert !newFox.isLitterDisposed();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -71,7 +71,7 @@
assert getCurrentManager().getBeans(String.class).size() == 1;
String aString = getCurrentManager().getInstanceByType(String.class);
Bean<String> stringBean = getCurrentManager().getBeans(String.class).iterator().next();
- destroyBeanInstance(stringBean, aString);
+ destroyAndRemoveBeanInstance(stringBean, aString);
assert BeanWithStaticProducerMethod.stringDestroyed;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -40,7 +40,7 @@
SpiderProducer.setTarantulaDestroyed(false);
Tarantula tarantula = getCurrentManager().getInstanceByType(Tarantula.class);
Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next();
- destroyBeanInstance(tarantulaBean, tarantula);
+ destroyAndRemoveBeanInstance(tarantulaBean, tarantula);
assert SpiderProducer.isTarantulaDestroyed();
assert SpiderProducer.isDestroyArgumentsSet();
assert !SpiderProducerNotUsed.isTarantulaDestroyed();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -156,7 +156,7 @@
assert farm.founded != null;
assert farm.initialStaff == 20;
assert farm.closed == null;
- destroyBeanInstance(farmBean, farm);
+ destroyAndRemoveBeanInstance(farmBean, farm);
assert farm.closed != null;
}
@@ -172,7 +172,7 @@
assert !EggProducer.isEggDisposed();
assert !Egg.isEggDestroyed();
- destroyBeanInstance(gooseBean, goose);
+ destroyAndRemoveBeanInstance(gooseBean, goose);
assert EggProducer.isEggDisposed();
//TODO Apparently Dependent scoped injected objects do not have their PreDestroy method called
//assert Egg.isEggDestroyed();
@@ -187,7 +187,7 @@
Bean<Cod> codBean = getCurrentManager().getBeans(Cod.class).iterator().next();
Cod codInstance = getCurrentManager().getInstanceByType(Cod.class);
codInstance.ping();
- destroyBeanInstance(codBean, codInstance);
+ destroyAndRemoveBeanInstance(codBean, codInstance);
}
@Test(groups = "beanLifecycle")
@@ -198,7 +198,7 @@
{
Bean<FishPond> pondBean = getCurrentManager().getBeans(FishPond.class).iterator().next();
FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class);
- destroyBeanInstance(pondBean, fishPond);
+ destroyAndRemoveBeanInstance(pondBean, fishPond);
assert Salmon.isBeanDestroyed();
}
@@ -249,7 +249,7 @@
{
Bean<CdOrderProcessor> bean = getCurrentManager().getBeans(CdOrderProcessor.class).iterator().next();
CdOrderProcessor instance = getCurrentManager().getInstanceByType(CdOrderProcessor.class);
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
assert OrderProcessor.preDestroyCalled;
@@ -268,7 +268,7 @@
{
Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next();
IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class);
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
assert OrderProcessor.preDestroyCalled;
@@ -304,7 +304,7 @@
{
Bean<NovelOrderProcessor> bean = getCurrentManager().getBeans(NovelOrderProcessor.class).iterator().next();
NovelOrderProcessor instance = getCurrentManager().getInstanceByType(NovelOrderProcessor.class);
- destroyBeanInstance(bean, instance);
+ destroyAndRemoveBeanInstance(bean, instance);
}
}.run();
assert !OrderProcessor.preDestroyCalled;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-06-03 22:46:00 UTC (rev 2754)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-06-03 22:46:13 UTC (rev 2755)
@@ -150,7 +150,7 @@
Fox newFox = getCurrentManager().getInstanceByType(Fox.class, new NewLiteral());
Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next();
Litter litter = getCurrentManager().getInstanceByType(Litter.class);
- destroyBeanInstance(litterBean, litter);
+ destroyAndRemoveBeanInstance(litterBean, litter);
assert fox.isLitterDisposed();
assert !newFox.isLitterDisposed();
}
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2754 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean/proxy and 3 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 18:46:00 -0400 (Wed, 03 Jun 2009)
New Revision: 2754
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java
ri/trunk/impl/src/main/java/org/jboss/…
[View More]webbeans/context/AbstractMapContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java
Log:
updates for ejb remove method support
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -268,7 +268,7 @@
}
else
{
- // TODO getManager().getEjbResolver().removeEjb(enterpiseBeanInstance.getUnproxiedInstances());
+ enterpiseBeanInstance.destroy();
}
}
@@ -402,7 +402,7 @@
public SessionObjectReference createReference()
{
- return manager.getServices().get(EjbServices.class).resolveEjb(getEjbDescriptor());
+ return manager.getServices().get(EjbServices.class).resolveEjb(getEjbDescriptor().delegate());
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -25,6 +25,7 @@
public interface EnterpriseBeanInstance
{
+ // TODO These methods may conflict :-(
/**
* Indicated if a remove method has been invoked by the application
*
@@ -34,4 +35,6 @@
public void setDestroyed(boolean destroyed);
+ public void destroy();
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -113,7 +113,7 @@
{
throw new IllegalArgumentException("enterpriseBeanInstance.setDestroyed() called with >1 argument");
}
- if (!args[0].getClass().equals(boolean.class))
+ if (!(args[0].getClass().equals(boolean.class) || args[0].getClass().equals(Boolean.class)))
{
throw new IllegalArgumentException("enterpriseBeanInstance.setDestroyed() called with non-boolean argument");
}
@@ -125,6 +125,12 @@
return null;
}
+ if ("destroy".equals(method.getName()))
+ {
+ reference.remove();
+ return null;
+ }
+
Class<?> businessInterface = method.getDeclaringClass();
if (businessInterface.equals(Object.class))
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -95,6 +95,6 @@
return active.get();
}
- public abstract <T> void destroy(Contextual<T> contextual, T instance);
+ public abstract <T> void destroyAndRemove(Contextual<T> contextual, T instance);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -122,13 +122,19 @@
}
/**
- * Destroys a bean
+ * Destroys and removes bean
*
* @param <T> The type of the bean
* @param contextual The contextual type to destroy
*/
- public <T> void destroy(Contextual<T> contextual, T instance)
+ public <T> void destroyAndRemove(Contextual<T> contextual, T instance)
{
+ destroy(contextual);
+ getBeanStore().remove(contextual);
+ }
+
+ private <T> void destroy(Contextual<T> contextual)
+ {
log.trace("Destroying " + contextual);
if (getBeanStore() == null)
{
@@ -138,12 +144,6 @@
contextual.destroy(beanInstance.getInstance(), beanInstance.getCreationalContext());
}
- private <T> void destroy(Contextual<T> contextual)
- {
- BeanInstance<T> beanInstance = getBeanStore().get(contextual);
- destroy(contextual, beanInstance.getInstance());
- }
-
/**
* Destroys the context
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -160,7 +160,7 @@
}
}
- public <T> void destroy(Contextual<T> contextual, T instance)
+ public <T> void destroyAndRemove(Contextual<T> contextual, T instance)
{
if (contextual instanceof Bean)
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -33,7 +33,6 @@
{
private final Class<?> objectInterface;
- private final boolean local;
private final EjbDescriptor<T> delegate;
public InternalEjbDescriptor(EjbDescriptor<T> ejbDescriptor)
@@ -43,26 +42,19 @@
if (it.hasNext())
{
this.objectInterface = it.next().getInterface();
- this.local = true;
}
else
{
this.objectInterface = null;
- this.local = false;
}
}
@Override
- protected EjbDescriptor<T> delegate()
+ public EjbDescriptor<T> delegate()
{
return delegate;
}
- public boolean isLocal()
- {
- return local;
- }
-
public Class<?> getObjectInterface()
{
return objectInterface;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -78,7 +78,11 @@
bean.preDestroy(target);
if (contextual)
{
- getEnterpriseBeanInstance(bean).setDestroyed(true);
+ EnterpriseBeanInstance instance = getEnterpriseBeanInstance(bean);
+ if (instance != null)
+ {
+ instance.setDestroyed(true);
+ }
}
invocationContext.proceed();
}
@@ -112,6 +116,10 @@
{
return (EnterpriseBeanInstance) instance;
}
+ else if (instance == null)
+ {
+ return null;
+ }
else
{
throw new IllegalStateException("Contextual instance not an session bean created by the container");
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-06-03 15:29:52 UTC (rev 2753)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-06-03 22:46:00 UTC (rev 2754)
@@ -75,7 +75,7 @@
// Get the EJB Descriptor and resolve it
if (CurrentManager.rootManager().getNewEnterpriseBeanMap().containsKey(beanType))
{
- EjbDescriptor<?> ejbDescriptor = CurrentManager.rootManager().getNewEnterpriseBeanMap().get(beanType).getEjbDescriptor();
+ EjbDescriptor<?> ejbDescriptor = CurrentManager.rootManager().getNewEnterpriseBeanMap().get(beanType).getEjbDescriptor().delegate();
return CurrentManager.rootManager().getServices().get(EjbServices.class).resolveEjb(ejbDescriptor).getBusinessObject(localInterface);
}
throw new NullPointerException("No EJB found for " + localInterface.getName() + " on bean " + beanType.getName());
@@ -86,12 +86,12 @@
return CurrentManager.rootManager().getCurrent().getInstance(bean, true);
}
- public <T> void destroyBeanInstance(Bean<T> bean, T instance)
+ public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance)
{
Context context = CurrentManager.rootManager().getCurrent().getContext(bean.getScopeType());
if (context instanceof AbstractContext)
{
- ((AbstractContext) context).destroy(bean, instance);
+ ((AbstractContext) context).destroyAndRemove(bean, instance);
}
else
{
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2753 - tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 11:29:52 -0400 (Wed, 03 Jun 2009)
New Revision: 2753
Modified:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/web.xml
Log:
parsing problems (huh?)
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/…
[View More]conversation/client/web.xml 2009-06-03 15:16:48 UTC (rev 2752)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/web.xml 2009-06-03 15:29:52 UTC (rev 2753)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2752 - in ri/trunk: jboss-tck-runner and 2 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 11:16:48 -0400 (Wed, 03 Jun 2009)
New Revision: 2752
Modified:
ri/trunk/jboss-as/build.properties
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/tests/pom.xml
ri/trunk/version-matrix/pom.xml
Log:
switch to jboss 5.1 for tck runs
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-06-03 14:18:51 UTC (rev 2751)
+++ ri/trunk/jboss-as/…
[View More]build.properties 2009-06-03 15:16:48 UTC (rev 2752)
@@ -1,5 +1,5 @@
# Container a number of properties associated with installing Web Beans into JBoss AS and running the TCK in JBoss AS
-#jboss.home=/Applications/jboss-5.0.1.GA
+#jboss.home=/Applications/jboss-5.1.0.GA
org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
# time to allow before attempting to restart JBoss AS
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-06-03 14:18:51 UTC (rev 2751)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-06-03 15:16:48 UTC (rev 2752)
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-50</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-51</artifactId>
</dependency>
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-06-03 14:18:51 UTC (rev 2751)
+++ ri/trunk/tests/pom.xml 2009-06-03 15:16:48 UTC (rev 2752)
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-50</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-51</artifactId>
<scope>test</scope>
</dependency>
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-06-03 14:18:51 UTC (rev 2751)
+++ ri/trunk/version-matrix/pom.xml 2009-06-03 15:16:48 UTC (rev 2752)
@@ -315,49 +315,17 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-tomcat</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-51</artifactId>
<version>${jboss.test.harness.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.jboss.naming</groupId>-->
-<!-- <artifactId>jnp-client</artifactId>-->
-<!-- <version>5.0.1.GA</version>-->
-<!-- </dependency>-->
-<!-- -->
-<!-- <dependency>-->
-<!-- <groupId>org.jboss.aspects</groupId>-->
-<!-- <artifactId>jboss-security-aspects</artifactId>-->
-<!-- <version>1.0.0.GA</version>-->
-<!-- </dependency>-->
-<!-- -->
-<!-- <dependency>-->
-<!-- <groupId>org.jboss.aspects</groupId>-->
-<!-- <artifactId>jboss-remoting-aspects</artifactId>-->
-<!-- <version>1.0.1.GA</version>-->
-<!-- </dependency>-->
-<!-- -->
-<!-- -->
-<!-- <dependency>-->
-<!-- <groupId>oswego-concurrent</groupId>-->
-<!-- <artifactId>concurrent</artifactId>-->
-<!-- <version>1.3.4-jboss-update1</version>-->
-<!-- </dependency>-->
-
<dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <version>5.0.3.GA</version>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-tomcat</artifactId>
+ <version>${jboss.test.harness.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>5.0.1.GA</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>6.0.18</version>
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2751 - tck/trunk.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 10:18:51 -0400 (Wed, 03 Jun 2009)
New Revision: 2751
Modified:
tck/trunk/pom.xml
Log:
update to latest test harness
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-06-03 12:49:25 UTC (rev 2750)
+++ tck/trunk/pom.xml 2009-06-03 14:18:51 UTC (rev 2751)
@@ -65,7 +65,7 @@
<properties>
<jboss.test.audit.version>0.9.1</jboss.test.audit.version&…
[View More]gt;
- <jboss.test.harness.version>1.0.0.BETA2</jboss.test.harness.version>
+ <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
</properties>
<dependencyManagement>
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2750 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: tests/definition/binding/enterprise and 3 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 08:49:25 -0400 (Wed, 03 Jun 2009)
New Revision: 2750
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/…
[View More]implementation/disposal/method/definition/broken6/AppleTreeLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
Log:
Fix broken tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -124,7 +124,7 @@
* @param annotationTypes The annotations to match
* @return True if match, false otherwise
*/
- public boolean annotationSetMatches(Set<Annotation> annotations, Class<? extends Annotation>... annotationTypes)
+ public boolean annotationSetMatches(Set<? extends Annotation> annotations, Class<? extends Annotation>... annotationTypes)
{
List<Class<? extends Annotation>> annotationTypeList = new ArrayList<Class<? extends Annotation>>();
annotationTypeList.addAll(Arrays.asList(annotationTypes));
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -3,6 +3,8 @@
import java.lang.annotation.Annotation;
import java.util.Set;
+import javax.enterprise.inject.Any;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -21,8 +23,7 @@
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
Set<? extends Annotation> bindings = getCurrentManager().getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
- assert bindings.size() == 1;
- assert bindings.iterator().next().annotationType().equals(Hairy.class);
+ assert annotationSetMatches(bindings, Any.class, Hairy.class);
}
@Test
@@ -30,7 +31,6 @@
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
Set<? extends Annotation> bindings = getCurrentManager().getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
- assert bindings.size() == 1;
- assert bindings.iterator().next().annotationType().equals(Hairy.class);
+ assert annotationSetMatches(bindings, Any.class, Hairy.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
import javax.ejb.Stateless;
+import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
@Stateless
@@ -10,4 +11,10 @@
{
return new Apple();
}
+
+ public void recycle(@Disposes Apple apple)
+ {
+
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -5,4 +5,7 @@
@Local
public interface AppleTreeLocal
{
+
+ public Apple getApple();
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -7,10 +7,15 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
@Artifact
@ExpectedDeploymentException(DefinitionException.class)
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
public class DisposalMethodOnSessionBean extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -15,7 +15,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class NotDeclaredNamespaceTest extends AbstractJSR299Test
{
- @Test(groups = { "xml" })
+ @Test(groups = { "xml" , "broken"})
@SpecAssertions({
@SpecAssertion(section="9", id="e")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-06-03 12:15:16 UTC (rev 2749)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-06-03 12:49:25 UTC (rev 2750)
@@ -19,7 +19,7 @@
@BeansXml("beans.xml")
public class DeclarationOfResourceTest extends AbstractJSR299Test
{
- @Test(groups = { "xml" })
+ @Test(groups = { "xml", "broken" })
@SpecAssertions( {
@SpecAssertion(section = "6.9", id = "f"),
@SpecAssertion(section = "3.6", id = "a"),
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2749 - ri/trunk/jboss-as.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 08:15:16 -0400 (Wed, 03 Jun 2009)
New Revision: 2749
Modified:
ri/trunk/jboss-as/build.properties
Log:
switch to dev versions
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-06-03 12:14:53 UTC (rev 2748)
+++ ri/trunk/jboss-as/build.properties 2009-06-03 12:15:16 UTC (rev 2749)
@@ -7,7 +7,7 @@
# maximum number of TCK tests to deploy …
[View More]before restarting JBoss AS
# jboss.deployments.restart = 25
-webbeans-ri-int.version=5.2.0.Beta2
-webbeans.version=1.0.0.PREVIEW1
+webbeans-ri-int.version=5.2.0-SNAPSHOT
+webbeans.version=1.0.0-SNAPSHOT
jboss-ejb3.version=1.0.0
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2748 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: servlet and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 08:14:53 -0400 (Wed, 03 Jun 2009)
New Revision: 2748
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
Actually disable session context at end of request
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
===================================================================
--- ri/trunk/impl/…
[View More]src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-06-03 12:14:35 UTC (rev 2747)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-06-03 12:14:53 UTC (rev 2748)
@@ -26,6 +26,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
@@ -59,5 +60,17 @@
String beanStoreInfo = getBeanStore() == null ? "" : getBeanStore().toString();
return active + "session context " + beanStoreInfo;
}
+
+ @Override
+ public void setActive(boolean active)
+ {
+ super.setActive(active);
+ }
+
+ @Override
+ public void setBeanStore(BeanStore beanStore)
+ {
+ super.setBeanStore(beanStore);
+ }
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-06-03 12:14:35 UTC (rev 2747)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-06-03 12:14:53 UTC (rev 2748)
@@ -153,6 +153,7 @@
}
lifecycle.endRequest(request.getRequestURI(), beanStore);
request.removeAttribute(REQUEST_ATTRIBUTE_NAME);
+ SessionContext.instance().setActive(false);
SessionContext.instance().setBeanStore(null);
}
}
[View Less]
15 years, 8 months
[webbeans-commits] Webbeans SVN: r2747 - ri/trunk/version-matrix.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-03 08:14:35 -0400 (Wed, 03 Jun 2009)
New Revision: 2747
Modified:
ri/trunk/version-matrix/pom.xml
Log:
Use current test-harness
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-06-03 12:14:10 UTC (rev 2746)
+++ ri/trunk/version-matrix/pom.xml 2009-06-03 12:14:35 UTC (rev 2747)
@@ -51,7 +51,7 @@
<webbeans.version>1.0.0-SNAPSHOT</…
[View More]webbeans.version>
<webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
<webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
- <jboss.test.harness.version>1.0.0.BETA2</jboss.test.harness.version>
+ <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
</properties>
<dependencyManagement>
[View Less]
15 years, 8 months