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

[Commits to the Asterisk SCF project code repositories]

branch "default_bridge_listeners" has been updated
       via  5ee9d4e4fcc27fa152437a80cabfe90bcefe2acd (commit)
       via  b2c1ccb92363ec8e99d295843b6529efd73e0a03 (commit)
       via  348a2881086670efe0ab63b260c351a22bb878fb (commit)
      from  7f7f93e2d5d591d779423a5d16b0b37b9f8b43c3 (commit)

Summary of changes:
 SessionCommunications/SessionCommunicationsIf.ice |   22 ++++--------
 System/CMakeLists.txt                             |    2 +
 System/{Time/TimeIf.ice => ExceptionsIf.ice}      |   38 +++++----------------
 3 files changed, 19 insertions(+), 43 deletions(-)
 copy System/{Time/TimeIf.ice => ExceptionsIf.ice} (55%)


- Log -----------------------------------------------------------------
commit 5ee9d4e4fcc27fa152437a80cabfe90bcefe2acd
Merge: 348a288 b2c1ccb
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Jan 3 16:14:20 2011 -0330

    Merge master changes made to move NullProxyException into System module.


commit 348a2881086670efe0ab63b260c351a22bb878fb
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Jan 3 16:10:05 2011 -0330

    Move NullProxyException to System/ExceptionsIf.ice

diff --git a/SessionCommunications/SessionCommunicationsIf.ice b/SessionCommunications/SessionCommunicationsIf.ice
index 5ac9900..991803a 100644
--- a/SessionCommunications/SessionCommunicationsIf.ice
+++ b/SessionCommunications/SessionCommunicationsIf.ice
@@ -21,6 +21,7 @@
 #include <System/Component/ComponentServiceIf.ice>
 #include <System/Time/TimeIf.ice>
 #include <Media/MediaIf.ice>
+#include <System/ExceptionsIf.ice>
 
 module AsteriskSCF
 {
@@ -512,13 +513,6 @@ module V1
      */
     interface BridgeListener;
 
-    /** 
-     * Exception thrown when a "null" proxy is passed in where it is invalid to do so.
-     **/
-    exception NullProxyException
-    {
-    };
-
     /**
      * Bridge object manages the association of multiple sessions in the process
      * of communicating with each other.
@@ -581,7 +575,7 @@ module V1
 	* @see BridgeListener
 	*/
        void addListener(BridgeListener* listener)
-           throws NullProxyException;
+           throws AsteriskSCF::System::V1::NullProxyException;
 
        /**
 	* Removes a listener object from the bridge. The listen will cease receiving
@@ -594,7 +588,7 @@ module V1
 	* @see BridgeListener
 	*/
        void removeListener(BridgeListener* listener)
-           throws NullProxyException;
+           throws AsteriskSCF::System::V1::NullProxyException;
 
        /**
 	* Replaces a session that is on the bridge with another session. Useful for transfers, etc.
@@ -679,7 +673,7 @@ module V1
         *
 	*/
 	void addListener(BridgeManagerListener* listener)
-            throws NullProxyException;
+            throws AsteriskSCF::System::V1::NullProxyException;
 
 	/**
 	 * Method called to create a bridge.
@@ -694,7 +688,7 @@ module V1
          *
 	 */
 	Bridge* createBridge(SessionSeq sessions, BridgeListener* listener)
-            throws NullProxyException;
+            throws AsteriskSCF::System::V1::NullProxyException;
 
 	/**
 	 * Method called to remove a listener from the bridge manager.
@@ -705,7 +699,7 @@ module V1
          *
 	 */
 	void removeListener(BridgeManagerListener* listener)
-            throws NullProxyException;
+            throws AsteriskSCF::System::V1::NullProxyException;
 
        /**
         * Method called to add a listener to the list of bridge listeners that
@@ -717,7 +711,7 @@ module V1
         *
 	*/
         void addDefaultBridgeListener(BridgeListener* listener)
-            throws NullProxyException;
+            throws AsteriskSCF::System::V1::NullProxyException;
 
        /**
         * Method called to remove a listener to the list of bridge listeners that
@@ -729,7 +723,7 @@ module V1
         *
 	*/
         void removeDefaultBridgeListener(BridgeListener* listener)
-            throws NullProxyException;
+            throws AsteriskSCF::System::V1::NullProxyException;
 
 	/**
 	 * Method called to get a list of bridges currently active in the bridge manager.
diff --git a/System/CMakeLists.txt b/System/CMakeLists.txt
index 705b63a..bfc7dc0 100644
--- a/System/CMakeLists.txt
+++ b/System/CMakeLists.txt
@@ -6,3 +6,5 @@ add_subdirectory(Time)
 
 # Slice definitions for the Logger service
 add_subdirectory(Logger)
+
+asterisk_scf_compile_slice(ExceptionsIf.ice lib "Common System Exceptions" System)

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


-- 
asterisk-scf/release/slice.git