Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-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 8D126175BE for ; Mon, 25 May 2015 22:02:34 +0000 (UTC) Received: (qmail 95095 invoked by uid 500); 25 May 2015 22:02:34 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 95061 invoked by uid 500); 25 May 2015 22:02:34 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 95049 invoked by uid 99); 25 May 2015 22:02:34 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 May 2015 22:02:34 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 5497BAC0636 for ; Mon, 25 May 2015 22:02:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1681659 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java Date: Mon, 25 May 2015 22:02:34 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150525220234.5497BAC0636@hades.apache.org> Author: struberg Date: Mon May 25 22:02:33 2015 New Revision: 1681659 URL: http://svn.apache.org/r1681659 Log: OWB-851 improve registration of EE beans Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1681659&r1=1681658&r2=1681659&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon May 25 22:02:33 2015 @@ -74,7 +74,6 @@ import org.apache.webbeans.spi.BeanArchi import org.apache.webbeans.spi.JNDIService; import org.apache.webbeans.spi.ScannerService; import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin; -import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin; import org.apache.webbeans.util.AnnotationUtil; import org.apache.webbeans.util.ClassUtil; import org.apache.webbeans.util.ExceptionUtil; @@ -533,17 +532,10 @@ public class BeansDeployer //REgister Provider Beans OpenWebBeansJavaEEPlugin beanEeProvider = webBeansContext.getPluginLoader().getJavaEEPlugin(); - OpenWebBeansWebPlugin beanWebProvider = webBeansContext.getPluginLoader().getWebPlugin(); - + if(beanEeProvider != null) { - addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.ValidatorBean"); - addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.ValidatorFactoryBean"); - addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.UserTransactionBean"); - } - else if(beanWebProvider != null) - { - addDefaultBean(webBeansContext, "org.apache.webbeans.ee.common.beans.PrincipalBean"); + beanEeProvider.registerEEBeans(); } } Modified: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java?rev=1681659&r1=1681658&r2=1681659&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java (original) +++ openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java Mon May 25 22:02:33 2015 @@ -31,4 +31,10 @@ package org.apache.webbeans.spi.plugins; public interface OpenWebBeansJavaEEPlugin extends OpenWebBeansPlugin { boolean isEEComponent(Class impl); + + /** + * Gets invoked when the EE integration should register it's + * CDI Beans. E.g. ValidatorBean, PrincipalBean, etc + */ + void registerEEBeans(); }