Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABA9C174C8 for ; Mon, 6 Oct 2014 16:48:02 +0000 (UTC) Received: (qmail 32744 invoked by uid 500); 6 Oct 2014 16:48:02 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 32722 invoked by uid 500); 6 Oct 2014 16:48:02 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 32712 invoked by uid 99); 6 Oct 2014 16:48:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2014 16:48:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2014 16:47:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 16E4323889D5; Mon, 6 Oct 2014 16:47:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 06 Oct 2014 16:47:38 -0000 To: commits@tomee.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141006164739.16E4323889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }