[seam-commits] Seam SVN: r15516 - in branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam: core and 1 other directories.
Author: manaRH
Date: 2013-06-03 09:21:01 -0400 (Mon, 03 Jun 2013)
New Revision: 15516
Added:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java
Log:
JBSEAM-5091 Add AroundTimeout annotation to work properly with EJB Timeout method
Added:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java
(rev 0)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java 2013-06-03
13:21:01 UTC (rev 15516)
@@ -0,0 +1,18 @@
+package org.jboss.seam.annotations.intercept;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Synonym for javax.interceptors.AroundTimeout.
+ *
+ * @author tremes
+ */
+@Target(METHOD)
+@Retention(RUNTIME)
+@Documented
+public @interface AroundTimeout {}
\ No newline at end of file
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java 2013-06-03
13:20:49 UTC (rev 15515)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java 2013-06-03
13:21:01 UTC (rev 15516)
@@ -6,6 +6,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.CyclicDependencyException;
import org.jboss.seam.annotations.intercept.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundTimeout;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
@@ -38,6 +39,7 @@
}
@AroundInvoke
+ @AroundTimeout
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
Component component = getComponent();
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java 2013-06-03
13:20:49 UTC (rev 15515)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java 2013-06-03
13:21:01 UTC (rev 15516)
@@ -11,10 +11,9 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import javax.interceptor.AroundTimeout;
-
import org.jboss.seam.Component;
import org.jboss.seam.annotations.intercept.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundTimeout;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.annotations.intercept.PostActivate;
import org.jboss.seam.annotations.intercept.PostConstruct;