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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Feb 14 18:39:43 CST 2012


branch "operation-context-propogation" has been updated
       via  1806dec2243e6d91ae54871fd6bd4a85ea04b5f8 (commit)
      from  15eebd137a6bda4a45255219cea1faf59f51ee3c (commit)

Summary of changes:
 .../Core/Discovery/ServiceLocatorIf.ice            |    3 +-
 slice/AsteriskSCF/Media/MediaExtractionIf.ice      |    6 +-
 slice/AsteriskSCF/Media/MediaIf.ice                |   11 ++-
 slice/AsteriskSCF/Media/MediaInjectionIf.ice       |    6 +-
 slice/AsteriskSCF/Media/MediaOperationIf.ice       |    4 +-
 slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice        |   13 +++-
 slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice         |   12 ++-
 slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice         |    3 -
 slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice     |    3 +-
 slice/AsteriskSCF/Presence/PresenceIf.ice          |    9 ++-
 .../SessionCommunicationsIf.ice                    |   77 ++++++++++++++------
 .../SessionCommunications/TelephonyEventsIf.ice    |    6 +-
 .../System/Component/ConfigurationIf.ice           |    9 ++-
 slice/AsteriskSCF/System/Logger/LoggerIf.ice       |    3 +-
 14 files changed, 112 insertions(+), 53 deletions(-)


- Log -----------------------------------------------------------------
commit 1806dec2243e6d91ae54871fd6bd4a85ea04b5f8
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Tue Feb 14 18:37:32 2012 -0600

    Some cleanup of the OperationContext usage.

diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 6b2bc8b..7e21cc5 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -174,7 +174,8 @@ module V1
       idempotent void addLocatorParams(
           AsteriskSCF::System::V1::OperationContext operationContext,
           ServiceLocatorParams params, 
-          string compareguid);
+          string compareguid) throws
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
       /**
        * Gets the status of this registered service.
diff --git a/slice/AsteriskSCF/Media/MediaExtractionIf.ice b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
index 195703d..d59ac12 100644
--- a/slice/AsteriskSCF/Media/MediaExtractionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
@@ -116,7 +116,8 @@ module V1
          */
         ExtractInstanceDict startExtraction(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            ExtractRequestInfoDict requests);
+            ExtractRequestInfoDict requests) throws
+               AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method used to request that media extraction stop.
@@ -126,7 +127,8 @@ module V1
          */
         void stopExtraction(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            ExtractInstanceSeq instances);
+            ExtractInstanceSeq instances) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
 }; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
index 971a326..96d8b11 100644
--- a/slice/AsteriskSCF/Media/MediaIf.ice
+++ b/slice/AsteriskSCF/Media/MediaIf.ice
@@ -142,7 +142,8 @@ module V1
          */
         ["amd"] idempotent void connectStreams(
             AsteriskSCF::System::V1::OperationContext operationContext, 
-            DirectMediaConnectionDict connections);
+            DirectMediaConnectionDict connections) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method used to tear down direct media connections.
@@ -152,7 +153,8 @@ module V1
          */
         ["amd"] idempotent void disconnectStreams(
             AsteriskSCF::System::V1::OperationContext operationContext, 
-            Ice::StringSeq streams);
+            Ice::StringSeq streams) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
     /**
@@ -351,7 +353,9 @@ module V1
          */
         idempotent void requestFormat(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            Format newformat) throws MediaFormatSwitchException;
+            Format newformat) throws 
+                MediaFormatSwitchException,
+                AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
     /**
@@ -363,7 +367,6 @@ module V1
          * Method which gives the implementation a sequence of frames which it will then deal with in an implementation
          * specific manner.
          *
-         * @param operationContext Provides unique id for this operation.
          * @param frames A sequence of frames.
          *
          * @throws UnsupportedMediaFormatException if the format of a frame is not supported by the sink.
diff --git a/slice/AsteriskSCF/Media/MediaInjectionIf.ice b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
index 87efc48..7ecba6c 100644
--- a/slice/AsteriskSCF/Media/MediaInjectionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
@@ -115,7 +115,8 @@ module V1
          */
         idempotent InjectInstanceDict startInjection(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            InjectRequestInfoDict requests);
