Author: dblevins
Date: Fri Jun 10 04:40:15 2011
New Revision: 1134185
URL: http://svn.apache.org/viewvc?rev=1134185&view=rev
Log:
Don't include remote interfaces in CDI bean types. More tighly control
webBeansContext access.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
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/CdiScanner.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java?rev=1134185&r1=1134184&r2=1134185&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
Fri Jun 10 04:40:15 2011
@@ -303,7 +303,7 @@ public class BeansDeployer {
}
if (beanName.equals(other)) {
- InjectionResolver resolver =
InjectionResolver.getInstance();
+ InjectionResolver resolver =
webBeansContext.getBeanManagerImpl().getInjectionResolver();
Set<Bean<?>> beans =
resolver.implResolveByName(beanName);
if (beans.size() > 1) {
beans = resolver.findByAlternatives(beans);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1134185&r1=1134184&r2=1134185&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Fri Jun 10 04:40:15 2011
@@ -45,7 +45,6 @@ public class CdiEjbBean<T> extends BaseE
addApiType(beanContext.getLocalHomeInterface());
for (Class clazz : beanContext.getBusinessLocalInterfaces())
addApiType(clazz);
- for (Class clazz : beanContext.getBusinessRemoteInterfaces())
addApiType(clazz);
}
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=1134185&r1=1134184&r2=1134185&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
Fri Jun 10 04:40:15 2011
@@ -97,7 +97,7 @@ public class CdiPlugin extends AbstractO
}
public void startup() {
- webBeansContext = WebBeansContext.getInstance();
+ webBeansContext = appContext.getWebBeansContext();
this.contexsServices = (CdiAppContextsService)
webBeansContext.getContextsService();
this.contexsServices.init(null);
}
@@ -115,22 +115,22 @@ public class CdiPlugin extends AbstractO
this.contexsServices.destroy(null);
// Free all plugin resources
-
WebBeansContext.getInstance().getPluginLoader().shutDown();
+ webBeansContext.getPluginLoader().shutDown();
// Clear extensions
-
WebBeansContext.getInstance().getExtensionLoader().clear();
+ webBeansContext.getExtensionLoader().clear();
// Delete Resolutions Cache
InjectionResolver.getInstance().clearCaches();
// Delte proxies
-
WebBeansContext.getInstance().getJavassistProxyFactory().clear();
+ webBeansContext.getJavassistProxyFactory().clear();
// Delete AnnotateTypeCache
-
WebBeansContext.getInstance().getAnnotatedElementFactory().clear();
+ webBeansContext.getAnnotatedElementFactory().clear();
// JMs Manager clear
- WebBeansContext.getInstance().getjMSManager().clear();
+ webBeansContext.getjMSManager().clear();
// Clear the resource injection service
CdiResourceInjectionService injectionServices =
(CdiResourceInjectionService)
webBeansContext.getService(ResourceInjectionService.class);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1134185&r1=1134184&r2=1134185&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Fri Jun 10 04:40:15 2011
@@ -62,7 +62,7 @@ public class CdiScanner implements Scann
AppInfo appInfo = startupObject.getAppInfo();
ClassLoader classLoader =
startupObject.getAppContext().getClassLoader();
- WebBeansContext webBeansContext = WebBeansContext.getInstance();
+ WebBeansContext webBeansContext =
startupObject.getAppContext().getWebBeansContext();
final AlternativesManager alternativesManager =
webBeansContext.getAlternativesManager();
final DecoratorsManager decoratorsManager =
webBeansContext.getDecoratorsManager();
final InterceptorsManager interceptorsManager =
webBeansContext.getInterceptorsManager();
