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 8A802109F5 for ; Wed, 9 Oct 2013 14:45:42 +0000 (UTC) Received: (qmail 30327 invoked by uid 500); 9 Oct 2013 14:45:29 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 30113 invoked by uid 500); 9 Oct 2013 14:45:22 -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 29921 invoked by uid 99); 9 Oct 2013 14:45:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Oct 2013 14:45:18 +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; Wed, 09 Oct 2013 14:44:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 133452388AC8; Wed, 9 Oct 2013 14:44:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530644 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java Date: Wed, 09 Oct 2013 14:44:22 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131009144423.133452388AC8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Wed Oct 9 14:44:22 2013 New Revision: 1530644 URL: http://svn.apache.org/r1530644 Log: OWB-894 remove more old 'webbeans' spec restrictions which are obsolete + improve loggin Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1530644&r1=1530643&r2=1530644&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Wed Oct 9 14:44:22 2013 @@ -277,27 +277,14 @@ public final class WebBeansUtil if (!Modifier.isStatic(modifier) && ClassUtil.isInnerClazz(clazz)) { - throw new WebBeansConfigurationException("Bean implementation class : " - + clazz.getName() + " can not be non-static inner class"); + throw new WebBeansConfigurationException("Skipping CDI bean detection for non-static inner class: " + + clazz.getName() ); } if(Extension.class.isAssignableFrom(clazz)) { - throw new WebBeansConfigurationException("Bean implementation class can not implement " - + "javax.enterprise.inject.spi.Extension.!"); - } - - Class[] interfaces = clazz.getInterfaces(); - if(interfaces != null && interfaces.length > 0) - { - for(Class intr : interfaces) - { - if(intr.getName().equals("javax.ejb.EnterpriseBean")) - { - throw new WebBeansConfigurationException("Bean implementation class can not implement " - + "javax.ejb.EnterpriseBean"); - } - } + throw new WebBeansConfigurationException("Skipping CDI bean detection for CDI Extension class" + + clazz.getName()); } // and finally call all checks which are defined in plugins like JSF, JPA, etc Modified: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java?rev=1530644&r1=1530643&r2=1530644&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java (original) +++ openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbPlugin.java Wed Oct 9 14:44:22 2013 @@ -20,7 +20,7 @@ package org.apache.webbeans.spi.plugins; /** - * Abstract imlpementation of the {@link OpenWebBeansPlugin} interface + * Abstract implementation of the {@link OpenWebBeansPlugin} interface * contract. * *