Return-Path: X-Original-To: apmail-myfaces-commits-archive@www.apache.org Delivered-To: apmail-myfaces-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 D010B9EC7 for ; Sun, 4 Mar 2012 14:08:23 +0000 (UTC) Received: (qmail 45605 invoked by uid 500); 4 Mar 2012 14:08:23 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 45546 invoked by uid 500); 4 Mar 2012 14:08:23 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 45538 invoked by uid 99); 4 Mar 2012 14:08:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Mar 2012 14:08:23 +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; Sun, 04 Mar 2012 14:08:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AEDCF238889B for ; Sun, 4 Mar 2012 14:07:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296809 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/ Date: Sun, 04 Mar 2012 14:07:59 -0000 To: commits@myfaces.apache.org From: gpetracek@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120304140759.AEDCF238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gpetracek Date: Sun Mar 4 14:07:59 2012 New Revision: 1296809 URL: http://svn.apache.org/viewvc?rev=1296809&view=rev Log: EXTCDI-271 root-bean-manager support Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/AbstractCdiAwareTestStrategy.java Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java?rev=1296809&r1=1296808&r2=1296809&view=diff ============================================================================== --- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java (original) +++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java Sun Mar 4 14:07:59 2012 @@ -50,6 +50,8 @@ import java.util.concurrent.ConcurrentHa */ public class BeanManagerProvider implements Extension { + private static Boolean testMode; + private static BeanManagerProvider bmp = null; private volatile Map bms = new ConcurrentHashMap(); @@ -266,6 +268,23 @@ public class BeanManagerProvider impleme bmpFirst.bms.put(cl, beanManagerHolder); } + //override in any case in test-mode + /* + * use: + * new BeanManagerProvider() { + * @Override + * public void setTestMode() { + * super.setTestMode(); + * } + * }.setTestMode(); + * + * to activate it + */ + if (Boolean.TRUE.equals(testMode)) + { + bmpFirst.bms.put(cl, beanManagerHolder); + } + CodiStartupBroadcaster.broadcastStartup(); } @@ -293,4 +312,14 @@ public class BeanManagerProvider impleme return bmp; } + + protected void setTestMode() + { + activateTestMode(); + } + + private static void activateTestMode() + { + testMode = true; + } } Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/AbstractCdiAwareTestStrategy.java URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/AbstractCdiAwareTestStrategy.java?rev=1296809&r1=1296808&r2=1296809&view=diff ============================================================================== --- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/AbstractCdiAwareTestStrategy.java (original) +++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/strategy/AbstractCdiAwareTestStrategy.java Sun Mar 4 14:07:59 2012 @@ -69,6 +69,15 @@ public abstract class AbstractCdiAwareTe //@Before public void before() { + new BeanManagerProvider() + { + @Override + public void setTestMode() + { + super.setTestMode(); + } + }.setTestMode(); + this.testContainer = TestContainerFactory.createTestContainer(CdiTestContainer.class); this.testContainer.initEnvironment(); this.testContainer.startContainer();