tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject [3/4] tomee git commit: OWB-1049 removing failoverservice references
Date Sun, 03 May 2015 22:00:20 GMT
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/cfe9fdf2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cfe9fdf2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cfe9fdf2

Branch: refs/heads/master
Commit: cfe9fdf29149db57097541faf90969e9f3a201b9
Parents: fd7e9b2
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Sun May 3 22:26:11 2015 +0200
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Sun May 3 22:26:11 2015 +0200

----------------------------------------------------------------------
 .../apache/openejb/cdi/CdiAppContextsService.java   |  7 -------
 .../openejb/cdi/ThreadSingletonServiceImpl.java     | 16 ++--------------
 2 files changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/cfe9fdf2/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
index 655af39..b8b49bc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
@@ -744,13 +744,6 @@ public class CdiAppContextsService extends AbstractContextsService implements
Co
                     final HttpSession currentSession = servletRequest.getSession();
                     initSessionContext(currentSession);
 
-                    /*
-                    final FailOverService failoverService = webBeansContext.getService(FailOverService.class);
-                    if (failoverService != null && failoverService.isSupportFailOver())
{
-                        failoverService.sessionIsInUse(currentSession);
-                    }
-                    */
-
                     if (logger.isDebugEnabled()) {
                         logger.debug("Lazy SESSION context initialization SUCCESS");
                     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/cfe9fdf2/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 ed48b9e..2f688f7 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) {
@@ -102,13 +101,6 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService
{
         properties.setProperty(OpenWebBeansConfiguration.APPLICATION_SUPPORTS_CONVERSATION,
"true");
         properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES, "org.apache.aries.proxy.weaving.WovenProxy");
 
-        final String failoverService = startupObject.getAppInfo().properties.getProperty("org.apache.webbeans.spi.FailOverService",
-            SystemInstance.get().getProperty("org.apache.webbeans.spi.FailOverService",
-                null));
-        if (failoverService != null) {
-            properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES, failoverService);
-        }
-
         final boolean tomee = SystemInstance.get().getProperty("openejb.loader", "foo").startsWith("tomcat");
 
         final String defaultNormalScopeHandlerClass = NormalScopedBeanInterceptorHandler.class.getName();
@@ -125,10 +117,6 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService
{
             properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.SessionScoped",
"org.apache.tomee.catalina.cdi.SessionNormalScopeBeanHandler");
         }
 
-        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"));
 
         properties.putAll(appContext.getProperties());


Mime
View raw message