+            InjectRequestInfoDict requests) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method used to request that media injection stop.
@@ -124,7 +125,8 @@ module V1
          */
         idempotent void stopInjection(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            InjectInstanceSeq instances);
+            InjectInstanceSeq instances) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
 }; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/MediaOperationIf.ice b/slice/AsteriskSCF/Media/MediaOperationIf.ice
index 11ce8c9..77b3e54 100644
--- a/slice/AsteriskSCF/Media/MediaOperationIf.ice
+++ b/slice/AsteriskSCF/Media/MediaOperationIf.ice
@@ -61,7 +61,9 @@ interface MediaOperationFactory
     idempotent MediaOperation* createMediaOperation(
             AsteriskSCF::System::V1::OperationContext operationContext,
             StreamSource* source,
-            StreamSink* sink) throws UnsupportedMediaFormatException;
+            StreamSink* sink) throws 
+                UnsupportedMediaFormatException,
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 };
 
 struct MediaOperationAttributes
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
index f6a9b67..d0800f1 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
@@ -139,7 +139,9 @@ module V1
        idempotent void setRemoteDetails(
            AsteriskSCF::System::V1::OperationContext operationContext,
            string address, 
-           int port) throws AsteriskSCF::Media::RTP::V1::InvalidAddress;
+           int port) throws 
+               AsteriskSCF::Media::RTP::V1::InvalidAddress,
+               AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
    /**
@@ -159,7 +161,8 @@ module V1
        idempotent void sourceStatisticsUpdated(
            AsteriskSCF::System::V1::OperationContext operationContext,
            AsteriskSCF::Media::RTP::V1::StreamSourceRTP* source, 
-           Statistics newStatistics);
+           Statistics newStatistics) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Method called when statistics information is updated for a sink
@@ -173,7 +176,8 @@ module V1
        void sinkStatisticsUpdated(
            AsteriskSCF::System::V1::OperationContext operationContext,
            AsteriskSCF::Media::RTP::V1::StreamSinkRTP* sink, 
-           Statistics newStatistics);
+           Statistics newStatistics) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Method called when the SSRC changes for a source
@@ -187,7 +191,8 @@ module V1
        void sourceSsrcChanged(
            AsteriskSCF::System::V1::OperationContext operationContext,
            AsteriskSCF::Media::RTP::V1::StreamSourceRTP* source, 
-           int ssrc);
+           int ssrc) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
    /**
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
index 6692d6c..cac171c 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
@@ -160,7 +160,8 @@ module V1
        */
       void associatePayloads(
           AsteriskSCF::System::V1::OperationContext operationContext,
-          PayloadMap mappings);
+          PayloadMap mappings) throws
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
       /**
        * Method which releases the RTP session. Once called the RTP session will no longer exist.
@@ -241,7 +242,8 @@ module V1
            string keyInfo, 
            bool enableAuthentication, 
            bool enableEncryption) 
-               throws SRTPUnavailable;
+               throws SRTPUnavailable,
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Set the key information and initiates communication with peer.
@@ -269,7 +271,8 @@ module V1
            string keyInfo, 
            bool enableAuthentication, 
            bool enableEncryption) throws
-               SRTPUnavailable, SRTPFailure, SRTPAlreadyStarted;
+               SRTPUnavailable, SRTPFailure, SRTPAlreadyStarted,
+               AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
    /**
@@ -303,7 +306,8 @@ module V1
            RTPServiceLocatorParams params, 
            RTPOptions options, 
            out RTPAllocationOutputs outputs) 
-               throws SessionAllocationFailure;
+               throws SessionAllocationFailure,
+                AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
 }; /*  end module V1 */
