[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  72ed2a9023730c39c02999ae681bf591f3b3f574 (commit)
       via  47285632c983664f7cc3a5ef11dfaf0ae07887e0 (commit)
       via  0a0f8a476847b42dd3fa66576cfeed3591bc2169 (commit)
      from  b51c5c4e696cceb3a49318ee9ff76c08dc8328c4 (commit)

Summary of changes:
 .../SessionCommunicationsIf.ice                    |   27 ++++++++++++++++---
 1 files changed, 22 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 72ed2a9023730c39c02999ae681bf591f3b3f574
Merge: b51c5c4 4728563
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Sep 13 11:48:11 2011 -0500

    Merge branch 'replacement'


commit 47285632c983664f7cc3a5ef11dfaf0ae07887e0
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Aug 29 14:15:03 2011 -0500

    Add boolean parameter to router's transfer operations.
    
    This makes it so that the session may either be replaced or not
    depending on which is desired.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 1cea172..78ca6f4 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -684,21 +684,23 @@ module V1
            SourceTerminatedPreBridgingException, BridgingException ;
 
         /**
-         * Replace one session in a Bridge with a new
+         * Connect sessions bridged with one session with a new
          * session routable by the destination param.
-         *
-         * Note that the session to replace will not be removed
-         * from its bridge nor will it be stopped.
+         * The session specified may optionally be replaced.
          *
          * @param operationId Unique id for this operation.
          *
-         * @param sessionToReplace The session that is to be replaced in a
-         *   bridge. The bridge obejct is obtained from the accessor on this
+         * @param sessionToReplace The session whose bridged sessions are connected
+         *   with a newly created session. The bridge object is obtained from the accessor on this
          *   proxy.
          *
          * @param destination The identifier for the destination to be added to
          *   the bridge in place of sessionToReplace.
          *
+         * @param replaceSession If true, then sessionToReplace will be removed from the bridge
+         *   and shut down. If not, then new sessions will be added to sessionToReplace's bridge
+         *   without removing or shutting down sessionToReplace.
+         *
          * @throws DestinationNotFoundException if the given destination could not be found.
          *
          * @throws SessionCreationException if the destination endpoint could not create a session.
@@ -710,7 +712,11 @@ module V1
          * @throws NotBridged if the provided session is not currently in a bridge.
          */
         ["amd"]
-        void connectBridgedSessionsWithDestination(string operationId, Session* sessionToReplace, string destination,
+        void connectBridgedSessionsWithDestination(
+                string operationId,
+                Session* sessionToReplace,
+                string destination,
+                bool replaceSession,
                 AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook)
            throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
            SessionCreationException,
@@ -733,6 +739,10 @@ module V1
          *   their current bridge before being added to the bridge currenltly attached to
          *   sessionToReplace.
          *
+         * @param replaceSession If true, then sessionToReplace will be removed from its bridge
+         *   and shut down. If false, then sessions bridged to bridgedSession will be added to
+         *   sessionToReplace's bridge.
+         *
          * @throws SourceTerminatedPreBridgingException if the source session was terminated early.
          *
          * @throws BridgingException if the bridge could not be setup properly.
@@ -740,7 +750,11 @@ module V1
          * @throws NotBridged if the session provided in sessionToReplace is not currently in a bridge.
          */
         ["amd"]
-        void connectBridgedSessions(string operationId, Session* sessionToReplace, Session* bridgedSession)
+        void connectBridgedSessions(
+                string operationId,
+                Session* sessionToReplace,
+                Session* bridgedSession,
+                bool replaceSession)
            throws SourceTerminatedPreBridgingException, BridgingException, NotBridged ;
     };
 
@@ -964,8 +978,6 @@ module V1
         * Replaces a session that is on the bridge with another session. Useful for transfers, etc.
         * where a participant is replaced as part of the code flow.
         *
-        * Note that the session to replace is neither removed from the bridge nor stopped.
-        *
         * @param sessionToReplace The session being replaced. The bridge associated with this
         *   session is used for the newSessions.
         *

commit 0a0f8a476847b42dd3fa66576cfeed3591bc2169
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Aug 29 12:39:13 2011 -0500

    Add documentation that explains that sessions replaced will not be unbridged or stopped.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index f3e92d8..1cea172 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -687,6 +687,9 @@ module V1
          * Replace one session in a Bridge with a new
          * session routable by the destination param.
          *
+         * Note that the session to replace will not be removed
+         * from its bridge nor will it be stopped.
+         *
          * @param operationId Unique id for this operation.
          *
          * @param sessionToReplace The session that is to be replaced in a
@@ -961,6 +964,8 @@ module V1
         * Replaces a session that is on the bridge with another session. Useful for transfers, etc.
         * where a participant is replaced as part of the code flow.
         *
+        * Note that the session to replace is neither removed from the bridge nor stopped.
+        *
         * @param sessionToReplace The session being replaced. The bridge associated with this
         *   session is used for the newSessions.
         *

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


-- 
asterisk-scf/release/slice.git