You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2014/09/08 10:04:29 UTC
svn commit: r1623318 - in /openwebbeans/trunk:
webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
webbeans-tck/standalone-suite.xml
Author: struberg
Date: Mon Sep 8 08:04:28 2014
New Revision: 1623318
URL: http://svn.apache.org/r1623318
Log:
only set the Arquillian BeanManagerProvider after a successful boot
this fixes CDITCK-436 for us.
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
openwebbeans/trunk/webbeans-tck/standalone-suite.xml
Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java?rev=1623318&r1=1623317&r2=1623318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java (original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java Mon Sep 8 08:04:28 2014
@@ -108,7 +108,6 @@ public class OwbStandaloneContainer impl
ContainerLifecycle lifecycle = webBeansContext.getService(ContainerLifecycle.class);
lifecycleProducer.set(lifecycle);
- beanManagerProducer.set(lifecycle.getBeanManager());
OwbArquillianScannerService dummyScannerService = (OwbArquillianScannerService) webBeansContext.getScannerService();
dummyScannerService.setArchive(archive);
@@ -126,6 +125,9 @@ public class OwbStandaloneContainer impl
throw new DeploymentException(e.getMessage(), e);
}
+ // finally make the BeanManager available to Arquillian, but only if the boot succeeded
+ beanManagerProducer.set(lifecycle.getBeanManager());
+
return new ProtocolMetaData();
}
@@ -164,7 +166,6 @@ public class OwbStandaloneContainer impl
public void stop() throws LifecycleException
{
LOG.fine("OpenWebBeans Arquillian stopping");
- //To change body of implemented methods use File | Settings | File Templates.
}
@Override
Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=1623318&r1=1623317&r2=1623318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Mon Sep 8 08:04:28 2014
@@ -66,18 +66,6 @@
</methods>
</class>
- <!-- CDITCK-436 -->
- <class name="org.jboss.cdi.tck.tests.extensions.annotated.delivery.broken.WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- <class name="org.jboss.cdi.tck.tests.extensions.annotated.delivery.broken.WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
<!-- CDITCK-418 -->
<class name="org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb.InterceptorEnvironmentJNDISessionBeanTest">
<methods>