diff --git a/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice b/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
index e57bc50..99727fb 100644
--- a/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
+++ b/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
@@ -98,8 +98,6 @@ module V1
         /**
          * Method which retrieves a media format concrete class given a specific name.
          *
-         * @param operationContext Provides unique id for this operation.
-         *
          * @param name Name of the media format, may contain additional details according to the descriptor service.
          *
          * @param sampleRate The sample rate for the frames.
@@ -111,7 +109,6 @@ module V1
          * @return Format A concrete class containing media format details for the given format.
          */
         idempotent AsteriskSCF::Media::V1::Format getNamedFormat(
-            AsteriskSCF::System::V1::OperationContext operationContext,
             string name, 
             int sampleRate, 
             int frameSize,
diff --git a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
index 7d0c8d7..fd3ffd6 100644
--- a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
+++ b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
@@ -186,7 +186,8 @@ module V1
        idempotent UDPTLSession* allocate(
            AsteriskSCF::System::V1::OperationContext operationContext,
            UDPTLServiceLocatorParams params)
-               throws SessionAllocationFailure;
+               throws SessionAllocationFailure,
+                AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
 }; /*  end module V1 */
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
index aadd260..1078678 100644
--- a/slice/AsteriskSCF/Presence/PresenceIf.ice
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -139,7 +139,8 @@ module V1
         */
        void update(
            AsteriskSCF::System::V1::OperationContext operationContext,
-           ResourceStatusDict newStatus);
+           ResourceStatusDict newStatus) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
    /**
@@ -200,7 +201,8 @@ module V1
            AsteriskSCF::System::V1::OperationContext operationContext,
            Token authToken, 
            Ice::StringSeq resources, 
-           Consumer *presenceConsumer);
+           Consumer *presenceConsumer) throws
+               AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Method used to unsubscribe from specific resource status updates.
@@ -214,7 +216,8 @@ module V1
        idempotent void unsubscribe(
            AsteriskSCF::System::V1::OperationContext operationContext,
            Ice::StringSeq resources, 
-           Consumer *presenceConsumer);
+           Consumer *presenceConsumer) throws
+               AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
 }; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 1dd53a6..e1019e8 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -316,7 +316,8 @@ module V1
             AsteriskSCF::System::V1::OperationContext operationContext, 
             Session* source, 
             Indication event, 
-            SessionCookies cookies);
+            SessionCookies cookies) throws
+             AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
     sequence<SessionListener*> SessionListenerSeq;
@@ -356,7 +357,8 @@ module V1
          */
         ["amd"] idempotent void changeStreamStates(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            AsteriskSCF::Media::V1::StreamStateDict streams);
+            AsteriskSCF::Media::V1::StreamStateDict streams) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method called to add streams.
@@ -371,7 +373,8 @@ module V1
         ["amd"] idempotent AsteriskSCF::Media::V1::StreamInformationDict addStreams(
             AsteriskSCF::System::V1::OperationContext operationContext,
             AsteriskSCF::Media::V1::StreamInformationDict
-            streams);
+            streams) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method called to remove streams.
@@ -382,7 +385,8 @@ module V1
          */
         ["amd"] idempotent void removeStreams(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            AsteriskSCF::Media::V1::StreamInformationDict streams);
+            AsteriskSCF::Media::V1::StreamInformationDict streams) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
          /**
           * Method which updates connected line party identification. 
@@ -395,7 +399,8 @@ module V1
           */
          idempotent void updateConnectedLine(
              AsteriskSCF::System::V1::OperationContext operationContext,
-             AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine);
+             AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
          /**
           * Method which updates caller party identification. 
@@ -408,7 +413,8 @@ module V1
           */
          idempotent void updateCallerID(
              AsteriskSCF::System::V1::OperationContext operationContext,
-             AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID);
+             AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
          /**
           * Method which provides notification of redirections that have occurred. 
@@ -421,7 +427,8 @@ module V1
           */
          idempotent void updateRedirections(
              AsteriskSCF::System::V1::OperationContext operationContext,
-             AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirections);
+             AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirections) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
     /**
@@ -452,6 +459,8 @@ module V1
         /**
          * Set (or replace) cookies on the session.
          *
+         * @param operationContext Provides unique id for this operation.
+         *
          * @param cookies A sequence of one or more concrete objects,
          *        each of which are of a type derived from SessionCookie.
          *        The session manager will store these cookies on the
@@ -461,18 +470,26 @@ module V1
          * @note  There can only be one cookie of a given type associated
          *        with a session.
          **/
