[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
Thu Feb 23 21:24:18 CST 2012
branch "operation-context-propogation" has been updated
via 1b45a805fcca32c61b1ff2b9c2583d7dde1b1787 (commit)
from 35ea3196597ff1f1eded772d860d32f1a84aac24 (commit)
Summary of changes:
.../Core/Discovery/ServiceLocatorIf.ice | 7 +-
slice/AsteriskSCF/Core/Routing/RoutingIf.ice | 13 +-
slice/AsteriskSCF/Media/MediaExtractionIf.ice | 6 +-
slice/AsteriskSCF/Media/MediaIf.ice | 24 +--
slice/AsteriskSCF/Media/MediaInjectionIf.ice | 6 +-
slice/AsteriskSCF/Media/MediaOperationIf.ice | 3 +-
slice/AsteriskSCF/Media/NetworkIf.ice | 2 +-
slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice | 18 +--
slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice | 14 +-
slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice | 9 +-
slice/AsteriskSCF/Presence/PresenceIf.ice | 9 +-
slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice | 9 +-
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 12 +-
.../SessionCommunicationsExtensionPointsIf.ice | 45 ++----
.../SessionCommunicationsIf.ice | 160 ++++++--------------
.../SessionCommunications/TelephonyEventsIf.ice | 10 +-
.../System/Component/ComponentServiceIf.ice | 21 ++--
.../System/Component/ConfigurationIf.ice | 11 +-
slice/AsteriskSCF/System/Component/ReplicaIf.ice | 18 +--
slice/AsteriskSCF/System/Logger/LoggerIf.ice | 3 +-
slice/AsteriskSCF/System/NAT/NATTraversalIf.ice | 3 +-
slice/AsteriskSCF/System/OperationsIf.ice | 45 +-----
22 files changed, 142 insertions(+), 306 deletions(-)
- Log -----------------------------------------------------------------
commit 1b45a805fcca32c61b1ff2b9c2583d7dde1b1787
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Feb 23 21:24:05 2012 -0600
Removed OperationCallCancelledException, it's enum values, and all throw
declarations of that exception.
diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 358b96f..0a84b67 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -174,8 +174,7 @@ module V1
idempotent void addLocatorParams(
AsteriskSCF::System::V1::OperationContext operationContext,
ServiceLocatorParams params,
- string compareguid) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ string compareguid);
/**
* Gets the status of this registered service.
@@ -278,7 +277,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
string compareguid,
ServiceLocatorParamsCompare *compare)
- throws DuplicateCompare, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws DuplicateCompare;
/**
* Method which removes a comparator from the service locator.
@@ -289,7 +288,7 @@ module V1
*/
idempotent void removeCompare(
AsteriskSCF::System::V1::OperationContext operationContext,
- string compareguid) throws CompareNotFound, AsteriskSCF::System::V1::OperationCallCancelledException;
+ string compareguid) throws CompareNotFound;
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Core/Routing/RoutingIf.ice b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
index 19384a9..b70fa6b 100644
--- a/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
+++ b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
@@ -134,8 +134,7 @@ module V1
*/
idempotent void addEndpointLocator(AsteriskSCF::System::V1::OperationContext operationContext,
string id, RegExSeq destinationIdRangeList, EndpointLocator *locator)
- throws LocatorAlreadyRegisteredException, InvalidParamsException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws LocatorAlreadyRegisteredException, InvalidParamsException;
/**
* Method which unregisters an EndpointLocator.
@@ -148,7 +147,7 @@ module V1
idempotent void removeEndpointLocator(
AsteriskSCF::System::V1::OperationContext operationContext,
string id)
- throws DestinationNotFoundException, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws DestinationNotFoundException;
/**
* Method which modifies the range of device ids managed by a previously added EndpointLocator.
@@ -165,7 +164,7 @@ module V1
idempotent void setEndpointLocatorDestinationIds(
AsteriskSCF::System::V1::OperationContext operationContext,
string id, RegExSeq deviceIdRangeList)
- throws DestinationNotFoundException, InvalidParamsException, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws DestinationNotFoundException, InvalidParamsException;
};
@@ -179,8 +178,7 @@ module V1
*
* @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void clearEndpointLocators(AsteriskSCF::System::V1::OperationContext operationContext)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void clearEndpointLocators(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* Method which sends a policy string to the Lua script processor. The default implementation is a no-op,
@@ -189,8 +187,7 @@ module V1
* @param operationContext Provides unique context for each call to this operation.
* @param policy A site-specific policy specification.
*/
- idempotent void setPolicy(AsteriskSCF::System::V1::OperationContext operationContext, string policy)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void setPolicy(AsteriskSCF::System::V1::OperationContext operationContext, string policy);
};
module Event
diff --git a/slice/AsteriskSCF/Media/MediaExtractionIf.ice b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
index 9df60e6..2522873 100644
--- a/slice/AsteriskSCF/Media/MediaExtractionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
@@ -116,8 +116,7 @@ module V1
*/
ExtractInstanceDict startExtraction(
AsteriskSCF::System::V1::OperationContext operationContext,
- ExtractRequestInfoDict requests) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ExtractRequestInfoDict requests);
/**
* Method used to request that media extraction stop.
@@ -127,8 +126,7 @@ module V1
*/
void stopExtraction(
AsteriskSCF::System::V1::OperationContext operationContext,
- ExtractInstanceSeq instances) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ExtractInstanceSeq instances);
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
index f56185c..4dbec41 100644
--- a/slice/AsteriskSCF/Media/MediaIf.ice
+++ b/slice/AsteriskSCF/Media/MediaIf.ice
@@ -142,8 +142,7 @@ module V1
*/
["amd"] idempotent void connectStreams(
AsteriskSCF::System::V1::OperationContext operationContext,
- DirectMediaConnectionDict connections) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ DirectMediaConnectionDict connections);
/**
* Method used to tear down direct media connections.
@@ -153,8 +152,7 @@ module V1
*/
["amd"] idempotent void disconnectStreams(
AsteriskSCF::System::V1::OperationContext operationContext,
- Ice::StringSeq streams) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Ice::StringSeq streams);
};
/**
@@ -265,8 +263,7 @@ module V1
*/
idempotent void setCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
/**
* Remove cookies from the session.
@@ -278,8 +275,7 @@ module V1
*/
idempotent void removeCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
/**
* Get cookies stored on the session.
@@ -321,8 +317,7 @@ module V1
*/
idempotent void addSink(
AsteriskSCF::System::V1::OperationContext operationContext,
- StreamSink* destination) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ StreamSink* destination);
/**
* Method which removes a sink. Once removed media will no longer be written to it.
@@ -331,8 +326,7 @@ module V1
*/
idempotent void removeSink(
AsteriskSCF::System::V1::OperationContext operationContext,
- StreamSink* destination) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ StreamSink* destination);
/**
* Method which retrieves the current stream sinks for media.
@@ -366,8 +360,7 @@ module V1
idempotent void requestFormat(
AsteriskSCF::System::V1::OperationContext operationContext,
Format newformat) throws
- MediaFormatSwitchException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ MediaFormatSwitchException;
};
/**
@@ -396,8 +389,7 @@ module V1
*/
idempotent void setSource(
AsteriskSCF::System::V1::OperationContext operationContext,
- StreamSource* source) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ StreamSource* source);
/**
* Method which retrieves the current stream source of media.
diff --git a/slice/AsteriskSCF/Media/MediaInjectionIf.ice b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
index adb4a33..4c08794 100644
--- a/slice/AsteriskSCF/Media/MediaInjectionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
@@ -115,8 +115,7 @@ module V1
*/
idempotent InjectInstanceDict startInjection(
AsteriskSCF::System::V1::OperationContext operationContext,
- InjectRequestInfoDict requests) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ InjectRequestInfoDict requests);
/**
* Method used to request that media injection stop.
@@ -125,8 +124,7 @@ module V1
*/
idempotent void stopInjection(
AsteriskSCF::System::V1::OperationContext operationContext,
- InjectInstanceSeq instances) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ InjectInstanceSeq instances);
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/MediaOperationIf.ice b/slice/AsteriskSCF/Media/MediaOperationIf.ice
index 77b3e54..ee23ba4 100644
--- a/slice/AsteriskSCF/Media/MediaOperationIf.ice
+++ b/slice/AsteriskSCF/Media/MediaOperationIf.ice
@@ -62,8 +62,7 @@ interface MediaOperationFactory
AsteriskSCF::System::V1::OperationContext operationContext,
StreamSource* source,
StreamSink* sink) throws
- UnsupportedMediaFormatException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ UnsupportedMediaFormatException;
};
struct MediaOperationAttributes
diff --git a/slice/AsteriskSCF/Media/NetworkIf.ice b/slice/AsteriskSCF/Media/NetworkIf.ice
index 433ad67..6e62f0a 100644
--- a/slice/AsteriskSCF/Media/NetworkIf.ice
+++ b/slice/AsteriskSCF/Media/NetworkIf.ice
@@ -85,7 +85,7 @@ module V1
idempotent void setRemoteDetails(
AsteriskSCF::System::V1::OperationContext operationContext,
string address, int port) throws
- InvalidAddress, AsteriskSCF::System::V1::OperationCallCancelledException;
+ InvalidAddress;
/**
* Method which returns the remote address information that we are sending to.
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
index 13de541..e3ca165 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
@@ -140,8 +140,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
string address,
int port) throws
- AsteriskSCF::Media::RTP::V1::InvalidAddress,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::Media::RTP::V1::InvalidAddress;
};
/**
@@ -161,8 +160,7 @@ module V1
idempotent void sourceStatisticsUpdated(
AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::Media::RTP::V1::StreamSourceRTP* source,
- Statistics newStatistics) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Statistics newStatistics);
/**
* Method called when statistics information is updated for a sink
@@ -176,8 +174,7 @@ module V1
void sinkStatisticsUpdated(
AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::Media::RTP::V1::StreamSinkRTP* sink,
- Statistics newStatistics) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Statistics newStatistics);
/**
* Method called when the SSRC changes for a source
@@ -191,8 +188,7 @@ module V1
void sourceSsrcChanged(
AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::Media::RTP::V1::StreamSourceRTP* source,
- int ssrc) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ int ssrc);
};
/**
@@ -225,8 +221,7 @@ module V1
*/
idempotent void addListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- InformationListener *listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ InformationListener *listener);
/**
* Method used to remove a listener
@@ -236,8 +231,7 @@ module V1
*/
idempotent void removeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- InformationListener *listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ InformationListener *listener);
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
index 95fc291..687837d 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
@@ -128,7 +128,7 @@ module V1
idempotent void setRemoteDetails(
AsteriskSCF::System::V1::OperationContext operationContext,
string address, int port) throws
- InvalidAddress, AsteriskSCF::System::V1::OperationCallCancelledException;
+ InvalidAddress;
/**
* Method which retrieves the remote IP address.
@@ -163,8 +163,7 @@ module V1
*/
void associatePayloads(
AsteriskSCF::System::V1::OperationContext operationContext,
- PayloadMap mappings) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ PayloadMap mappings);
/**
* Method which releases the RTP session. Once called the RTP session will no longer exist.
@@ -245,8 +244,7 @@ module V1
string keyInfo,
bool enableAuthentication,
bool enableEncryption)
- throws SRTPUnavailable,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws SRTPUnavailable;
/**
* Set the key information and initiates communication with peer.
@@ -274,8 +272,7 @@ module V1
string keyInfo,
bool enableAuthentication,
bool enableEncryption) throws
- SRTPUnavailable, SRTPFailure, SRTPAlreadyStarted,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SRTPUnavailable, SRTPFailure, SRTPAlreadyStarted;
};
/**
@@ -309,8 +306,7 @@ module V1
RTPServiceLocatorParams params,
RTPOptions options,
out RTPAllocationOutputs outputs)
- throws SessionAllocationFailure,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws SessionAllocationFailure;
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
index 77021b9..314c7ef 100644
--- a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
+++ b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
@@ -117,8 +117,7 @@ module V1
*/
idempotent void setFarMaxDatagram(
AsteriskSCF::System::V1::OperationContext operationContext,
- int datagramSize) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ int datagramSize);
/**
* Method which returns the maximum datagram size of this source.
@@ -141,8 +140,7 @@ module V1
*/
idempotent void setErrorCorrectionScheme(
AsteriskSCF::System::V1::OperationContext operationContext,
- ErrorCorrectionScheme scheme) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ErrorCorrectionScheme scheme);
/**
* Method which gets the error correction scheme.
@@ -192,8 +190,7 @@ module V1
idempotent UDPTLSession* allocate(
AsteriskSCF::System::V1::OperationContext operationContext,
UDPTLServiceLocatorParams params)
- throws SessionAllocationFailure,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws SessionAllocationFailure;
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
index 0b9ec0e..dfb69db 100644
--- a/slice/AsteriskSCF/Presence/PresenceIf.ice
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -139,8 +139,7 @@ module V1
*/
void update(
AsteriskSCF::System::V1::OperationContext operationContext,
- ResourceStatusDict newStatus) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ResourceStatusDict newStatus);
};
/**
@@ -201,8 +200,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Token authToken,
Ice::StringSeq resources,
- Consumer *presenceConsumer) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Consumer *presenceConsumer);
/**
* Method used to unsubscribe from specific resource status updates.
@@ -216,8 +214,7 @@ module V1
idempotent void unsubscribe(
AsteriskSCF::System::V1::OperationContext operationContext,
Ice::StringSeq resources,
- Consumer *presenceConsumer) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Consumer *presenceConsumer);
};
}; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index 8aa512b..6dee7fc 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -230,16 +230,13 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
AuthHook *hook,
int priority,
- RequestTypeSeq requestTypes) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ RequestTypeSeq requestTypes);
idempotent void removeAuthHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- AuthHook *hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AuthHook *hook);
- idempotent void clearAuthHooks(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void clearAuthHooks(AsteriskSCF::System::V1::OperationContext operationContext);
};
}; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index 9400c62..5cd2b16 100644
--- a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -88,8 +88,7 @@ interface RegistrarListener
*/
idempotent void contactsAdded(
AsteriskSCF::System::V1::OperationContext operationContext,
- BindingUpdateSeq contacts) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BindingUpdateSeq contacts);
/**
* Alerts the listener that contacts have been removed.
@@ -100,8 +99,7 @@ interface RegistrarListener
*/
idempotent void contactsRemoved(
AsteriskSCF::System::V1::OperationContext operationContext,
- BindingUpdateSeq contacts) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BindingUpdateSeq contacts);
};
/**
@@ -119,16 +117,14 @@ interface Registrar
*/
["amd"] idempotent ContactDict addListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- RegistrarListener *listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ RegistrarListener *listener);
/**
* Remove a listener.
*/
["amd"] idempotent void removeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- RegistrarListener *listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ RegistrarListener *listener);
/**
* Get the mapping of all active registrations.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
index 971de34..b1da497 100755
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
@@ -76,23 +76,20 @@ module V1
*/
idempotent void addSessionCreationHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCreationHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCreationHook* hook);
/**
* Remove a session decorator hook
*/
idempotent void removeSessionCreationHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCreationHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCreationHook* hook);
/**
* Remove all session decorator hooks
*/
idempotent void clearSessionCreationHooks(
- AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::System::V1::OperationContext operationContext);
};
const string BridgeCreationExtensionPointCategory = "BridgeCreationHook";
@@ -147,22 +144,19 @@ module V1
*/
idempotent void addHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeCreationHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeCreationHook* hook);
/**
* Remove the bridge creation hook that matches the proxy provided.
*/
idempotent void removeHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeCreationHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeCreationHook* hook);
/**
* Clear all registered hooks.
*/
- idempotent void clearHooks(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void clearHooks(AsteriskSCF::System::V1::OperationContext operationContext);
};
const string PartyIdentificationHookLocatorCategory = "PartyIdHook";
@@ -291,71 +285,62 @@ module V1
*/
idempotent void addReceivedConnectedLinePartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ReceivedConnectedLinePartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ReceivedConnectedLinePartyIdHook* hook);
/**
* Add a hook to invoke when forwarding ConnectedLine party id.
*/
idempotent void addForwardingConnectedLinePartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingConnectedLinePartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingConnectedLinePartyIdHook* hook);
/**
* Add a hook to invoke when forwarding ConnectedLine party id.
*/
idempotent void addForwardingCallerPartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingCallerPartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingCallerPartyIdHook* hook);
/**
* Add a hook to invoke when forwarding Redirections party id record.
*/
idempotent void addForwardingRedirectionsPartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingRedirectionsPartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingRedirectionsPartyIdHook* hook);
/**
* Remove a received ConnectedLine hook
*/
idempotent void removeReceivedConnectedLinePartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ReceivedConnectedLinePartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ReceivedConnectedLinePartyIdHook* hook);
/**
* Remove a forwarding ConnectedLine hook
*/
idempotent void removeForwardingConnectedLinePartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingConnectedLinePartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingConnectedLinePartyIdHook* hook);
/**
* Remove a forwarding ConnectedLine hook
*/
idempotent void removeForwardingCallerPartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingCallerPartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingCallerPartyIdHook* hook);
/**
* Remove a forwarding Redirections hook
*/
idempotent void removeForwardingRedirectionsPartyIdHook(
AsteriskSCF::System::V1::OperationContext operationContext,
- ForwardingRedirectionsPartyIdHook* hook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ForwardingRedirectionsPartyIdHook* hook);
/**
* Remove all party identification hooks
*/
idempotent void clearPartyIdentificationHooks(
- AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::System::V1::OperationContext operationContext);
};
}; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 3f2b1be..fac949f 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -316,8 +316,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Session* source,
Indication event,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
};
sequence<SessionListener*> SessionListenerSeq;
@@ -357,8 +356,7 @@ module V1
*/
["amd"] idempotent void changeStreamStates(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::Media::V1::StreamStateDict streams) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::Media::V1::StreamStateDict streams);
/**
* Method called to add streams.
@@ -372,8 +370,7 @@ module V1
*/
["amd"] idempotent AsteriskSCF::Media::V1::StreamInformationDict addStreams(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::Media::V1::StreamInformationDict streams) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::Media::V1::StreamInformationDict streams);
/**
* Method called to remove streams.
@@ -384,8 +381,7 @@ module V1
*/
["amd"] idempotent void removeStreams(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::Media::V1::StreamInformationDict streams) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::Media::V1::StreamInformationDict streams);
/**
* Method which updates connected line party identification.
@@ -398,8 +394,7 @@ module V1
*/
idempotent void updateConnectedLine(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine);
/**
* Method which updates caller party identification.
@@ -412,8 +407,7 @@ module V1
*/
idempotent void updateCallerID(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID);
/**
* Method which provides notification of redirections that have occurred.
@@ -426,8 +420,7 @@ module V1
*/
idempotent void updateRedirections(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirections) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirections);
};
/**
@@ -473,8 +466,7 @@ module V1
**/
idempotent void setCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
/**
* Remove cookies from the session.
@@ -489,8 +481,7 @@ module V1
**/
idempotent void removeCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
/**
* Get cookies stored on the session.
@@ -520,8 +511,7 @@ module V1
["amd"] idempotent void indicate(
AsteriskSCF::System::V1::OperationContext operationContext,
Indication event) throws
- IndicationException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ IndicationException;
/**
* Method which retrieves a proxy to the endpoint object that created the current session.
@@ -566,14 +556,12 @@ module V1
*/
idempotent void removeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionListener* listener);
/**
* Start a session dialogue with a peer.
*/
- idempotent void start(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void start(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* End the dialogue with the peer, sending the
@@ -583,8 +571,7 @@ module V1
*/
idempotent void stop(
AsteriskSCF::System::V1::OperationContext operationContext,
- ResponseCode response) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ResponseCode response);
/**
* Gets the bridge object this Session is associated with.
@@ -619,7 +606,7 @@ module V1
["amd"] idempotent void removeBridge(
AsteriskSCF::System::V1::OperationContext operationContext,
SessionListener* listener) throws
- NotBridged, AsteriskSCF::System::V1::OperationCallCancelledException;
+ NotBridged;
/**
* Method which sets the session controller proxy to be contacted when actions
@@ -648,7 +635,7 @@ module V1
["amd"] idempotent SessionController *setAndGetSessionController(
AsteriskSCF::System::V1::OperationContext operationContext,
SessionController* controller) throws
- ControllerAlreadySet, AsteriskSCF::System::V1::OperationCallCancelledException;
+ ControllerAlreadySet;
/**
* Method which removes a session controller from a session.
@@ -661,8 +648,7 @@ module V1
*/
["amd"] idempotent void removeSessionController(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionController* controller) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionController* controller);
/**
* Method which retrieves caller party identification information
@@ -835,8 +821,7 @@ module V1
AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirects)
throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
EndpointUnreachableException, SessionCreationException,
- SourceTerminatedPreBridgingException, BridgingException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SourceTerminatedPreBridgingException, BridgingException;
/**
* Connect sessions bridged with one session with a new
@@ -875,8 +860,7 @@ module V1
AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook)
throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
SessionCreationException,
- SourceTerminatedPreBridgingException, BridgingException, NotBridged,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SourceTerminatedPreBridgingException, BridgingException, NotBridged;
/**
* Replace one session in a Bridge with sessions from another bridge.
@@ -911,8 +895,7 @@ module V1
Session* sessionToReplace,
Session* bridgedSession,
bool replaceSession)
- throws SourceTerminatedPreBridgingException, BridgingException, NotBridged,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws SourceTerminatedPreBridgingException, BridgingException, NotBridged;
};
/**
@@ -941,8 +924,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
string destination,
SessionListener* callback,
- AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook);
/**
* Returns the active sessions for this session endpoint.
@@ -959,8 +941,7 @@ module V1
*/
idempotent void addDefaultSessionListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionListener* listener);
/**
* Removes a default SessionListener. Doesn't remove the
@@ -969,8 +950,7 @@ module V1
*/
idempotent void removeDefaultSessionListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionListener* listener);
/**
* Adds default SessionCookies for sessions created for this endpoint.
@@ -979,8 +959,7 @@ module V1
*/
idempotent void addDefaultSessionCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
/**
* Removes a set of default SessionCookies for sessions created for this endpoint.
@@ -989,8 +968,7 @@ module V1
*/
idempotent void removeDefaultSessionCookies(
AsteriskSCF::System::V1::OperationContext operationContext,
- SessionCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionCookies cookies);
};
/**
@@ -1097,25 +1075,21 @@ module V1
*
* @throws InvalidSessions if any of the provided sessions are invalid.
* @throws BridgeSessionOperationFailed if any of the sessions could not be bridged.
- * @throws OperationCallCancelledException if the operation needed to be cancelled.
*
* @see Session
* @see InvalidSessions
- * @see AsteriskSCF::System::V1::OperationCallCancelledException
* @see AsteriskSCF::System::V1::OperationContext
*/
["amd"]
idempotent void addSessions(AsteriskSCF::System::V1::OperationContext operationContext,
- SessionWithSessionInfoSeq sessionInfos)
- throws InvalidSessions, BridgeSessionOperationFailed,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ SessionWithSessionInfoSeq sessionInfos) throws
+ InvalidSessions, BridgeSessionOperationFailed;
/**
* 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.
*/
- idempotent void destroy(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void destroy(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* List the sessions currently on the bridge.
@@ -1132,17 +1106,14 @@ module V1
* @param sessions A sequence of session proxies.
*
* @throws InvalidSessions if any of the provided sessions are invalid.
- * @throws OperationCallCancelledException if the operation needed to be cancelled.
*
* @see Session
* @see InvalidSessions
- * @see AsteriskSCF::System::V1::OperationCallCancelledException
* @see AsteriskSCF::System::V1::OperationContext
*/
["amd"]
idempotent void removeSessions(AsteriskSCF::System::V1::OperationContext operationContext, SessionSeq sessions)
- throws InvalidSessions, BridgeSessionOperationFailed,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws InvalidSessions, BridgeSessionOperationFailed;
/**
* Nicely shutdown the bridge. Participating sessions are disconnected.
@@ -1153,8 +1124,7 @@ module V1
* repeat.
*
*/
- idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* Adds a listener object to the bridge. The listener will receive notification of future changes to the bridge
@@ -1164,14 +1134,10 @@ module V1
*
* @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(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void addListener(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener);
/**
* Removes a listener object from the bridge. The listener will cease receiving notifications of changes to the
@@ -1181,14 +1147,10 @@ module V1
*
* @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(AsteriskSCF::System::V1::OperationContext operationContext, BridgeListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ 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.
@@ -1206,17 +1168,13 @@ module V1
*
* @throws SessionNotFound if the session to be replaced is not on the bridge.
*
- * @throws OperationCallCancelledException if the operation needed to be cancelled.
- *
- * @see AsteriskSCF::System::V1::OperationCallCancelledException
* @see AsteriskSCF::System::V1::OperationContext
*/
["amd"]
idempotent void replaceSession(AsteriskSCF::System::V1::OperationContext operationContext,
Session* sessionToReplace,
SessionWithSessionInfoSeq newSessionInfos)
- throws InvalidSessions, SessionNotFound, BridgeSessionOperationFailed,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws InvalidSessions, SessionNotFound, BridgeSessionOperationFailed;
/**
* Set (or replace) cookies on the Bridge.
@@ -1227,16 +1185,12 @@ module V1
* 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(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void setCookies(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies);
/**
* Remove cookies from the Bridge.
@@ -1249,14 +1203,10 @@ module V1
* 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(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void removeCookies(AsteriskSCF::System::V1::OperationContext operationContext, BridgeCookies cookies);
/**
* Get cookies stored on the Bridge.
@@ -1300,8 +1250,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Bridge* sessionBridge,
SessionSeq sessions,
- BridgeCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeCookies cookies);
/**
* Called when sessions have been removed from a bridge.
@@ -1319,8 +1268,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Bridge* sessionBridge,
SessionSeq sessions,
- BridgeCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeCookies cookies);
/**
* Called when a bridge has completed shutdown/destruction.
@@ -1331,8 +1279,7 @@ module V1
*/
idempotent void stopped(
AsteriskSCF::System::V1::OperationContext operationContext,
- Bridge* sessionBridge, BridgeCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Bridge* sessionBridge, BridgeCookies cookies);
/**
* Called when a bridge has started shutdown/destruction operations.
@@ -1344,8 +1291,7 @@ module V1
idempotent void stopping(
AsteriskSCF::System::V1::OperationContext operationContext,
Bridge* sessionBridge,
- BridgeCookies cookies) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeCookies cookies);
};
sequence<BridgeListener*> BridgeListenerSeq;
@@ -1372,8 +1318,7 @@ module V1
*/
idempotent void addListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeManagerListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeManagerListener* listener);
/**
* Method called to create a bridge.
@@ -1386,9 +1331,6 @@ module V1
*
* @return Bridge* Returns a proxy to the newly created bridge.
*
- * @throws OperationCallCancelledException if the operation needed to be cancelled.
- *
- * @see AsteriskSCF::System::V1::OperationCallCancelledException
* @see AsteriskSCF::System::V1::OperationContext
*
*/
@@ -1399,8 +1341,7 @@ module V1
SessionSeq destinations,
BridgeListener* listener,
AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID,
- AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirects)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections redirects);
/**
* Method called to remove a listener from the bridge manager.
@@ -1409,8 +1350,7 @@ module V1
*/
idempotent void removeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeManagerListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeManagerListener* listener);
/**
* Method called to add a listener to the list of bridge listeners that
@@ -1424,8 +1364,7 @@ module V1
idempotent void addDefaultBridgeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
BridgeListener* listener) throws
- AsteriskSCF::System::V1::NullProxyException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::System::V1::NullProxyException;
/**
* Method called to remove a listener to the list of bridge listeners that
@@ -1439,8 +1378,7 @@ module V1
idempotent void removeDefaultBridgeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
BridgeListener* listener) throws
- AsteriskSCF::System::V1::NullProxyException,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::System::V1::NullProxyException;
/**
* Method called to get a list of bridges currently active in the bridge manager.
@@ -1458,8 +1396,7 @@ module V1
* repeat.
*
*/
- idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext);
};
/**
@@ -1477,8 +1414,7 @@ module V1
idempotent void bridgeCreated(
AsteriskSCF::System::V1::OperationContext operationContext,
BridgeManager* manager,
- Bridge* newBridge) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Bridge* newBridge);
/**
* Notice that a bridge manager has stopped.
@@ -1487,8 +1423,7 @@ module V1
*/
idempotent void stopped(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeManager* manager) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeManager* manager);
/**
* Notice that a bridge manager is stopping.
@@ -1497,8 +1432,7 @@ module V1
*/
idempotent void stopping(
AsteriskSCF::System::V1::OperationContext operationContext,
- BridgeManager* manager) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ BridgeManager* manager);
};
module Event
diff --git a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
index 2df4b44..2ffeb99 100644
--- a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
@@ -108,16 +108,14 @@ module V1
*/
["amd"] idempotent void addSinks(
AsteriskSCF::System::V1::OperationContext operationContext,
- TelephonyEventSinkSeq sinks) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ TelephonyEventSinkSeq sinks);
/**
* Remove sinks.
*/
["amd"] idempotent void removeSinks(
AsteriskSCF::System::V1::OperationContext operationContext,
- TelephonyEventSinkSeq sinks) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ TelephonyEventSinkSeq sinks);
/**
* Get a list of the sinks to which this source sends events
@@ -145,7 +143,7 @@ module V1
["amd"] idempotent void write(
AsteriskSCF::System::V1::OperationContext operationContext,
TelephonyEvent event)
- throws TelephonyEventException, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws TelephonyEventException;
/**
* Set the source for this sink
@@ -155,7 +153,7 @@ module V1
["amd"] idempotent void setSource(
AsteriskSCF::System::V1::OperationContext operationContext,
TelephonyEventSource* source)
- throws TelephonyEventException, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws TelephonyEventException;
/**
* Get the source for this sink
diff --git a/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
index 132e732..68c4a8d 100644
--- a/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
+++ b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
@@ -61,7 +61,7 @@ module V1
* @throws ShuttingDown if the service is in the process of shutting down.
*/
idempotent void suspend(AsteriskSCF::System::V1::OperationContext operationContext)
- throws ShuttingDown, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws ShuttingDown;
/**
* Resumes a service that has been suspended. After this call returns the suspended service
@@ -71,7 +71,7 @@ module V1
* @throws ShuttingDown if the service is in the process of shutting down.
*/
idempotent void resume(AsteriskSCF::System::V1::OperationContext operationContext)
- throws ShuttingDown, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws ShuttingDown;
/**
* Commences a clean shutdown of the services. The details of shutdown are implementation specific.
@@ -82,7 +82,7 @@ module V1
* @throws Suspended if the service is suspended.
*/
idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operation)
- throws Suspended, AsteriskSCF::System::V1::OperationCallCancelledException;
+ throws Suspended;
};
/**
@@ -104,8 +104,7 @@ module V1
*
* @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void setTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void setTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode);
/**
* Set a test mode with params. The meaning of the mode and paramters is specific
@@ -113,8 +112,10 @@ module V1
*
* @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void setTestModeWithArgs(AsteriskSCF::System::V1::OperationContext operationContext, string mode, ComponentTestParamSeq params)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void setTestModeWithArgs(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string mode,
+ ComponentTestParamSeq params);
/**
* Clears a test mode with the give mode id.
@@ -122,16 +123,14 @@ module V1
* @param operationContext Provides unique context for each call to this operation.
* @param mode Test mode identifier. Meaning is component-specific.
*/
- idempotent void clearTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void clearTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode);
/**
* Clears all test modes previously set.
*
* @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void clearTestModes(AsteriskSCF::System::V1::OperationContext operationContext)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void clearTestModes(AsteriskSCF::System::V1::OperationContext operationContext);
};
}; /* End of V1 */
diff --git a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
index 9be2dfb..d774633 100644
--- a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
+++ b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
@@ -162,7 +162,7 @@ module V1
idempotent void setConfiguration(
AsteriskSCF::System::V1::OperationContext operationContext,
ConfigurationGroupSeq groups) throws
- SerialConflict, AsteriskSCF::System::V1::OperationCallCancelledException;
+ SerialConflict;
/**
* Remove specific configuration items from a configuration group.
@@ -173,8 +173,7 @@ module V1
*/
idempotent void removeConfigurationItems(
AsteriskSCF::System::V1::OperationContext operationContext,
- ConfigurationGroupSeq groups) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ConfigurationGroupSeq groups);
/**
* Remove a configuration group and all configuration items.
@@ -185,8 +184,7 @@ module V1
*/
idempotent void removeConfigurationGroups(
AsteriskSCF::System::V1::OperationContext operationContext,
- ConfigurationGroupSeq groups) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ConfigurationGroupSeq groups);
};
/**
@@ -208,8 +206,7 @@ module V1
*/
idempotent void registerConfigurationService(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::System::Configuration::V1::ConfigurationService *service)
- throws AsteriskSCF::System::V1::OperationCallCancelledException;
+ AsteriskSCF::System::Configuration::V1::ConfigurationService *service);
};
}; /* End of namespace V1 */
diff --git a/slice/AsteriskSCF/System/Component/ReplicaIf.ice b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
index 74a028c..420196d 100644
--- a/slice/AsteriskSCF/System/Component/ReplicaIf.ice
+++ b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
@@ -60,8 +60,7 @@ module V1
* @param operationContext Provides unique context for each call to this operation.
* @return true if activated, false if failed to activate.
*/
- idempotent bool activate(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent bool activate(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* standby tells the replica object to transition from active to standby mode.
@@ -70,8 +69,7 @@ module V1
*
* @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void standby(AsteriskSCF::System::V1::OperationContext operationContext) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ idempotent void standby(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* addListener adds a ReplicaListener object that will receive notifications
@@ -82,8 +80,7 @@ module V1
*/
idempotent void addListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- ReplicaListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ReplicaListener* listener);
/**
* removeListener removes a ReplicaListener object from the list of listeners
@@ -94,8 +91,7 @@ module V1
*/
idempotent void removeListener(
AsteriskSCF::System::V1::OperationContext operationContext,
- ReplicaListener* listener) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ ReplicaListener* listener);
};
/**
@@ -114,8 +110,7 @@ module V1
*/
idempotent void activated(
AsteriskSCF::System::V1::OperationContext operationContext,
- Replica* source) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Replica* source);
/**
* Called when a replica has moved from active to standby state.
@@ -125,8 +120,7 @@ module V1
*/
idempotent void onStandby(
AsteriskSCF::System::V1::OperationContext operationContext,
- Replica* source) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Replica* source);
/**
* A replica may periodically notify listeners of its state.
diff --git a/slice/AsteriskSCF/System/Logger/LoggerIf.ice b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
index 39c45b5..6e600e2 100644
--- a/slice/AsteriskSCF/System/Logger/LoggerIf.ice
+++ b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
@@ -155,8 +155,7 @@ module Logging
*/
idempotent void configured(
AsteriskSCF::System::V1::OperationContext operationContext,
- Configuration logConfiguration) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ Configuration logConfiguration);
};
}; /* Logging */
diff --git a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
index e5c7242..5ac752e 100644
--- a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
+++ b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
@@ -380,8 +380,7 @@ interface InteractiveConnectionAgent
NegotiationNotSupported,
NegotiationInterrupted,
NegotiationError,
- NoValidCandidates,
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ NoValidCandidates;
/**
*
* Return a list of Candidates for the current agent.
diff --git a/slice/AsteriskSCF/System/OperationsIf.ice b/slice/AsteriskSCF/System/OperationsIf.ice
index 88edfb7..d7a6851 100644
--- a/slice/AsteriskSCF/System/OperationsIf.ice
+++ b/slice/AsteriskSCF/System/OperationsIf.ice
@@ -33,45 +33,16 @@ module V1
*/
/**
+ * An abstraction of a logical operational context. Provides a unique idenity to every invocation of an
+ * operation. This provides a mechanism for operations that would tyically be non-idempotent
+ * to detect retries of the same call so that they can behave in an idempotent fashion.
+ * May also be used to identify a group of operations as being related to each other.
*
- * 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, /* 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 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 OperationCallCancelledException
-{
- string operationId;
- CancellationReason reason;
-};
-
-/**
- *
- * 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 retried as if it were idempotent. A servant receiving
- * an OperationContext as an argument to an operation should be prepared to detect when the call is actually a retry
- * of a previously received call. This implies:
- * - Returning the same return value (or out parameters) for each instance of the call.
+ * A servant receiving an OperationContext as an argument to an operation should be prepared
+ * to detect when the call is actually a retry of a previously received call. This implies:
+ * - Returning the same return value (and/or out parameters) for each instance of the call.
* - The component must otherwise behave as if the operation had only been called once.
- *
- * Interface methods that accept an OperationContext instance may throw a OperationCallCancelledException.
- *
- **/
+ */
unsliceable class OperationContext
{
/**
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list