You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/06/06 00:17:46 UTC

svn commit: r951778 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Author: dblevins
Date: Sat Jun  5 22:17:45 2010
New Revision: 951778

URL: http://svn.apache.org/viewvc?rev=951778&view=rev
Log:
Patch from Thiago Veronezi, OPENEJB-1144 and OPENEJB-1146
Partial support for @StatefulTimeout and @AccessTimeout related xml and deployment support
Thanks, Thiago!

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.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=951778&r1=951777&r2=951778&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 Sat Jun  5 22:17:45 2010
@@ -88,6 +88,7 @@ import org.apache.openejb.jee.TransAttri
 import org.apache.openejb.jee.TransactionType;
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.jee.WebserviceDescription;
+import org.apache.openejb.jee.Timeout;
 import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
 import static org.apache.openejb.util.Join.join;
@@ -132,6 +133,8 @@ import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
+import javax.ejb.StatefulTimeout;
+import javax.ejb.AccessTimeout;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.Interceptors;
@@ -1088,6 +1091,33 @@ public class AnnotationDeployer implemen
                  */
                 processSecurityAnnotations(clazz, ejbName, ejbModule, inheritedClassFinder, bean);
 
+                if (bean instanceof SessionBean) {
+                    SessionBean sessionBean = (SessionBean) bean;
+
+                    // Merge AccessTimeout value from XML - XML value takes precedence
+                    if(sessionBean.getAccessTimeout() == null) {
+                        final AccessTimeout annotation = clazz.getAnnotation(AccessTimeout.class);
+                        if(annotation != null) {
+                            final Timeout timeout = new Timeout();
+                            timeout.setTimeout(annotation.value());
+                            timeout.setUnit(annotation.unit().toString());
+                            sessionBean.setAccessTimeout(timeout);
+                        }
+                    }
+
+                    // Merge StatefulTimeout value from XML - XML value takes precedence
+                    if(sessionBean.getStatefulTimeout() == null) {
+                        final StatefulTimeout annotation = clazz.getAnnotation(StatefulTimeout.class);
+                        if(annotation != null) {
+                            final Timeout timeout = new Timeout();
+                            timeout.setTimeout(annotation.value());
+                            timeout.setUnit(annotation.unit().toString());
+                            sessionBean.setStatefulTimeout(timeout);
+                        }
+                    }
+                }
+
+
                 /*
                  * @Schedule
                  * @Schedules