-        idempotent void setCookies(SessionCookies cookies);
+        idempotent void setCookies(
+                AsteriskSCF::System::V1::OperationContext operationContext,
+                SessionCookies cookies) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Remove cookies from the session.
          *
+         * @param operationContext Provides unique id for this operation.
+         *
          * @param cookies A sequence of one or more concrete objects,
          *        each of which are of a type derived from SessionCookie.
          *        The session manager will remove any cookies on the session
          *        with types that match the ones in this sequence; the
          *        content of the supplied cookies is not compared.
          **/
-        idempotent void removeCookies(SessionCookies cookies);
+        idempotent void removeCookies(
+                 AsteriskSCF::System::V1::OperationContext operationContext,
+                 SessionCookies cookies) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Get cookies stored on the session.
@@ -501,7 +518,9 @@ module V1
          */
         ["amd"] idempotent void indicate(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            Indication event) throws IndicationException;
+            Indication event) throws 
+              IndicationException,
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method which retrieves a proxy to the endpoint object that created the current session.
@@ -601,6 +620,8 @@ module V1
          * the session so it can also perform controller intervention and receive
          * notification from the component that passed in the SessionController.
          *
+         * @param operationContext Provides unique id for this operation.
+         *
          * @param controller A proxy to the SessionController object implemented by the caller.
          *
          * @return SessionController* A proxy to the session controller implemented by
@@ -610,8 +631,10 @@ module V1
          *
          * @see SessionController
          */
-        ["amd"] idempotent SessionController *setAndGetSessionController(SessionController* controller) throws
-            ControllerAlreadySet;
+        ["amd"] idempotent SessionController *setAndGetSessionController(
+            AsteriskSCF::System::V1::OperationContext operationContext,
+            SessionController* controller) throws
+              ControllerAlreadySet, AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Method which removes a session controller from a session.
@@ -795,7 +818,8 @@ module V1
             AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirects)
            throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
            EndpointUnreachableException, SessionCreationException,
-           SourceTerminatedPreBridgingException, BridgingException ;
+           SourceTerminatedPreBridgingException, BridgingException, 
+           AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Connect sessions bridged with one session with a new
@@ -834,7 +858,8 @@ module V1
                 AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook)
            throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
            SessionCreationException,
-           SourceTerminatedPreBridgingException, BridgingException, NotBridged ;
+           SourceTerminatedPreBridgingException, BridgingException, NotBridged, 
+           AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Replace one session in a Bridge with sessions from another bridge.
@@ -869,7 +894,8 @@ module V1
                 Session* sessionToReplace,
                 Session* bridgedSession,
                 bool replaceSession)
-           throws SourceTerminatedPreBridgingException, BridgingException, NotBridged ;
+           throws SourceTerminatedPreBridgingException, BridgingException, NotBridged, 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
     /**
@@ -898,7 +924,8 @@ module V1
             AsteriskSCF::System::V1::OperationContext operationContext,
             string destination, 
             SessionListener* callback,
-            AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook);
+            AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Returns the active sessions for this session endpoint.
@@ -1129,7 +1156,8 @@ module V1
          * @see AsteriskSCF::System::V1::OperationCallCancelledException
          * @see AsteriskSCF::System::V1::OperationContext
          */
