[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "transfer" updated.

[Commits to the Asterisk SCF project code repositories]

branch "transfer" has been updated
       via  517b96aa623d769f08db846acf6ff3d33f3e5127 (commit)
       via  bb1a8dcaa39686724ae25a43b15fe1f24d14ca6a (commit)
      from  c183f79c5692593ca6c29bd733f0e91a58ed6eac (commit)

Summary of changes:
 config/test_sip.conf         |    2 ++
 src/CMakeLists.txt           |    1 -
 src/PJSipSessionModule.cpp   |    2 --
 src/SipChannelServiceApp.cpp |    5 ++---
 4 files changed, 4 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 517b96aa623d769f08db846acf6ff3d33f3e5127
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Oct 12 09:01:50 2010 -0300

    Update configuration file for icebox.

diff --git a/config/test_sip.conf b/config/test_sip.conf
index dde0255..84fc432 100644
--- a/config/test_sip.conf
+++ b/config/test_sip.conf
@@ -41,3 +41,5 @@ Sip.Endpoint.cisco.Session.CallDirection=Both
 Sip.Endpoint.18005558355.Session.CallDirection=Both
 Sip.Endpoint.18005558355.Session.SourceAddress=172.16.1.13
 Sip.Endpoint.18005558355.Transport.Address=172.16.1.10
+
+IceBox.Service.SipChannelService=SipChannelService:create --Ice.Config=config/test_sip.conf

commit bb1a8dcaa39686724ae25a43b15fe1f24d14ca6a
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Oct 12 09:00:19 2010 -0300

    Remove old references to where the Bridging interface used to exist.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 891d062..ecef775 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ hydra_component_add_slice(SipChannelService RoutingIf)
 hydra_component_add_slice(SipChannelService ServiceLocatorIf)
 hydra_component_add_slice(SipChannelService EndpointIf)
 hydra_component_add_slice(SipChannelService ComponentServiceIf)
-hydra_component_add_slice(SipChannelService BridgingIf)
 hydra_component_add_slice(SipChannelService MediaIf)
 hydra_component_add_slice(SipChannelService MediaRTPIf)
 hydra_component_add_slice(SipChannelService SessionCommunicationsIf)
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 762a290..3bcf3dd 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -9,7 +9,6 @@
 
 #include <Core/Endpoint/EndpointIf.h>
 #include <Core/Routing/RoutingIf.h>
-#include <SessionCommunications/Bridging/BridgingIf.h>
 #include <SessionCommunications/SessionCommunicationsIf.h>
 #include <Media/MediaIf.h>
 
@@ -35,7 +34,6 @@ namespace SipChannelService
 {
 
 using namespace AsteriskSCF::Core::Routing::V1;
-using namespace AsteriskSCF::SessionCommunications::Bridging::V1;
 using namespace AsteriskSCF::Core::Endpoint::V1;
 using namespace AsteriskSCF::SessionCommunications::V1;
 using namespace AsteriskSCF::Media::V1;
diff --git a/src/SipChannelServiceApp.cpp b/src/SipChannelServiceApp.cpp
index 561af7f..114a1b1 100644
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@ -18,7 +18,6 @@
 #include "RoutingIf.h"
 #include "ServiceLocatorIf.h"
 #include "ComponentServiceIf.h"
-#include "BridgingIf.h"
 #include "SessionCommunicationsIf.h"
 #include "ReplicaIf.h"
 #include "IceLogger.h"
@@ -109,7 +108,7 @@ private:
    SipStateReplicatorPrx mStateReplicator;
    AsteriskSCF::SessionCommunications::V1::SessionRouterPrx mSessionRouter;
    Routing::V1::LocatorRegistryPrx mRoutingServiceLocatorRegistry;
-   Bridging::V1::BridgeManagerPrx mBridgeManager;
+   AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mBridgeManager;
    boost::shared_ptr<SipChannelServiceEventPublisher> mEventPublisher;
    Routing::V1::EndpointLocatorPtr mEndpointLocator;
 };
@@ -411,7 +410,7 @@ void SipChannelService::locateBridgeService()
    // genericparams->category = Bridging::V1::BridgeServiceDiscoveryCategory;
 
    Ice::ObjectPrx objectPrx = mServiceLocator->locate(genericparams);
-   mBridgeManager = Bridging::V1::BridgeManagerPrx::checkedCast(objectPrx);
+   mBridgeManager = AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::checkedCast(objectPrx);
 }
 
 /**

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


-- 
asterisk-scf/integration/sip.git