Author: rmannibucau
Date: Thu Jul 18 06:51:08 2013
New Revision: 1504375
URL: http://svn.apache.org/r1504375
Log:
OPENEJB-2033 @Alternative and @Specializes for EJB was wrong
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1504375&r1=1504374&r2=1504375&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Thu Jul 18 06:51:08 2013
@@ -96,10 +96,6 @@ public class CdiEjbBean<T> extends BaseE
}
}
- public void setEnabled(final boolean enabled) {
- // no-op: ejb parent are not deployed so no need to deactivate it
(will always be the specialization)
- }
-
public String getEjbName() {
return this.beanContext.getEjbName();
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1504375&r1=1504374&r2=1504375&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu Jul 18 06:51:08 2013
@@ -1347,9 +1347,7 @@ public class AnnotationDeployer implemen
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(Singleton.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
- managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
- continue;
}
Singleton singleton = beanClass.getAnnotation(Singleton.class);
@@ -1379,9 +1377,7 @@ public class AnnotationDeployer implemen
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(Stateless.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
- managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
- continue;
}
Stateless stateless = beanClass.getAnnotation(Stateless.class);
@@ -1418,9 +1414,7 @@ public class AnnotationDeployer implemen
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(Stateful.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
- managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
- continue;
}
Stateful stateful = beanClass.getAnnotation(Stateful.class);
@@ -1450,9 +1444,7 @@ public class AnnotationDeployer implemen
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(ManagedBean.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
- managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
- continue;
}
ManagedBean managed =
beanClass.getAnnotation(ManagedBean.class);
@@ -1483,9 +1475,7 @@ public class AnnotationDeployer implemen
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(MessageDriven.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
- managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
- continue;
}
MessageDriven mdb =
beanClass.getAnnotation(MessageDriven.class);
@@ -1504,7 +1494,7 @@ public class AnnotationDeployer implemen
LegacyProcessor.process(beanClass.get(), messageBean);
}
-
+ /*
for (Class<?> specializingClass : sortClassesParentFirst(new
ArrayList<Class<?>>(specializingClasses))) {
final Class<?> parent = specializingClass.getSuperclass();
@@ -1520,7 +1510,6 @@ public class AnnotationDeployer implemen
final String ejbClass = enterpriseBean.getEjbClass();
if (ejbClass != null && ejbClass.equals(parent.getName()))
{
- managedClasses.remove(ejbClass);
enterpriseBean.setEjbClass(specializingClass.getName());
found = true;
}
@@ -1530,6 +1519,7 @@ public class AnnotationDeployer implemen
ejbModule.getValidation().fail(specializingClass.getSimpleName(),
"specializes.extendsSimpleBean", specializingClass.getName());
}
}
+ */
AssemblyDescriptor assemblyDescriptor =
ejbModule.getEjbJar().getAssemblyDescriptor();
if (assemblyDescriptor == null) {
