OWB-1049 removing failoverservice references
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/12e1a440 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/12e1a440 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/12e1a440 Branch: refs/heads/master Commit: 12e1a440a44de3817e8faea60804f752491d8266 Parents: 7840b09 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Sun May 3 22:26:11 2015 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Mon May 4 19:49:52 2015 +0200 ---------------------------------------------------------------------- .../org/apache/openejb/cdi/ThreadSingletonServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/12e1a440/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java index 5564b8f..e5c36d0 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java @@ -47,8 +47,6 @@ import org.apache.webbeans.spi.TransactionService; import org.apache.webbeans.spi.adaptor.ELAdaptor; import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler; -import javax.enterprise.inject.spi.DeploymentException; -import javax.transaction.Transactional; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -56,6 +54,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; +import javax.enterprise.inject.spi.DeploymentException; +import javax.transaction.Transactional; /** * @version $Rev:$ $Date:$ @@ -71,7 +71,6 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService { //this needs to be static because OWB won't tell us what the existing SingletonService is and you can't set it twice. private static final ThreadLocal<WebBeansContext> contexts = new ThreadLocal<WebBeansContext>(); private static final Map<ClassLoader, WebBeansContext> contextByClassLoader = new ConcurrentHashMap<ClassLoader, WebBeansContext>(); - private static final String WEBBEANS_FAILOVER_ISSUPPORTFAILOVER = "org.apache.webbeans.web.failover.issupportfailover"; @Override public void initialize(final StartupObject startupObject) { @@ -114,9 +113,6 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService { properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped", defaultNormalScopeHandlerClass); } - if (SystemInstance.get().getOptions().get(WEBBEANS_FAILOVER_ISSUPPORTFAILOVER, false)) { - properties.setProperty(WEBBEANS_FAILOVER_ISSUPPORTFAILOVER, "true"); - } properties.put(OpenWebBeansConfiguration.PRODUCER_INTERCEPTION_SUPPORT, SystemInstance.get().getProperty("openejb.cdi.producer.interception", "true"));