Author: jlmonteiro
Date: Thu Jul 19 13:18:19 2012
New Revision: 1363327
URL: http://svn.apache.org/viewvc?rev=1363327&view=rev
Log:
OPENEJB-1873 Patch from Mark. Thanks.
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ScopeHelper.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1363327&r1=1363326&r2=1363327&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Thu Jul 19 13:18:19 2012
@@ -194,9 +194,8 @@ public class CdiEjbBean<T> extends BaseE
bean.setName(superBean.getName());
bean.setSerializable(superBean.isSerializable());
- this.implScopeType = superBean.implScopeType;
this.scopeClass = superBean.scopeClass;
- this.implQualifiers.addAll(superBean.getImplQualifiers());
+ this.implQualifiers.addAll(superBean.getQualifiers());
this.stereoTypeClasses.addAll(superBean.stereoTypeClasses);
this.stereoTypes.addAll(superBean.stereoTypes);
}
@@ -239,4 +238,4 @@ public class CdiEjbBean<T> extends BaseE
return toReturn;
}
-}
\ No newline at end of file
+}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1363327&r1=1363326&r2=1363327&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
Thu Jul 19 13:18:19 2012
@@ -30,7 +30,6 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.InjectionResolver;
import org.apache.webbeans.portable.events.discovery.BeforeShutdownImpl;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.SecurityService;
@@ -43,7 +42,7 @@ import org.apache.webbeans.util.WebBeans
public class CdiPlugin extends AbstractOwbPlugin implements
OpenWebBeansJavaEEPlugin, OpenWebBeansEjbPlugin {
- private Set<Class<?>> beans;
+ private Set<Class<?>> beans;
private WebBeansContext webBeansContext;
private CdiAppContextsService contexsServices;
@@ -104,7 +103,7 @@ public class CdiPlugin extends AbstractO
webBeansContext.getExtensionLoader().clear();
// Delete Resolutions Cache
- InjectionResolver.getInstance().clearCaches();
+
webBeansContext.getBeanManagerImpl().getInjectionResolver().clearCaches();
// Delte proxies
webBeansContext.getJavassistProxyFactory().clear();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java?rev=1363327&r1=1363326&r2=1363327&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
Thu Jul 19 13:18:19 2012
@@ -20,9 +20,6 @@ import org.apache.webbeans.annotation.Ne
import org.apache.webbeans.component.NewBean;
import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.New;
-import javax.enterprise.util.AnnotationLiteral;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -36,7 +33,7 @@ public class NewCdiEjbBean<T> extends Cd
public NewCdiEjbBean(CdiEjbBean<T> that) {
super(that.getBeanContext(), that.getWebBeansContext());
- this.getImplQualifiers().add(new NewLiteral(getReturnType()));
+ this.addQualifier(new NewLiteral(getReturnType()));
this.apiTypes.clear();
this.apiTypes.addAll(that.getTypes());
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1363327&r1=1363326&r2=1363327&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Thu Jul 19 13:18:19 2012
@@ -31,7 +31,6 @@ import org.apache.webbeans.config.OpenWe
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.InjectionResolver;
import org.apache.webbeans.ejb.common.component.EjbBeanCreatorImpl;
import org.apache.webbeans.ejb.common.util.EjbUtility;
import org.apache.webbeans.intercept.InterceptorData;
@@ -446,7 +445,7 @@ public class OpenEJBLifecycle implements
webBeansContext.getExtensionLoader().clear();
//Delete Resolutions Cache
- InjectionResolver.getInstance().clearCaches();
+ beanManager.getInjectionResolver().clearCaches();
//Delte proxies
webBeansContext.getJavassistProxyFactory().clear();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ScopeHelper.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ScopeHelper.java?rev=1363327&r1=1363326&r2=1363327&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ScopeHelper.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ScopeHelper.java
Thu Jul 19 13:18:19 2012
@@ -16,11 +16,15 @@
*/
package org.apache.openejb.cdi;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
import javax.enterprise.context.spi.Context;
+import javax.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.context.type.ContextTypes;
// helper for embedded case
public final class ScopeHelper {
@@ -37,19 +41,19 @@ public final class ScopeHelper {
}
public static void stopContexts(final ContextFactory contextFactory, final
ServletContext servletContext, final HttpSession session) throws Exception {
- if(isActive(contextFactory.getStandardContext(ContextTypes.SESSION))) {
+ if(isActive(contextFactory.getStandardContext(SessionScoped.class))) {
contextFactory.destroySessionContext(session);
}
- if
(isActive(contextFactory.getStandardContext(ContextTypes.CONVERSATION))) {
+ if
(isActive(contextFactory.getStandardContext(ConversationScoped.class))) {
contextFactory.destroyConversationContext();
}
- if (isActive(contextFactory.getStandardContext(ContextTypes.REQUEST)))
{
+ if (isActive(contextFactory.getStandardContext(RequestScoped.class))) {
contextFactory.destroyRequestContext(null);
}
- if
(isActive(contextFactory.getStandardContext(ContextTypes.APPLICATION))) {
+ if
(isActive(contextFactory.getStandardContext(ApplicationScoped.class))) {
contextFactory.destroyApplicationContext(servletContext);
}
- if
(isActive(contextFactory.getStandardContext(ContextTypes.SINGLETON))) {
+ if (isActive(contextFactory.getStandardContext(Singleton.class))) {
contextFactory.destroySingletonContext(servletContext);
}
}
