Diff
Copied: trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractCallbackOperation.java (from rev 2449, trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractSpecificMethodOperation.java) (2449 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractSpecificMethodOperation.java 2006-02-16 06:30:22 UTC (rev 2449)
+++ trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractCallbackOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -0,0 +1,92 @@
+/* ====================================================================
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce this list of
+ * conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the OpenEJB Project. For more information
+ * please see <http://openejb.org/>.
+ *
+ * ====================================================================
+ */
+package org.openejb.dispatch;
+
+import java.io.Serializable;
+
+import javax.ejb.EnterpriseBean;
+
+import org.apache.geronimo.interceptor.InvocationResult;
+
+import org.openejb.EJBInstanceContext;
+import org.openejb.EjbInvocation;
+import org.openejb.EJBOperation;
+import org.openejb.timer.TimerState;
+
+/**
+ *
+ *
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractCallbackOperation implements VirtualOperation, Serializable {
+
+ protected InvocationResult invoke(EjbInvocation invocation, EJBOperation operation) throws Throwable {
+ EJBInstanceContext ctx = invocation.getEJBInstanceContext();
+ boolean oldTimerMethodAvailable = ctx.setTimerState(operation);
+ try {
+ ctx.setOperation(operation);
+ try {
+ return invocation.createResult(doOperation(ctx.getInstance(), invocation.getArguments()));
+ } catch (Throwable t) {
+ if (t instanceof Exception && t instanceof RuntimeException == false) {
+ // checked exception - which we simply include in the result
+ return invocation.createExceptionResult((Exception)t);
+ } else {
+ // unchecked Exception - just throw it to indicate an abnormal completion
+ throw t;
+ }
+ }
+ } finally {
+ ctx.setOperation(EJBOperation.INACTIVE);
+ TimerState.setTimerState(oldTimerMethodAvailable);
+ }
+ }
+
+ protected abstract Object doOperation(EnterpriseBean instance, Object[] arguments) throws Throwable;
+
+}
Property changes: trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractCallbackOperation.java
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractSpecificMethodOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractSpecificMethodOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/dispatch/AbstractSpecificMethodOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -1,92 +0,0 @@
-/* ====================================================================
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce this list of
- * conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.org/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the OpenEJB Project. For more information
- * please see <http://openejb.org/>.
- *
- * ====================================================================
- */
-package org.openejb.dispatch;
-
-import java.io.Serializable;
-
-import javax.ejb.EnterpriseBean;
-
-import org.apache.geronimo.interceptor.InvocationResult;
-
-import org.openejb.EJBInstanceContext;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.timer.TimerState;
-
-/**
- *
- *
- * @version $Revision$ $Date$
- */
-public abstract class AbstractSpecificMethodOperation implements VirtualOperation, Serializable {
-
- protected InvocationResult invoke(EjbInvocation invocation, EJBOperation operation) throws Throwable {
- EJBInstanceContext ctx = invocation.getEJBInstanceContext();
- boolean oldTimerMethodAvailable = ctx.setTimerState(operation);
- try {
- ctx.setOperation(operation);
- try {
- return invocation.createResult(doOperation(ctx.getInstance(), invocation.getArguments()));
- } catch (Throwable t) {
- if (t instanceof Exception && t instanceof RuntimeException == false) {
- // checked exception - which we simply include in the result
- return invocation.createExceptionResult((Exception)t);
- } else {
- // unchecked Exception - just throw it to indicate an abnormal completion
- throw t;
- }
- }
- } finally {
- ctx.setOperation(EJBOperation.INACTIVE);
- TimerState.setTimerState(oldTimerMethodAvailable);
- }
- }
-
- protected abstract Object doOperation(EnterpriseBean instance, Object[] arguments) throws Throwable;
-
-}
Modified: trunk/openejb2/modules/core/src/java/org/openejb/dispatch/EJBTimeoutOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/dispatch/EJBTimeoutOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/dispatch/EJBTimeoutOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -54,7 +54,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -62,7 +62,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBTimeoutOperation extends AbstractSpecificMethodOperation {
+public class EJBTimeoutOperation extends AbstractCallbackOperation {
public static final EJBTimeoutOperation INSTANCE = new EJBTimeoutOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBActivateOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBActivateOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBActivateOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBActivateOperation extends AbstractSpecificMethodOperation {
+public class EJBActivateOperation extends AbstractCallbackOperation {
public static final EJBActivateOperation INSTANCE = new EJBActivateOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBLoadOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBLoadOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBLoadOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBLoadOperation extends AbstractSpecificMethodOperation {
+public class EJBLoadOperation extends AbstractCallbackOperation {
public static final EJBLoadOperation INSTANCE = new EJBLoadOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBPassivateOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBPassivateOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBPassivateOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBPassivateOperation extends AbstractSpecificMethodOperation {
+public class EJBPassivateOperation extends AbstractCallbackOperation {
public static final EJBPassivateOperation INSTANCE = new EJBPassivateOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBStoreOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBStoreOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/EJBStoreOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBStoreOperation extends AbstractSpecificMethodOperation {
+public class EJBStoreOperation extends AbstractCallbackOperation {
public static final EJBStoreOperation INSTANCE = new EJBStoreOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/SetEntityContextOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/SetEntityContextOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/SetEntityContextOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -54,7 +54,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -62,7 +62,7 @@
* @version $Revision$ $Date$
*
* */
-public class SetEntityContextOperation extends AbstractSpecificMethodOperation {
+public class SetEntityContextOperation extends AbstractCallbackOperation {
public static final SetEntityContextOperation INSTANCE = new SetEntityContextOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/UnsetEntityContextOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/UnsetEntityContextOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/dispatch/UnsetEntityContextOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class UnsetEntityContextOperation extends AbstractSpecificMethodOperation {
+public class UnsetEntityContextOperation extends AbstractCallbackOperation {
public static final UnsetEntityContextOperation INSTANCE = new UnsetEntityContextOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/mdb/dispatch/SetMessageDrivenContextOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/mdb/dispatch/SetMessageDrivenContextOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/mdb/dispatch/SetMessageDrivenContextOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -54,7 +54,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -62,7 +62,7 @@
* @version $Revision$ $Date$
*
* */
-public class SetMessageDrivenContextOperation extends AbstractSpecificMethodOperation {
+public class SetMessageDrivenContextOperation extends AbstractCallbackOperation {
public static final SetMessageDrivenContextOperation INSTANCE = new SetMessageDrivenContextOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBActivateOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBActivateOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBActivateOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,7 +53,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -61,7 +61,7 @@
* @version $Revision$ $Date$
*
* */
-public class EJBActivateOperation extends AbstractSpecificMethodOperation {
+public class EJBActivateOperation extends AbstractCallbackOperation {
public static final EJBActivateOperation INSTANCE = new EJBActivateOperation();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBPassivateOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBPassivateOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/EJBPassivateOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -53,12 +53,12 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
* @version $Revision$ $Date$
*/
-public class EJBPassivateOperation extends AbstractSpecificMethodOperation {
+public class EJBPassivateOperation extends AbstractCallbackOperation {
public static final EJBPassivateOperation INSTANCE = new EJBPassivateOperation();
private EJBPassivateOperation() {}
Modified: trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/SetSessionContextOperation.java (2451 => 2452)
--- trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/SetSessionContextOperation.java 2006-02-16 10:58:37 UTC (rev 2451)
+++ trunk/openejb2/modules/core/src/java/org/openejb/slsb/dispatch/SetSessionContextOperation.java 2006-02-16 11:29:57 UTC (rev 2452)
@@ -54,7 +54,7 @@
import org.apache.geronimo.interceptor.InvocationResult;
import org.openejb.EjbInvocation;
import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractSpecificMethodOperation;
+import org.openejb.dispatch.AbstractCallbackOperation;
/**
*
@@ -62,7 +62,7 @@
* @version $Revision$ $Date$
*
* */
-public class SetSessionContextOperation extends AbstractSpecificMethodOperation {
+public class SetSessionContextOperation extends AbstractCallbackOperation {
public static final SetSessionContextOperation INSTANCE = new SetSessionContextOperation();
private SetSessionContextOperation() {}
