[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "file-session-gateway" created.

[Commits to the Asterisk SCF project code repositories]

branch "file-session-gateway" has been created
        at  770ff627e103bd4839c475425d20035d4155cdc3 (commit)

- Log -----------------------------------------------------------------
commit 770ff627e103bd4839c475425d20035d4155cdc3
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Sep 1 11:21:01 2011 -0230

    Adding an invalid invocation order to the list of ascf exceptions.

diff --git a/slice/AsteriskSCF/System/ExceptionsIf.ice b/slice/AsteriskSCF/System/ExceptionsIf.ice
index 7a410ec..8642264 100644
--- a/slice/AsteriskSCF/System/ExceptionsIf.ice
+++ b/slice/AsteriskSCF/System/ExceptionsIf.ice
@@ -51,6 +51,16 @@ module V1
         string identifier;
     };
 
+    /**
+     * An object has detected that operations have been invoked on it in an order
+     * that belies a potential bug in the client. Details *may* be provided in the
+     * message data member.
+     */
+    exception InvalidInvocationOrder
+    {
+        string message;
+    };
+
 }; /*  End of V1 */
 
 }; /*  End of System */

commit 423c5aa4002e8660daf71f2615a639864d98b4a4
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Aug 12 12:25:58 2011 -0230

    Bridge creation extension point support.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
old mode 100644
new mode 100755
index 0ddc97b..107d129
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
@@ -80,6 +80,66 @@ module V1
         void clearSessionCreationHooks();
     };
 
+    const string BridgeCreationExtensionPointCategory = "BridgeCreationHook";
+    const string BridgeCreationExtensionPointFacet = "BridgeCreationHook";
+
+    /** 
+     * Data provided to bridge creation hooks.
+     */
+    class BridgeCreationHookData
+    {
+        /**
+         * The proxy for the bridge being created. This can be overridden by a hook to set up an
+         * interposed bridge proxy.
+         */
+        AsteriskSCF::SessionCommunications::V1::Bridge* bridge; 
+
+        /**
+         * The established listeners for a bridge. This can be used to modify the default listeners
+         * added to a bridge when it is created. 
+         */
+        AsteriskSCF::SessionCommunications::V1::BridgeListenerSeq listeners;
+
+        /**
+         * Modify the cookies set on the bridge when it is created.
+         **/
+        AsteriskSCF::SessionCommunications::V1::BridgeCookies cookies;
+
+        /**
+         * Modify the sessions initially added to a bridge.
+         */
+        AsteriskSCF::SessionCommunications::V1::SessionSeq initialSessions;
+    };
+
+    interface BridgeCreationHook
+    {
+        /**
+         * Interpose some operations when creating bridge objects.
+         */
+         AsteriskSCF::System::Hook::V1::HookResult execute(BridgeCreationHookData originalData,
+             out BridgeCreationHookData alteredData);
+    };
+
+    sequence<BridgeCreationHook*> BridgeCreationHookSeq;
+
+    interface BridgeCreationExtensionPoint
+    {
+        /**
+         * Add a new bridge creation hook. Matches on ID and refreshes the proxy if an object with
+         * that ID has already been added.
+         */
+        void addHook(BridgeCreationHook* hook);
+
+        /**
+         * Remove the bridge creation hook that matches the proxy provided.
+         */
+        void removeHook(BridgeCreationHook* hook);
+
+        /**
+         * Clear all registered hooks.
+         */
+        void clearHooks();
+    };
 }; /* End of module V1 */
 }; /* End of module ExtensionPoints */
 }; /* End of module SessionCommunications */
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index f3e92d8..eefc80e 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -858,8 +858,6 @@ module V1
      * stored on a Bridge and retrieved via the BridgeListener
      * interface when events occur on that Bridge.
      *
-     * @see BridgeListener
-     *
      * @see BridgeCookies
      */
     unsliceable class BridgeCookie
@@ -870,7 +868,7 @@ module V1
      * A sequence of bridge cookies, allowing for a variable number of them
      * to be passed in a single operation or event.
      *
-     * @see BridgeListener
+     * @see BridgeCookie
      */
     sequence <BridgeCookie> BridgeCookies;
 
@@ -1063,6 +1061,8 @@ module V1
        void stopping(Bridge* sessionBridge, BridgeCookies cookies);
     };
 
+    sequence<BridgeListener*> BridgeListenerSeq;
+
     /**
      * Forward declaration of the BridgeManagerListener interface.
      */

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


-- 
asterisk-scf/integration/slice.git