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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  26d9a3f52384f6c5a7dfe1164bd7d276af54ba9e (commit)
      from  ed418af28b5f5fc9fc396b717ead9400d75d8f0a (commit)

Summary of changes:
 src/CMakeLists.txt   |    4 ++++
 src/TestEndpoint.cpp |   27 ++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 26d9a3f52384f6c5a7dfe1164bd7d276af54ba9e
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Aug 10 19:17:45 2011 -0500

    Updates for changes to the SessionEndpoint API.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ffa22a..e7ceaf0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+include_directories(${astscf-ice-util-cpp_dir}/include)
+include_directories(${logger_dir}/include)
+
 astscf_slice_include_collection(TEST_CHANNEL)
 
 astscf_component_init(test_channel)
@@ -10,6 +13,7 @@ astscf_component_add_ice_libraries(test_channel IceStorm)
 astscf_component_add_boost_libraries(test_channel thread date_time)
 astscf_component_add_slice_collection_libraries(test_channel ASTSCF TEST_CHANNEL)
 astscf_component_build_icebox(test_channel)
+target_link_libraries(test_channel logging-client)
 astscf_component_install(test_channel)
 
 astscf_component_init(console_driver)
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index ab8d4e6..853d729 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -26,12 +26,15 @@
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include <AsteriskSCF/Collections/Set.h>
+
 #include "Logger.h"
 #include "MediaSession.h"
 #include <AsteriskSCF/TestChannel/CommandsIf.h>
 
 
 using namespace AsteriskSCF::TestUtil;
+using namespace AsteriskSCF::SessionCommunications::V1;
 
 namespace
 {
@@ -386,7 +389,8 @@ public:
 
     EndpointManager(const Ice::ObjectAdapterPtr& adapter, const std::string& id) :
         mAdapter(adapter),
-        mId(id)
+        mId(id),
+        mDefaultListeners(adapter, "Default Session Listeners")
     {
     }
 
@@ -530,6 +534,26 @@ public:
         std::cerr << "Unknown id" << std::endl;
     }
 
+    void addDefaultSessionListener(const SessionListenerPrx& listener, const Ice::Current& current)
+    {
+        mDefaultListeners.add(listener);
+    }
+
+    void removeDefaultSessionListener(const SessionListenerPrx& listener, const Ice::Current&)
+    {
+        mDefaultListeners.remove(listener);
+    }
+
+    void addDefaultSessionCookies(const SessionCookies& cookies,
+                                 const Ice::Current&)
+    {
+    }
+
+    void removeDefaultSessionCookies(const SessionCookies& cookies,
+                                     const Ice::Current&)
+    {
+    }
+
 private:
 
     struct InternalSessionInfo
@@ -546,6 +570,7 @@ private:
     AsteriskSCF::TestUtil::Logger mLogger;
     Ice::ObjectAdapterPtr mAdapter;
     std::string mId;
+    AsteriskSCF::Collections::ProxySet<SessionListenerPrx> mDefaultListeners;
 };
 
 class CommandImpl : public AsteriskSCF::TestChannel::V1::Commands

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


-- 
asterisk-scf/release/test_channel.git