svn commit: r1629708 - in /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi: OpenEJBLifecycle.java ThreadSingletonServiceImpl.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct  6 16:47:38 2014
New Revision: 1629708

URL: http://svn.apache.org/r1629708
Log:
TOMEE-1382 allow to override LoaderService of OWB + don't load for free cdi 
extensions

Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1629708&r1=1629707&r2=1629708&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
 Mon Oct  6 16:47:38 2014
@@ -169,9 +169,6 @@ public class OpenEJBLifecycle implements
 
             //Deploy the beans
             try {
-                //Load Extensions
-                
webBeansContext.getExtensionLoader().loadExtensionServices(Thread.currentThread().getContextClassLoader());
 // init in OpenEJBLifecycle
-
                 //Initialize contexts
                 this.contextsService.init(startupObject);
 

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1629708&r1=1629707&r2=1629708&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 Mon Oct  6 16:47:38 2014
@@ -121,9 +121,9 @@ public class ThreadSingletonServiceImpl 
         services.put(ELAdaptor.class, new CustomELAdapter(appContext));
         services.put(ScannerService.class, new CdiScanner());
         final LoaderService loaderService = 
SystemInstance.get().getComponent(LoaderService.class);
-        if (loaderService == null) {
+        if (loaderService == null && 
!properties.containsKey(LoaderService.class.getName())) {
             services.put(LoaderService.class, new OptimizedLoaderService());
-        } else {
+        } else if (loaderService != null) {
             services.put(LoaderService.class, loaderService);
         }