You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2009/07/07 00:58:34 UTC
svn commit: r791648 - in
/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb:
ConcurrencyManagementType.java ConcurrentAccessTimeoutException.java
LockType.java Schedule.java spi/NoMoreTimeoutsException.java
Author: dblevins
Date: Mon Jul 6 22:58:34 2009
New Revision: 791648
URL: http://svn.apache.org/viewvc?rev=791648&view=rev
Log:
Slight updates from latest draft 2
Added:
geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/NoMoreTimeoutsException.java (props changed)
- copied unchanged from r791641, openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/NoMoreTimeoutsException.java
Modified:
geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java
geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java
geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java
Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java?rev=791648&r1=791647&r2=791648&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java Mon Jul 6 22:58:34 2009
@@ -25,5 +25,5 @@
* @version $Revision$ $Date$
*/
public enum ConcurrencyManagementType {
- CONTAINER, BEAN;
+ BEAN, CONCURRENCY_NOT_ALLOWED, CONTAINER;
}
Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java?rev=791648&r1=791647&r2=791648&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java Mon Jul 6 22:58:34 2009
@@ -33,7 +33,4 @@
super(string);
}
- public ConcurrentAccessTimeoutException(String string, Exception exception) {
- super(string, exception);
- }
}
Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java?rev=791648&r1=791647&r2=791648&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java Mon Jul 6 22:58:34 2009
@@ -22,5 +22,5 @@
package javax.ejb;
public enum LockType {
- WRITE, READ;
+ READ, WRITE;
}
Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java?rev=791648&r1=791647&r2=791648&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java Mon Jul 6 22:58:34 2009
@@ -46,5 +46,8 @@
String second() default "0";
- java.lang.String year() default "*";
+ java.lang.String timezone() default "";
+
+ java.lang.String year() default "*";
+
}
Propchange: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/NoMoreTimeoutsException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 6 22:58:34 2009
@@ -0,0 +1 @@
+/openejb/branches/openejb-3.1.1/api/ejb31-api-experimental/src/main/java/javax/ejb/NoMoreTimeoutsException.java:779593