[Jboss-cvs] JBossAS SVN: r56625 - branches/Branch_4_0/ejb3x/src/main/javax/ejb

[jboss-cvs-commits at lists.jboss.org]

Author: bill.burke at jboss.com
Date: 2006-09-07 22:29:11 -0400 (Thu, 07 Sep 2006)
New Revision: 56625

Added:
   branches/Branch_4_0/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
Modified:
   branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJB.java
Log:
merge from head

Added: branches/Branch_4_0/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
===================================================================
--- branches/Branch_4_0/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	2006-09-08 02:28:49 UTC (rev 56624)
+++ branches/Branch_4_0/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	2006-09-08 02:29:11 UTC (rev 56625)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ejb;
+
+/**
+ * A ConcurrentAccessException indicates that the client has attempted an invocation on a 
+ * stateful session bean while another invocation is in progress.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ConcurrentAccessException extends EJBException
+{
+   private static final long serialVersionUID = 1L;
+
+   public ConcurrentAccessException()
+   {
+      super();
+   }
+
+   public ConcurrentAccessException(String message)
+   {
+      super(message);
+   }
+
+   public ConcurrentAccessException(String message, Exception ex)
+   {
+      super(message, ex);
+   }
+}

Modified: branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJB.java
===================================================================
--- branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJB.java	2006-09-08 02:28:49 UTC (rev 56624)
+++ branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJB.java	2006-09-08 02:29:11 UTC (rev 56625)
@@ -37,8 +37,8 @@
 {
    String name() default "";
 
-   Class businessInterface() default java.lang.Object.class;
-
+   Class beanInterface() default java.lang.Object.class;
+   
    String beanName() default "";
    
    String mappedName() default "";