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

[Commits to the Asterisk SCF project code repositories]

branch "operation-context-propogation" has been updated
       via  1143abea2f385b9793efab76a651a75ef1f8680b (commit)
      from  36aeb49e7d04aa1f42b70d3b1badb0863caf2700 (commit)

Summary of changes:
 .../Core/Discovery/ServiceLocatorIf.ice            |    7 +++
 .../SessionCommunicationsIf.ice                    |   43 +++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 1143abea2f385b9793efab76a651a75ef1f8680b
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jan 24 17:00:22 2012 -0330

    Additional operation contexts

diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 4874c9d..d44431c 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -111,6 +111,8 @@ module V1
        string id;
    };
 
+   sequence<ServiceLocatorParams> ServiceLocatorParamsSeq;
+
    /**
     * Interface used to perform service locator requests.
     */
@@ -192,6 +194,11 @@ module V1
        * Method which unregisters this service from the service locator.
        */
       void unregister();
+
+       /**
+        * Returns a sequence containing all ServiceLocatorParams added to this object.
+        */
+       ServiceLocatorParamsSeq getLocatorParams();
    };
 
    /**
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index fd4fe24..b6f0042 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -1014,9 +1014,10 @@ module V1
             AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
-         * Abruptly destroy the bridge. Sessions will not be stopped.
+         * Abruptly destroy the bridge. Sessions will not be stopped. Calls subsequent to the initial call will either
+         * be ignored or an ObjectNotExistException will be thrown.
          */
-        void destroy();
+        idempotent void destroy();
 
         /**
          * List the sessions currently on the bridge.
@@ -1060,21 +1061,34 @@ module V1
          * Adds a listener object to the bridge. The listener will receive notification of future changes to the bridge
          * as they occur.
          *
+         * @param operationContext Information about the logical operation context.
+         *
          * @param listener A reference to a BridgeListener object.
          *
+         * @throws OperationCallCancelledException if the operation needed to be cancelled.
+         *
          * @see BridgeListener
+         * @see AsteriskSCF::System::V1::OperationCallCancelledException
+         * @see AsteriskSCF::System::V1::OperationContext
          */
-        idempotent void addListener(BridgeListener* listener);
+        idempotent void addListener(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener)
+            throws AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Removes a listener object from the bridge. The listener will cease receiving notifications of changes to the
          * bridge.
          *
+         * @param operationContext Information about the logical operation context.
+         *
          * @param listener A reference to the listener object to be removed.
          *
+         * @throws OperationCallCancelledException if the operation needed to be cancelled.
+         *
          * @see BridgeListener
+         * @see AsteriskSCF::System::V1::OperationCallCancelledException
+         * @see AsteriskSCF::System::V1::OperationContext
          */
-        idempotent void removeListener(BridgeListener* listener);
+        idempotent void removeListener(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener);
 
         /**
          * Replaces a session that is on the bridge with another session. Useful for transfers, etc.
@@ -1106,25 +1120,42 @@ module V1
         /**
          * Set (or replace) cookies on the Bridge.
          *
+         * @param operationContext Information about the logical operation context.
+         *
          * @param cookies A sequence of one or more concrete objects, each of which are of a type derived from
          *        BridgeCookie.  The bridge will store these cookies on the bridge, replacing any existing cookies with
          *        matching types.
          *
+         * @throws OperationCallCancelledException if the operation needed to be cancelled.
+         *
+         * @see AsteriskSCF::System::V1::OperationCallCancelledException
+         * @see AsteriskSCF::System::V1::OperationContext
+         *
          * @note  There can only be one cookie of a given type associated
          *        with a Bridge.
          */
-        idempotent void setCookies(BridgeCookies cookies);
+        idempotent void setCookies(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies)
+            throws AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Remove cookies from the Bridge.
          *
+         * @param operationContext Information about the logical operation context.
+         *
          * @param cookies A sequence of one or more concrete objects,
          *        each of which are of a type derived from BridgeCookie.
          *        The bridge will remove any cookies on the bridge
          *        with types that match the ones in this sequence; the
          *        content of the supplied cookies is not compared.
+         *
+         * @throws OperationCallCancelledException if the operation needed to be cancelled.
+         *
+         * @see AsteriskSCF::System::V1::OperationCallCancelledException
+         * @see AsteriskSCF::System::V1::OperationContext
+         *
          */
-        idempotent void removeCookies(BridgeCookies cookies);
+        idempotent void removeCookies(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies)
+            throws AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Get cookies stored on the Bridge.

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


-- 
asterisk-scf/integration/slice.git