Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 6910 invoked from network); 15 Sep 2010 17:31:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Sep 2010 17:31:00 -0000 Received: (qmail 79412 invoked by uid 500); 15 Sep 2010 17:31:00 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 79372 invoked by uid 500); 15 Sep 2010 17:31:00 -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 79363 invoked by uid 99); 15 Sep 2010 17:30:59 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Sep 2010 17:30:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 15 Sep 2010 17:30:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9F5A223889D5; Wed, 15 Sep 2010 17:30:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r997410 - in /openwebbeans/trunk/webbeans-impl/src/main: java/org/apache/webbeans/config/OpenWebBeansConfiguration.java resources/META-INF/openwebbeans/openwebbeans.properties Date: Wed, 15 Sep 2010 17:30:20 -0000 To: commits@openwebbeans.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100915173020.9F5A223889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: covener Date: Wed Sep 15 17:30:20 2010 New Revision: 997410 URL: http://svn.apache.org/viewvc?rev=997410&view=rev Log: [OWB-453] add a flag to disable context activation in the EJB interceptor Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=997410&r1=997409&r2=997410&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Wed Sep 15 17:30:20 2010 @@ -103,6 +103,9 @@ public class OpenWebBeansConfiguration /**Use of EJB interceptor to inject EJBs*/ public static final String USE_EJBINTERCEPTOR_INJECTION = "org.apache.webbeans.application.useEJBInterceptorInjection"; + /**Use of EJB interceptor to activate EJB contexts*/ + public static final String USE_EJBINTERCEPTOR_ACTIVATION = "org.apache.webbeans.application.useEJBInterceptorActivation"; + /**EL Adaptor*/ public static final String EL_ADAPTOR_CLASS = "org.apache.webbeans.spi.adaptor.ELAdaptor"; @@ -154,6 +157,9 @@ public class OpenWebBeansConfiguration value = properties.getProperty(USE_EJBINTERCEPTOR_INJECTION); setPropertyFromSystemProperty(USE_EJBINTERCEPTOR_INJECTION, value); + value = properties.getProperty(USE_EJBINTERCEPTOR_ACTIVATION); + setPropertyFromSystemProperty(USE_EJBINTERCEPTOR_ACTIVATION, value); + value = properties.getProperty(CONTAINER_LIFECYCLE); setPropertyFromSystemProperty(CONTAINER_LIFECYCLE, value); @@ -290,4 +296,15 @@ public class OpenWebBeansConfiguration return Boolean.valueOf(value); } + + /** + * Gets EJB context activation property. + * @return true if EJB interceptor should do activation of EJB contexts + */ + public boolean isUseEJBInterceptorActivation() + { + String value = getProperty(USE_EJBINTERCEPTOR_ACTIVATION); + + return Boolean.valueOf(value); + } } Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=997410&r1=997409&r2=997410&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original) +++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Wed Sep 15 17:30:20 2010 @@ -69,6 +69,11 @@ org.apache.webbeans.spi.deployer.useEjbM org.apache.webbeans.application.useEJBInterceptorInjection=true ################################################################################################ +############################# Use OWB EJB interceptor for Context activation ################### +#If it is true, the OWB EJB interceptor performs activation of the contexts +org.apache.webbeans.application.useEJBInterceptorInjection=true +################################################################################################ + ################# Force not having Checked Exceptions in lifecycle methods #################### # If it is true, OWB forces that lifecycle methods like @PreDestroy and @PostConstruct must not # throw any checked exceptions. This is the behaviour which is defined in the EE interceptor