svn commit: r1387894 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java cdi/ThreadSingletonServiceImpl.java

[rmannibucau]

Author: rmannibucau
Date: Thu Sep 20 07:31:18 2012
New Revision: 1387894

URL: http://svn.apache.org/viewvc?rev=1387894&view=rev
Log:
owb proxyfactory using our openejb.owb.proxy-factory property even in fallback 
method

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
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/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1387894&r1=1387893&r2=1387894&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Thu Sep 20 07:31:18 2012
@@ -51,6 +51,7 @@ import org.apache.openejb.cdi.CustomELAd
 import org.apache.openejb.cdi.ManagedSecurityService;
 import org.apache.openejb.cdi.OpenEJBTransactionService;
 import org.apache.openejb.cdi.OptimizedLoaderService;
+import org.apache.openejb.cdi.ThreadSingletonServiceImpl;
 import org.apache.openejb.component.ClassLoaderEnricher;
 import org.apache.openejb.core.ConnectorReference;
 import org.apache.openejb.core.CoreContainerSystem;
@@ -991,7 +992,7 @@ public class Assembler extends Assembler
             services.put(ScannerService.class, new CdiScanner());
             services.put(ELAdaptor.class, new CustomELAdapter(appContext));
             services.put(LoaderService.class, new OptimizedLoaderService());
-//            services.put(org.apache.webbeans.proxy.ProxyFactory.class, new 
AsmFactory());
+            services.put(org.apache.webbeans.proxy.ProxyFactory.class, new 
org.apache.webbeans.proxy.ProxyFactory(ThreadSingletonServiceImpl.owbProxyFactory()));
             final Properties properties = new Properties();
             
properties.setProperty(org.apache.webbeans.spi.SecurityService.class.getName(), 
ManagedSecurityService.class.getName());
             webBeansContext = new WebBeansContext(services, properties);

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=1387894&r1=1387893&r2=1387894&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 Sep 20 07:31:18 2012
@@ -72,7 +72,7 @@ public class ThreadSingletonServiceImpl 
         // no-op
     }
 
-    private static Factory owbProxyFactory() {
+    public static Factory owbProxyFactory() {
         if 
("asm".equals(SystemInstance.get().getProperty(OPENEJB_OWB_PROXY_FACTORY))) {
             return new AsmFactory();
         }