[jboss-cvs] JBossAS SVN: r85923 - in projects/ejb3/trunk/api/src/main/java/javax: interceptor and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 16 08:49:57 EDT 2009
Author: wolfc
Date: 2009-03-16 08:49:57 -0400 (Mon, 16 Mar 2009)
New Revision: 85923
Added:
projects/ejb3/trunk/api/src/main/java/javax/interceptor/AroundTimeout.java
Modified:
projects/ejb3/trunk/api/src/main/java/javax/ejb/ApplicationException.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/Schedule.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/ScheduleExpression.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/SessionContext.java
projects/ejb3/trunk/api/src/main/java/javax/interceptor/InvocationContext.java
Log:
EJBTHREE-1484: EJB 3.1 PFD 06-Mar-2009
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/ApplicationException.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/ApplicationException.java 2009-03-16 12:06:32 UTC (rev 85922)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/ApplicationException.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -37,5 +37,15 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface ApplicationException
{
+ /**
+ * Indicates whether the application exception designation should apply to subclasses of
+ * the annotated exception class.
+ */
+ boolean inherited() default true;
+
+ /**
+ * Indicates whether the container should cause the transaction to rollback when the
+ * exception is thrown.
+ */
boolean rollback() default false;
}
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/Schedule.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/Schedule.java 2009-03-16 12:06:32 UTC (rev 85922)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/Schedule.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -55,5 +55,7 @@
String second() default "0";
+ String timezone() default "";
+
String year() default "*";
}
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/ScheduleExpression.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/ScheduleExpression.java 2009-03-16 12:06:32 UTC (rev 85922)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/ScheduleExpression.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -51,6 +51,8 @@
private String second = "0";
private Date start;
+
+ private String timezone = "";
private String year = "*";
@@ -124,6 +126,11 @@
return start;
}
+ public String getTimezone()
+ {
+ return timezone;
+ }
+
public String getYear()
{
return year ;
@@ -183,6 +190,12 @@
return this;
}
+ public ScheduleExpression timezone(String s)
+ {
+ this.timezone = s;
+ return this;
+ }
+
public ScheduleExpression year(int y)
{
this.year = Integer.toString(y);
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/SessionContext.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/SessionContext.java 2009-03-16 12:06:32 UTC (rev 85922)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/SessionContext.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -29,7 +29,7 @@
* instance. The container passes the SessionContext interface to an
* instance after the instance has been created. The session context
* remains associated with the instance for the lifetime of the instance.
- * @version $Revision$
+ * @version $Revision:78081 $
*/
public interface SessionContext extends EJBContext
{
@@ -103,5 +103,5 @@
* business method invocation with return type Future.
* @since 3.1
*/
- boolean isCancelled() throws IllegalStateException;
+ boolean wasCancelCalled() throws IllegalStateException;
}
Added: projects/ejb3/trunk/api/src/main/java/javax/interceptor/AroundTimeout.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/interceptor/AroundTimeout.java (rev 0)
+++ projects/ejb3/trunk/api/src/main/java/javax/interceptor/AroundTimeout.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.interceptor;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Defines an interceptor for a timeout method. The method must have the signature:
+ * public Object <METHOD>(InvocationContext) throws Exception
+ *
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ * @since 3.1
+ */
+ at Target(value=METHOD)
+ at Retention(value=RUNTIME)
+public @interface AroundTimeout {
+
+}
Modified: projects/ejb3/trunk/api/src/main/java/javax/interceptor/InvocationContext.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/interceptor/InvocationContext.java 2009-03-16 12:06:32 UTC (rev 85922)
+++ projects/ejb3/trunk/api/src/main/java/javax/interceptor/InvocationContext.java 2009-03-16 12:49:57 UTC (rev 85923)
@@ -45,5 +45,12 @@
*/
public java.util.Map<String, Object> getContextData();
+ /**
+ * Returns the timer associated with an @AroundTimeout method.
+ *
+ * @since 3.1
+ */
+ Object getTimer();
+
public Object proceed() throws Exception;
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list