svn commit: r791647 - in /openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb: ConcurrencyManagementType.java ConcurrentAccessTimeoutException.java LockType.java Schedule.java

[dblevins]

Author: dblevins
Date: Mon Jul  6 22:57:58 2009
New Revision: 791647

URL: http://svn.apache.org/viewvc?rev=791647&view=rev
Log:
Slight updates from latest draft 2

Modified:
    
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrencyManagementType.java
    
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
    
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/LockType.java
    
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/Schedule.java

Modified: 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrencyManagementType.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrencyManagementType.java?rev=791647&r1=791646&r2=791647&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrencyManagementType.java
 (original)
+++ 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrencyManagementType.java
 Mon Jul  6 22:57:58 2009
@@ -25,5 +25,5 @@
  * @version $Revision$ $Date$
  */
 public enum ConcurrencyManagementType {
-    CONTAINER, BEAN;
+    BEAN, CONCURRENCY_NOT_ALLOWED, CONTAINER;
 }

Modified: 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java?rev=791647&r1=791646&r2=791647&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
 (original)
+++ 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
 Mon Jul  6 22:57:58 2009
@@ -33,7 +33,4 @@
         super(string);
     }
 
-    public ConcurrentAccessTimeoutException(String string, Exception 
exception) {
-        super(string, exception);
-    }
 }

Modified: 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/LockType.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/LockType.java?rev=791647&r1=791646&r2=791647&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/LockType.java
 (original)
+++ 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/LockType.java
 Mon Jul  6 22:57:58 2009
@@ -22,5 +22,5 @@
 package javax.ejb;
 
 public enum LockType {
-    WRITE, READ;
+    READ, WRITE;
 }

Modified: 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/Schedule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/Schedule.java?rev=791647&r1=791646&r2=791647&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/Schedule.java
 (original)
+++ 
openejb/trunk/openejb3/api/ejb31-api-experimental/src/main/java/javax/ejb/Schedule.java
 Mon Jul  6 22:57:58 2009
@@ -46,5 +46,8 @@
 
        String second() default "0";
 
-       java.lang.String year() default "*";
+       java.lang.String timezone() default "";
+
+    java.lang.String year() default "*";
+
 }