-        idempotent void removeListener(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener);
+        idempotent void removeListener(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Replaces a session that is on the bridge with another session. Useful for transfers, etc.
@@ -1241,7 +1269,8 @@ module V1
            AsteriskSCF::System::V1::OperationContext operationContext,
            Bridge* sessionBridge, 
            SessionSeq sessions, 
-           BridgeCookies cookies);
+           BridgeCookies cookies) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Called when sessions have been removed from a bridge.
@@ -1259,7 +1288,8 @@ module V1
             AsteriskSCF::System::V1::OperationContext operationContext,
             Bridge* sessionBridge, 
             SessionSeq sessions, 
-            BridgeCookies cookies);
+            BridgeCookies cookies) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Called when a bridge has completed shutdown/destruction.
@@ -1446,7 +1476,8 @@ module V1
                AsteriskSCF::System::V1::OperationContext operationContext,
                Session* source, 
                string destination, 
-               OperationResult result);
+               OperationResult result) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
           /**
            * Notice that connectBridgedSessionsWithDestinationEvent operation was called.
@@ -1465,7 +1496,8 @@ module V1
               AsteriskSCF::System::V1::OperationContext operationContext, 
               Session* sessionToReplace, 
               string destination, 
-              OperationResult result);
+              OperationResult result) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
 
           /**
            * Notice that connectBridgedSessionsEvent operation was called.
@@ -1486,7 +1518,8 @@ module V1
               AsteriskSCF::System::V1::OperationContext operationContext, 
               Session* sessionToReplace, 
               Session* bridgedSession, 
-              OperationResult result);
+              OperationResult result) throws 
+              AsteriskSCF::System::V1::OperationCallCancelledException;
        };
 
     }; /* End of module Event */
diff --git a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
index 0d41eff..3866bea 100644
--- a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
@@ -109,14 +109,16 @@ module V1
          */
         ["amd"] idempotent void addSinks(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            TelephonyEventSinkSeq sinks);
+            TelephonyEventSinkSeq sinks) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Remove sinks.
          */
         ["amd"] idempotent void removeSinks(
             AsteriskSCF::System::V1::OperationContext operationContext,
-            TelephonyEventSinkSeq sinks);
+            TelephonyEventSinkSeq sinks) throws
+                AsteriskSCF::System::V1::OperationCallCancelledException;
 
         /**
          * Get a list of the sinks to which this source sends events
diff --git a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
index 1dacf4d..e6d610f 100644
--- a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
+++ b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
@@ -161,7 +161,8 @@ module V1
         */
        idempotent void setConfiguration(
            AsteriskSCF::System::V1::OperationContext operationContext,
-           ConfigurationGroupSeq groups) throws SerialConflict;
+           ConfigurationGroupSeq groups) throws 
+             SerialConflict, AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Remove specific configuration items from a configuration group.
@@ -172,7 +173,8 @@ module V1
         */
        idempotent void removeConfigurationItems(
            AsteriskSCF::System::V1::OperationContext operationContext,
-           ConfigurationGroupSeq groups);
+           ConfigurationGroupSeq groups) throws 
+               AsteriskSCF::System::V1::OperationCallCancelledException;
 
        /**
         * Remove a configuration group and all configuration items.
@@ -183,7 +185,8 @@ module V1
         */
        idempotent void removeConfigurationGroups(
            AsteriskSCF::System::V1::OperationContext operationContext,
-           ConfigurationGroupSeq groups);
+           ConfigurationGroupSeq groups) throws
+              AsteriskSCF::System::V1::OperationCallCancelledException;
     };
 
    /**
diff --git a/slice/AsteriskSCF/System/Logger/LoggerIf.ice b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
index 121fb1f..04cac98 100644
--- a/slice/AsteriskSCF/System/Logger/LoggerIf.ice
+++ b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
@@ -155,7 +155,8 @@ module Logging
        */
       idempotent void configured(
           AsteriskSCF::System::V1::OperationContext operationContext, 
-          Configuration logConfiguration);
+          Configuration logConfiguration) throws
+              AsteriskSCF::System::V1::OperationCallCancelledException;
    };
 
 }; /* Logging */

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


-- 
asterisk-scf/integration/slice.git



More information about the asterisk-scf-commits mailing list