[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "operation-context" updated.

[Commits to the Asterisk SCF project code repositories]

branch "operation-context" has been updated
       via  bfd6f72efc25c68e2c453ffce83334412eef335d (commit)
      from  822d3bbf08cf015c720ce5204503d7e1e33e4f30 (commit)

Summary of changes:
 slice/AsteriskSCF/System/OperationsIf.ice |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit bfd6f72efc25c68e2c453ffce83334412eef335d
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Jan 20 16:34:06 2012 -0330

    Revised some naming. The intent of the exception and reasons was not to
    indicate that a logical operation had failed, but a call on an Ice object
    that was made as part of the larger overall logical operation had failed
    for a non-application specific reason.

diff --git a/slice/AsteriskSCF/System/OperationsIf.ice b/slice/AsteriskSCF/System/OperationsIf.ice
index 7df02b9..cbbdf94 100644
--- a/slice/AsteriskSCF/System/OperationsIf.ice
+++ b/slice/AsteriskSCF/System/OperationsIf.ice
@@ -34,25 +34,27 @@ module V1
 
 /**
  *
- * The CancellationReason enumeration covers the basic reasons why an operation might be cancelled. An Ice object may
- * communicate the reason an operation might be cancelled through the OperationCancelledOperation.
+ * The CancellationReason enumeration covers the basic reasons why a call on an Ice object on behalf of an operation
+ * might be cancelled. An Ice object may communicate the reason an operation might be cancelled through the
+ * OperationCallCancelledException
  *
  */
 enum CancellationReason
 {
-    Duplicate,    /* The operation has already been initiated and cannot be replaced. */
-    TimedOut,     /* The operation has been cancelled because it was unable to completed within the configured time
-                   * constraints */
-    Superseded    /* The operation has been re-initiated by another party, so this instance has been cancelled */
+    Duplicate,    /* This part of the operation has already been initiated and cannot be replaced. */
+    TimedOut,     /* This part of the operation has been cancelled because it was unable to completed within the
+                   * configured time constraints */
+    Superseded    /* This part of the operation has been re-initiated by another party, so this instance has been
+                   * cancelled */
 };
 
 /**
  *
- * An OperationCancelledException may be included in an Slice interface method definition and thrown by an Ice object
- * if it were participating in a logical operation.
+ * An OperationCallCancelledException may be included in an Slice interface method definition and thrown by an Ice
+ * object if it were participating in a logical operation.
  *
  */
-exception OperationCancelledException
+exception OperationCallCancelledException
 {
     string operationId;
     CancellationReason reason;
@@ -62,7 +64,7 @@ exception OperationCancelledException
  *
  * An abstraction of a logical operational context. May be used to identify a group of operations as being related to
  * each other, allowing a normally non-idempotent operation to be made idempotent, etc. Interface methods that accept
- * an OperationContext instance may throw a OperationCancelled exception.
+ * an OperationContext instance may throw a OperationCallCancelledException.
  *
  * Note: possible uses of extension include rudimentary transactional context, etc.
  *

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice.git