You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/29 16:41:25 UTC
svn commit: r1177323 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
cdi/CdiEjbBean.java config/rules/CheckPersistenceRefs.java
Author: rmannibucau
Date: Thu Sep 29 14:41:25 2011
New Revision: 1177323
URL: http://svn.apache.org/viewvc?rev=1177323&view=rev
Log:
fixing quickly cdi ejb management CheckPersistenceRefs to validate
Modified:
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/config/rules/CheckPersistenceRefs.java
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=1177323&r1=1177322&r2=1177323&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 Thu Sep 29 14:41:25 2011
@@ -123,11 +123,18 @@ public class CdiEjbBean<T> extends BaseE
@SuppressWarnings("unchecked")
public List<Class<?>> getBusinessLocalInterfaces() {
List<Class<?>> clazzes = new ArrayList<Class<?>>();
- List<Class> cl = this.beanContext.getBusinessLocalInterfaces();
- if (cl != null && !cl.isEmpty()) {
- for (Class<?> c : cl) {
- clazzes.add(c);
+ if (beanContext.isLocalbean()) {
+ clazzes.add(beanContext.getBeanClass());
+ } else if (beanContext.getProxyClass() != null) {
+ clazzes.add(beanContext.getProxyClass());
+ } else {
+ List<Class> cl = this.beanContext.getBusinessLocalInterfaces();
+
+ if (cl != null && !cl.isEmpty()) {
+ for (Class<?> c : cl) {
+ clazzes.add(c);
+ }
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckPersistenceRefs.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckPersistenceRefs.java?rev=1177323&r1=1177322&r2=1177323&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckPersistenceRefs.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckPersistenceRefs.java Thu Sep 29 14:41:25 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config.rules;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.PersistenceContextRef;
@@ -35,7 +36,9 @@ public class CheckPersistenceRefs extend
for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {
String beanType = getType(bean);
- if (beanType.equals("Stateful")) continue; // skip statefuls
+ if (beanType.equals("Stateful") || "org.apache.openejb.BeanContext$Comp".equals(bean.getEjbClass())) {
+ continue; // skip statefuls and Comp ManagedBean
+ }
for (PersistenceContextRef ref : bean.getPersistenceContextRef()) {
if (isExtented(ref)) {