Author: rmannibucau Date: Mon Oct 6 16:47:40 2014 New Revision: 1629709 URL: http://svn.apache.org/r1629709 Log: TOMEE-1382 allow to override LoaderService of OWB + don't load for free cdi extensions
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1629709&r1=1629708&r2=1629709&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Mon Oct 6 16:47:40 2014 @@ -167,9 +167,6 @@ public class OpenEJBLifecycle implements //Deploy the beans CdiScanner cdiScanner = null; try { - //Load Extensions - webBeansContext.getExtensionLoader().loadExtensionServices(Thread.currentThread().getContextClassLoader()); // init in OpenEJBLifecycle - //Initialize contexts this.contextsService.init(startupObject); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1629709&r1=1629708&r2=1629709&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java Mon Oct 6 16:47:40 2014 @@ -126,9 +126,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); }