You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/03/10 03:11:19 UTC
svn commit: r1080105 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi:
CdiPlugin.java CdiResourceInjectionService.java OpenEJBLifecycle.java
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<CdiBeanInfo, Context> 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
}