Author: rmannibucau
Date: Thu Jan 3 14:37:35 2013
New Revision: 1428363
URL: http://svn.apache.org/viewvc?rev=1428363&view=rev
Log:
TOMEE-698 org.apache.webbeans.spi.FailOverService config in appInfo.properties
or system properties
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1428363&r1=1428362&r2=1428363&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
Thu Jan 3 14:37:35 2013
@@ -97,6 +97,12 @@ public class ThreadSingletonServiceImpl
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",
(String) null));
+ if (failoverService != null) {
+
properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES,
failoverService);
+ }
+
properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped",
ApplicationScopedBeanInterceptorHandler.class.getName());
if (SystemInstance.get().getProperty("openejb.loader",
"foo").startsWith("tomcat")) {
properties.setProperty("org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped",
RequestScopedBeanInterceptorHandler.class.getName());
