Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 38645 invoked from network); 10 Mar 2011 02:11:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Mar 2011 02:11:41 -0000 Received: (qmail 67269 invoked by uid 500); 10 Mar 2011 02:11:41 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 67238 invoked by uid 500); 10 Mar 2011 02:11:41 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 67231 invoked by uid 99); 10 Mar 2011 02:11:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2011 02:11:41 +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; Thu, 10 Mar 2011 02:11:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D89362388999; Thu, 10 Mar 2011 02:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1080105 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi: CdiPlugin.java CdiResourceInjectionService.java OpenEJBLifecycle.java Date: Thu, 10 Mar 2011 02:11:19 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110310021119.D89362388999@eris.apache.org> Author: dblevins Date: Thu Mar 10 02:11:19 2011 New Revision: 1080105 URL: http://svn.apache.org/viewvc?rev=1080105&view=rev Log: Patch from Forrest Xia, OPENEJB-1441: Compilation failures caused by openwebbeans api changes Thanks, Forrest! Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1080105&r1=1080104&r2=1080105&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java Thu Mar 10 02:11:19 2011 @@ -64,7 +64,7 @@ public class CdiPlugin extends AbstractO private CdiAppContextsService contexsServices; @Override - public void shutDown() throws Exception { + public void shutDown() { super.shutDown(); //this plugin may have been installed in a non-ejb lifecycle??? if (beans != null) { @@ -147,7 +147,7 @@ public class CdiPlugin extends AbstractO } @Override - public void isManagedBean(Class clazz) throws Exception { + public void isManagedBean(Class clazz) { } @Override Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=1080105&r1=1080104&r2=1080105&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java Thu Mar 10 02:11:19 2011 @@ -135,7 +135,7 @@ public class CdiResourceInjectionService @Override public void injectJavaEEResources(Object managedBeanInstance) - throws Exception { + { for (Entry entry : this.contexts.entrySet()) { if (entry.getKey().getBeanClass() == managedBeanInstance.getClass()) { Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1080105&r1=1080104&r2=1080105&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Thu Mar 10 02:11:19 2011 @@ -105,7 +105,7 @@ public class OpenEJBLifecycle implements } @Override - public void startApplication(Object startupObject) throws Exception + public void startApplication(Object startupObject) { StartupObject stuff = (StartupObject) startupObject; // Initalize Application Context @@ -115,6 +115,7 @@ public class OpenEJBLifecycle implements //Before Start beforeStartApplication(startupObject); + //Load all plugins webBeansContext.getPluginLoader().startUp(); @@ -378,7 +379,7 @@ public class OpenEJBLifecycle implements //Do nothing as default } - protected void afterStartApplication(Object startupObject) throws Exception + protected void afterStartApplication(Object startupObject) { //Do nothing as default } @@ -388,7 +389,7 @@ public class OpenEJBLifecycle implements //Do nothing as default } - protected void beforeStartApplication(Object startupObject) throws Exception + protected void beforeStartApplication(Object startupObject) { //Do nothing as default }