Repository: tomee Updated Branches: refs/heads/master 196acf3e4 -> 1d6f59104
import + arquillian CDI detection fix Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1d6f5910 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1d6f5910 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1d6f5910 Branch: refs/heads/master Commit: 1d6f59104126543bd36cfa2b2555aa6080c4aa48 Parents: 196acf3 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Wed Aug 24 15:57:21 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Wed Aug 24 15:57:21 2016 +0200 ---------------------------------------------------------------------- .../org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java | 5 +++-- .../org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java | 5 +++-- .../apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1d6f5910/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java index 3aec416..46d5e11 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java @@ -17,7 +17,7 @@ package org.apache.tomee.arquillian.remote; -import org.apache.openejb.cdi.ThreadSingletonServiceImpl; +import org.apache.openejb.util.AppFinder; import org.apache.webbeans.config.WebBeansContext; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; @@ -40,7 +40,8 @@ public class RemoteTomEEObserver { private InstanceProducer<Context> context; public void beforeSuite(@Observes final BeforeSuite event) { - final WebBeansContext webBeansContext = ThreadSingletonServiceImpl.get(Thread.currentThread().getContextClassLoader()); + final WebBeansContext webBeansContext = AppFinder.findAppContextOrWeb( + Thread.currentThread().getContextClassLoader(), AppFinder.WebBeansContextTransformer.INSTANCE); if (webBeansContext != null) { beanManager.set(webBeansContext.getBeanManagerImpl()); } http://git-wip-us.apache.org/repos/asf/tomee/blob/1d6f5910/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java index a015f69..d5f6c94 100644 --- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java +++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java @@ -17,7 +17,7 @@ package org.apache.tomee.arquillian.webapp; -import org.apache.openejb.cdi.ThreadSingletonServiceImpl; +import org.apache.openejb.util.AppFinder; import org.apache.webbeans.config.WebBeansContext; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; @@ -39,7 +39,8 @@ public class TomEEWebappObserver { private InstanceProducer<Context> context; public void beforeSuite(@Observes final BeforeSuite event) { - final WebBeansContext webBeansContext = ThreadSingletonServiceImpl.get(Thread.currentThread().getContextClassLoader()); + final WebBeansContext webBeansContext = AppFinder.findAppContextOrWeb( + Thread.currentThread().getContextClassLoader(), AppFinder.WebBeansContextTransformer.INSTANCE); if (webBeansContext != null) { beanManager.set(webBeansContext.getBeanManagerImpl()); } http://git-wip-us.apache.org/repos/asf/tomee/blob/1d6f5910/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java index 247e493..b28b049 100644 --- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java +++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java @@ -22,7 +22,6 @@ import org.apache.openejb.config.NewLoaderLogic; import org.apache.openejb.loader.Files; import org.apache.openejb.util.AppFinder; import org.apache.openejb.util.URLs; -import org.apache.webbeans.config.WebBeansContext; import org.apache.xbean.finder.UrlSet; import javax.faces.context.ExternalContext;