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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  10f938698e0c42155dfd3630ef84a98ba578448c (commit)
       via  3521b81a14ab0fd1527eb7d91e5f578b976f1082 (commit)
      from  0d9804fcbb678c3c67b30c349ff9359ca256ea10 (commit)

Summary of changes:
 cmake                |    2 +-
 src/CMakeLists.txt   |   21 +++++++++++++++++++++
 src/TestEndpoint.cpp |    7 +++++--
 3 files changed, 27 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 10f938698e0c42155dfd3630ef84a98ba578448c
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Sep 14 14:12:42 2010 -0230

    Fix a duplicate object name bug.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 238da6a..4df6457 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -119,6 +119,8 @@ public:
         mId(id),
         mListeners(new SessionListenerMgr(adapter->getCommunicator(), mId))
     {
+        mInfo = new AsteriskSCF::SessionCommunications::V1::SessionInfo;
+        mInfo->currentState = "ready";
     }
 
     AsteriskSCF::SessionCommunications::V1::SessionInfoPtr addListener(
@@ -126,7 +128,7 @@ public:
                 const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);
-        return 0;
+        return mInfo;
     }
 
     void connect(const Ice::Current&)
@@ -238,6 +240,7 @@ private:
     boost::shared_mutex mMutex;
     InternalManagerPtr mEndpointManager;
     AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx mEndpointPrx;
+    AsteriskSCF::SessionCommunications::V1::SessionInfoPtr mInfo;
     const std::string mId;
     MediaSessionIPtr mMediaServant;
     AsteriskSCF::Media::V1::SessionPrx mMediaSession;
@@ -432,7 +435,7 @@ public:
         mManager(new EndpointManager(adapter, id))
     {
         mEndpointProxy =
-            AsteriskSCF::Core::Endpoint::V1::BaseEndpointPrx::checkedCast(adapter->add(mManager, adapter->getCommunicator()->stringToIdentity(mManagerId)));
+            AsteriskSCF::Core::Endpoint::V1::BaseEndpointPrx::checkedCast(adapter->add(mManager, adapter->getCommunicator()->stringToIdentity(mManagerId + ".Endpoint")));
     }
 
     AsteriskSCF::Core::Endpoint::V1::EndpointSeq lookup(const std::string& destination, const Ice::Current&)

commit 3521b81a14ab0fd1527eb7d91e5f578b976f1082
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Sep 14 12:32:38 2010 -0230

    Trying out a shared library build cmake target.

diff --git a/cmake b/cmake
index 1e7a172..22dfc54 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 1e7a1725fe9e2d176a2c26820d6bcd96c6c3939e
+Subproject commit 22dfc54c50affccc06f25b6391b0bbd71f7da568
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c39005e..99a7e26 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,4 +16,25 @@ hydra_component_add_ice_libraries(test_channel IceStorm)
 hydra_component_add_boost_libraries(test_channel thread)
 hydra_component_add_boost_libraries(test_channel date_time)
 hydra_component_build_standalone(test_channel)
+
+hydra_component_init(test_channel_lib CXX)
+include_directories("../include")
+hydra_component_add_slice(test_channel_lib EndpointIf)
+hydra_component_add_slice(test_channel_lib ComponentServiceIf)
+hydra_component_add_slice(test_channel_lib SessionCommunicationsIf)
+hydra_component_add_slice(test_channel_lib RoutingIf)
+hydra_component_add_file(test_channel_lib Service.cpp)
+hydra_component_add_file(test_channel_lib MediaEchoThread.cpp)
+hydra_component_add_file(test_channel_lib MediaSession.cpp)
+hydra_component_add_file(test_channel_lib ConsoleDriver.cpp)
+hydra_component_add_file(test_channel_lib TestEndpoint.cpp)
+hydra_component_add_file(test_channel_lib ../include/TestEndpoint.h)
+hydra_component_add_file(test_channel_lib ../include/Commands.h)
+hydra_component_add_file(test_channel_lib ../include/ConsoleDriver.h)
+hydra_component_add_ice_libraries(test_channel_lib IceStorm)
+hydra_component_add_boost_libraries(test_channel_lib thread)
+hydra_component_add_boost_libraries(test_channel_lib date_time)
+
+hydra_component_build_library(test_channel_lib)
+
 hydra_component_install(test_channel RUNTIME bin "Test Channel Emulator." Core)

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


-- 
asterisk-scf/integration/test_channel.git