Author: genspring
Date: Thu May 26 03:38:30 2011
New Revision: 1127770
URL: http://svn.apache.org/viewvc?rev=1127770&view=rev
Log:
1, remove the default session type.
2, assign the session type in
org.apache.openejb.config.AnnotationDeployer.DiscoverAnnotatedBeans.deploy(EjbModule)
before calling any logic that depends on session type.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1127770&r1=1127769&r2=1127770&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu May 26 03:38:30 2011
@@ -467,11 +467,9 @@ public class AnnotationDeployer implemen
if (enterpriseBean == null) {
enterpriseBean = new SingletonBean(ejbName,
beanClass.get());
ejbJar.addEnterpriseBean(enterpriseBean);
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean.getEjbClass() == null) {
enterpriseBean.setEjbClass(beanClass.get());
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean instanceof SessionBean) {
SessionBean sessionBean = (SessionBean) enterpriseBean;
@@ -481,6 +479,7 @@ public class AnnotationDeployer implemen
sessionBean.setMappedName(singleton.mappedName());
}
}
+ LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(Stateless.class)) {
@@ -493,11 +492,9 @@ public class AnnotationDeployer implemen
if (enterpriseBean == null) {
enterpriseBean = new StatelessBean(ejbName,
beanClass.get());
ejbJar.addEnterpriseBean(enterpriseBean);
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean.getEjbClass() == null) {
enterpriseBean.setEjbClass(beanClass.get());
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean instanceof SessionBean) {
SessionBean sessionBean = (SessionBean) enterpriseBean;
@@ -507,6 +504,7 @@ public class AnnotationDeployer implemen
sessionBean.setMappedName(stateless.mappedName());
}
}
+ LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(Stateful.class)) {
@@ -519,11 +517,9 @@ public class AnnotationDeployer implemen
if (enterpriseBean == null) {
enterpriseBean = new StatefulBean(ejbName,
beanClass.get());
ejbJar.addEnterpriseBean(enterpriseBean);
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean.getEjbClass() == null) {
enterpriseBean.setEjbClass(beanClass.get());
- LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
if (enterpriseBean instanceof SessionBean) {
SessionBean sessionBean = (SessionBean) enterpriseBean;
@@ -533,6 +529,7 @@ public class AnnotationDeployer implemen
sessionBean.setMappedName(stateful.mappedName());
}
}
+ LegacyProcessor.process(beanClass.get(), enterpriseBean);
}
for (Annotated<Class<?>> beanClass :
finder.findMetaAnnotatedClasses(ManagedBean.class)) {
@@ -568,12 +565,11 @@ public class AnnotationDeployer implemen
if (messageBean == null) {
messageBean = new MessageDrivenBean(ejbName);
ejbJar.addEnterpriseBean(messageBean);
- LegacyProcessor.process(beanClass.get(), messageBean);
}
if (messageBean.getEjbClass() == null) {
messageBean.setEjbClass(beanClass.get());
- LegacyProcessor.process(beanClass.get(), messageBean);
}
+ LegacyProcessor.process(beanClass.get(), messageBean);
}
AssemblyDescriptor assemblyDescriptor =
ejbModule.getEjbJar().getAssemblyDescriptor();
@@ -3815,4 +3811,5 @@ public class AnnotationDeployer implemen
return 0;
}
+
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=1127770&r1=1127769&r2=1127770&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Thu May 26 03:38:30 2011
@@ -172,7 +172,7 @@ public class SessionBean implements Remo
@XmlElement(name = "ejb-class")
protected String ejbClass;
@XmlElement(name = "session-type")
- protected SessionType sessionType = SessionType.STATELESS;
+ protected SessionType sessionType;
@XmlElement(name = "stateful-timeout")
protected Timeout statefulTimeout;
@XmlElement(name = "timeout-method")
