[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "transfer" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Oct 11 15:14:50 CDT 2010
branch "transfer" has been created
at 5698574a7baaaecd4c3c64dcb3c0ca31b4b69272 (commit)
- Log -----------------------------------------------------------------
commit 5698574a7baaaecd4c3c64dcb3c0ca31b4b69272
Author: Brent Eagles <beagles at digium.com>
Date: Mon Oct 11 17:43:30 2010 -0230
Modify code to support moving Bridging related interfaces to
AsteriskSCF::SessionCommunications module.
diff --git a/slice b/slice
index 03ea08a..dd9f77f 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
+Subproject commit dd9f77f76241bdb6b7800b84722444421cddaf85
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 7fe4430..dcf253c 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -221,9 +221,9 @@ namespace BridgeService
AsteriskSCF::BridgeService::BridgeImpl::BridgeImpl(
const Ice::ObjectAdapterPtr& adapter,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& ev,
+ const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& ev,
const AsteriskSCF::BridgeService::BridgeListenerMgrPtr& listenerMgr,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& prx
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& prx
) :
mState(Running),
mObjAdapter(adapter),
@@ -274,7 +274,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::addSessions(const AsteriskSCF::Sess
}
if(badIndexes.size() > 0)
{
- throw AsteriskSCF::SessionCommunications::Bridging::V1::InvalidSessions(badIndexes);
+ throw AsteriskSCF::SessionCommunications::V1::InvalidSessions(badIndexes);
}
AsteriskSCF::SessionCommunications::V1::SessionSeq addedSessions;
{
@@ -333,7 +333,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::removeSessions(const AsteriskSCF::S
}
if(badIndexes.size() > 0)
{
- throw AsteriskSCF::SessionCommunications::Bridging::V1::InvalidSessions(badIndexes);
+ throw AsteriskSCF::SessionCommunications::V1::InvalidSessions(badIndexes);
}
AsteriskSCF::SessionCommunications::V1::SessionSeq removedSessions;
{
@@ -422,13 +422,13 @@ void AsteriskSCF::BridgeService::BridgeImpl::shutdown(const Ice::Current& curren
mListeners->stopped();
}
-void AsteriskSCF::BridgeService::BridgeImpl::addListener(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& listener,
+void AsteriskSCF::BridgeService::BridgeImpl::addListener(const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& listener,
const Ice::Current&)
{
mListeners->addListener(listener);
}
-void AsteriskSCF::BridgeService::BridgeImpl::removeListener(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& listener,
+void AsteriskSCF::BridgeService::BridgeImpl::removeListener(const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& listener,
const Ice::Current&)
{
mListeners->removeListener(listener);
diff --git a/src/BridgeImpl.h b/src/BridgeImpl.h
index 864ab62..5c9d327 100644
--- a/src/BridgeImpl.h
+++ b/src/BridgeImpl.h
@@ -7,7 +7,6 @@
*/
#pragma once
-#include <SessionCommunications/Bridging/BridgingIf.h>
#include <SessionCommunications/SessionCommunicationsIf.h>
#include <boost/thread/shared_mutex.hpp>
#include <vector>
@@ -21,7 +20,7 @@ namespace BridgeService
//
// BridgeImpl is an implmentation of AsteriskSCF::Bridging::V1::Bridge.
//
- class BridgeImpl : public SessionCommunications::Bridging::V1::Bridge
+ class BridgeImpl : public SessionCommunications::V1::Bridge
{
public:
struct BridgeSession
@@ -37,9 +36,9 @@ namespace BridgeService
};
BridgeImpl(const Ice::ObjectAdapterPtr& objAdapter,
- const SessionCommunications::Bridging::V1::BridgeListenerPrx& ev,
+ const SessionCommunications::V1::BridgeListenerPrx& ev,
const AsteriskSCF::BridgeService::BridgeListenerMgrPtr& listenerMgr,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& prx);
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& prx);
~BridgeImpl();
@@ -53,8 +52,8 @@ namespace BridgeService
void shutdown(const Ice::Current& current);
void destroy(const Ice::Current& current);
- void addListener(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& listener, const Ice::Current& current);
- void removeListener(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& listener, const Ice::Current& current);
+ void addListener(const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& listener, const Ice::Current& current);
+ void removeListener(const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& listener, const Ice::Current& current);
void replaceSession(const AsteriskSCF::SessionCommunications::V1::SessionPrx& newSession,
const AsteriskSCF::SessionCommunications::V1::SessionPrx& oldSession, const Ice::Current& current);
@@ -91,7 +90,7 @@ namespace BridgeService
BridgeListenerMgrPtr mListeners;
SessionCommunications::V1::SessionListenerPtr mSessionListener;
SessionCommunications::V1::SessionListenerPrx mSessionListenerPrx;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx mPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgePrx mPrx;
void statePreCheck();
};
diff --git a/src/BridgeListenerMgr.cpp b/src/BridgeListenerMgr.cpp
index aca21c4..cdda496 100644
--- a/src/BridgeListenerMgr.cpp
+++ b/src/BridgeListenerMgr.cpp
@@ -9,8 +9,8 @@
AsteriskSCF::BridgeService::BridgeListenerMgr::BridgeListenerMgr(const Ice::CommunicatorPtr& comm,
const std::string& name,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& bridgeProxy) :
- ListenerManagerT<AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx>(comm, name, false),
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridgeProxy) :
+ ListenerManagerT<AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx>(comm, name, false),
mPrx(bridgeProxy)
{
}
diff --git a/src/BridgeListenerMgr.h b/src/BridgeListenerMgr.h
index ec8fecc..9b5c4c6 100644
--- a/src/BridgeListenerMgr.h
+++ b/src/BridgeListenerMgr.h
@@ -10,17 +10,17 @@
#include <string>
#include <Ice/Ice.h>
#include "ListenerManager.h"
-#include <SessionCommunications/Bridging/BridgingIf.h>
+#include <SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
namespace BridgeService
{
- class BridgeListenerMgr : virtual public ListenerManagerT<AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx>
+ class BridgeListenerMgr : virtual public ListenerManagerT<AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx>
{
public:
BridgeListenerMgr(const Ice::CommunicatorPtr& communicator, const std::string& name,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& source);
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& source);
void sessionsAdded(const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions);
void sessionsRemoved(const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions);
@@ -28,7 +28,7 @@ namespace BridgeService
void stopping();
private:
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx mPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgePrx mPrx;
};
typedef IceUtil::Handle<BridgeListenerMgr> BridgeListenerMgrPtr;
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 8d5cb13..eafdd82 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -57,7 +57,7 @@ namespace BridgeService
AsteriskSCF::BridgeService::BridgeManagerImpl::BridgeManagerImpl(
const Ice::ObjectAdapterPtr& adapter,
const std::string& name,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& prx) :
+ const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& prx) :
mName(name),
mShuttingDown(false),
mSuspended(false),
@@ -77,9 +77,9 @@ AsteriskSCF::BridgeService::BridgeManagerImpl::~BridgeManagerImpl()
mListeners = 0;
}
-AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx AsteriskSCF::BridgeService::BridgeManagerImpl::createBridge(
+AsteriskSCF::SessionCommunications::V1::BridgePrx AsteriskSCF::BridgeService::BridgeManagerImpl::createBridge(
const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListenerPrx& listener,
+ const AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx& listener,
const Ice::Current& current)
{
lg(Debug) << __FUNCTION__ << ":" << current.adapter->getCommunicator()->identityToString(current.id) ;
@@ -99,8 +99,8 @@ AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx AsteriskSCF::BridgeS
std::string stringId = std::string("bridge.") + IceUtil::generateUUID();
Ice::Identity id(mAdapter->getCommunicator()->stringToIdentity(stringId));
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx prx(
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx::uncheckedCast(mAdapter->createProxy(id)));
+ AsteriskSCF::SessionCommunications::V1::BridgePrx prx(
+ AsteriskSCF::SessionCommunications::V1::BridgePrx::uncheckedCast(mAdapter->createProxy(id)));
AsteriskSCF::BridgeService::BridgeListenerMgrPtr mgr(new BridgeListenerMgr(mAdapter->getCommunicator(), stringId, prx));
AsteriskSCF::BridgeService::BridgeImplPtr bridge = new AsteriskSCF::BridgeService::BridgeImpl(mAdapter, listener, mgr, prx);
@@ -109,7 +109,7 @@ AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx AsteriskSCF::BridgeS
lg(Info) << current.adapter->getCommunicator()->identityToString(current.id) << ": creating new bridge " << obj->ice_toString() << "." ;
BridgeInfo info;
info.servant = bridge;
- info.proxy = AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx::uncheckedCast(obj);
+ info.proxy = AsteriskSCF::SessionCommunications::V1::BridgePrx::uncheckedCast(obj);
if(mListeners)
{
mListeners->bridgeCreated(info.proxy);
@@ -124,7 +124,7 @@ AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx AsteriskSCF::BridgeS
return info.proxy;
}
-void AsteriskSCF::BridgeService::BridgeManagerImpl::addListener(const SessionCommunications::Bridging::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current)
+void AsteriskSCF::BridgeService::BridgeManagerImpl::addListener(const SessionCommunications::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current)
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
if(mShuttingDown)
@@ -139,13 +139,13 @@ void AsteriskSCF::BridgeService::BridgeManagerImpl::addListener(const SessionCom
}
if(!mListeners)
{
- mSourceProxy = AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(current.id));
+ mSourceProxy = AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(current.id));
mListeners = new AsteriskSCF::BridgeService::BridgeManagerListenerMgr(mAdapter->getCommunicator(), mName, mSourceProxy);
}
mListeners->addListener(listener);
}
-void AsteriskSCF::BridgeService::BridgeManagerImpl::removeListener(const SessionCommunications::Bridging::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current)
+void AsteriskSCF::BridgeService::BridgeManagerImpl::removeListener(const SessionCommunications::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current)
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
if(mShuttingDown)
@@ -160,17 +160,17 @@ void AsteriskSCF::BridgeService::BridgeManagerImpl::removeListener(const Session
}
if(!mListeners)
{
- mSourceProxy = AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(current.id));
+ mSourceProxy = AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(current.id));
mListeners = new AsteriskSCF::BridgeService::BridgeManagerListenerMgr(mAdapter->getCommunicator(), mName, mSourceProxy);
}
mListeners->removeListener(listener);
}
-AsteriskSCF::SessionCommunications::Bridging::V1::BridgeSeq
+AsteriskSCF::SessionCommunications::V1::BridgeSeq
AsteriskSCF::BridgeService::BridgeManagerImpl::listBridges(const Ice::Current&)
{
boost::shared_lock<boost::shared_mutex> lock(mLock);
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeSeq result;
+ AsteriskSCF::SessionCommunications::V1::BridgeSeq result;
for(std::vector<BridgeInfo>::iterator i = mBridges.begin(); i != mBridges.end();++i)
{
result.push_back(i->proxy);
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index 88f34f4..f978c7f 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -8,7 +8,6 @@
#pragma once
#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <SessionCommunications/Bridging/BridgingIf.h>
#include <boost/thread/shared_mutex.hpp>
#include <vector>
@@ -19,30 +18,30 @@ namespace AsteriskSCF
{
namespace BridgeService
{
- class BridgeManagerImpl : public SessionCommunications::Bridging::V1::BridgeManager
+ class BridgeManagerImpl : public SessionCommunications::V1::BridgeManager
{
public:
- BridgeManagerImpl(const Ice::ObjectAdapterPtr& adapter, const std::string& name, const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& prx);
+ BridgeManagerImpl(const Ice::ObjectAdapterPtr& adapter, const std::string& name, const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& prx);
~BridgeManagerImpl();
//
- // AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManager Interface
+ // AsteriskSCF::SessionCommunications::V1::BridgeManager Interface
//
- SessionCommunications::Bridging::V1::BridgePrx createBridge(
+ SessionCommunications::V1::BridgePrx createBridge(
const SessionCommunications::V1::SessionSeq& endpoints,
- const SessionCommunications::Bridging::V1::BridgeListenerPrx& listener,
+ const SessionCommunications::V1::BridgeListenerPrx& listener,
const Ice::Current& current);
- void addListener(const SessionCommunications::Bridging::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current);
- void removeListener(const SessionCommunications::Bridging::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current);
- SessionCommunications::Bridging::V1::BridgeSeq listBridges(const Ice::Current& current);
+ void addListener(const SessionCommunications::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current);
+ void removeListener(const SessionCommunications::V1::BridgeManagerListenerPrx& listener, const Ice::Current& current);
+ SessionCommunications::V1::BridgeSeq listBridges(const Ice::Current& current);
void shutdown(const Ice::Current& current);
struct BridgeInfo
{
BridgeImplPtr servant;
- SessionCommunications::Bridging::V1::BridgePrx proxy;
+ SessionCommunications::V1::BridgePrx proxy;
};
private:
@@ -53,7 +52,7 @@ namespace BridgeService
bool mShuttingDown;
bool mSuspended;
Ice::ObjectAdapterPtr mAdapter;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mSourceProxy;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mSourceProxy;
BridgeManagerListenerMgrPtr mListeners;
void reap();
};
diff --git a/src/BridgeManagerListenerMgr.cpp b/src/BridgeManagerListenerMgr.cpp
index 725aa26..5ed8a54 100644
--- a/src/BridgeManagerListenerMgr.cpp
+++ b/src/BridgeManagerListenerMgr.cpp
@@ -9,13 +9,13 @@
#include "BridgeManagerListenerMgr.h"
AsteriskSCF::BridgeService::BridgeManagerListenerMgr::BridgeManagerListenerMgr(const Ice::CommunicatorPtr& communicator, const std::string& name,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& source) :
- AsteriskSCF::BridgeService::ListenerManagerT<AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListenerPrx>(communicator, name, true),
+ const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& source) :
+ AsteriskSCF::BridgeService::ListenerManagerT<AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx>(communicator, name, true),
mPrx(source)
{
}
-void AsteriskSCF::BridgeService::BridgeManagerListenerMgr::bridgeCreated(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& bridge)
+void AsteriskSCF::BridgeService::BridgeManagerListenerMgr::bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge)
{
mPublisher->bridgeCreated(mPrx, bridge);
}
@@ -30,7 +30,7 @@ void AsteriskSCF::BridgeService::BridgeManagerListenerMgr::stopping()
mPublisher->stopping(mPrx);
}
-void AsteriskSCF::BridgeService::BridgeManagerListenerMgr::setSource(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& mgr)
+void AsteriskSCF::BridgeService::BridgeManagerListenerMgr::setSource(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& mgr)
{
mPrx = mgr;
}
diff --git a/src/BridgeManagerListenerMgr.h b/src/BridgeManagerListenerMgr.h
index 8c8dc6c..88f19e1 100644
--- a/src/BridgeManagerListenerMgr.h
+++ b/src/BridgeManagerListenerMgr.h
@@ -11,25 +11,25 @@
#include <string>
#include <Ice/Ice.h>
#include "ListenerManager.h"
-#include <SessionCommunications/Bridging/BridgingIf.h>
+#include <SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
namespace BridgeService
{
- class BridgeManagerListenerMgr : virtual public ListenerManagerT<AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListenerPrx>
+ class BridgeManagerListenerMgr : virtual public ListenerManagerT<AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx>
{
public:
BridgeManagerListenerMgr(const Ice::CommunicatorPtr& communicator, const std::string& name,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& source);
+ const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& source);
- void bridgeCreated(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& bridge);
+ void bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge);
void stopped();
void stopping();
- void setSource(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& source);
+ void setSource(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& source);
private:
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mPrx;
};
typedef IceUtil::Handle<BridgeManagerListenerMgr> BridgeManagerListenerMgrPtr;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8236292..8c292bc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,6 @@ hydra_component_init(bridgeservice CXX)
hydra_component_add_slice(bridgeservice EndpointIf)
hydra_component_add_slice(bridgeservice ComponentServiceIf)
hydra_component_add_slice(bridgeservice SessionCommunicationsIf)
-hydra_component_add_slice(bridgeservice BridgingIf)
hydra_component_add_slice(bridgeservice ServiceLocatorIf)
hydra_component_add_file(bridgeservice Service.cpp)
hydra_component_add_file(bridgeservice BridgeImpl.h)
diff --git a/src/Service.cpp b/src/Service.cpp
index 43ac35e..bcd527e 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -27,7 +27,7 @@ static const std::string ManagerName = "BridgeManager";
class ServiceLocatorWrapper : public IceUtil::Shared
{
public:
- ServiceLocatorWrapper(const Ice::CommunicatorPtr& communicator, const std::string& proxyString, const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& bridge,
+ ServiceLocatorWrapper(const Ice::CommunicatorPtr& communicator, const std::string& proxyString, const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& bridge,
const std::string& name) :
mCommunicator(communicator),
mProxyString(proxyString),
@@ -47,7 +47,7 @@ public:
if(mServiceManagement)
{
AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr params = new AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams();
- params->category = AsteriskSCF::SessionCommunications::Bridging::V1::BridgeServiceDiscoveryCategory;
+ params->category = AsteriskSCF::SessionCommunications::V1::BridgeServiceDiscoveryCategory;
mServiceManagement->addLocatorParams(params, "");
return true;
}
@@ -72,7 +72,7 @@ private:
IceUtil::Mutex mLock;
Ice::CommunicatorPtr mCommunicator;
std::string mProxyString;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mBridgeManager;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mBridgeManager;
std::string mName;
AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx mServiceManagement;
};
@@ -172,10 +172,10 @@ void BridgingApp::start(const std::string& name, const Ice::CommunicatorPtr& com
getLoggerFactory().setLogOutput(iceLogger->getLogger());
Ice::Identity id = communicator->stringToIdentity(ManagerName);
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx s(
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(id))
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx s(
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::uncheckedCast(mAdapter->createProxy(id))
);
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPtr servant(new AsteriskSCF::BridgeService::BridgeManagerImpl(mAdapter, ManagerName, s));
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPtr servant(new AsteriskSCF::BridgeService::BridgeManagerImpl(mAdapter, ManagerName, s));
mAdapter->add(servant, id);
mAdapter->activate();
diff --git a/test/BridgeListenerI.h b/test/BridgeListenerI.h
index 7b63459..1c8abf8 100644
--- a/test/BridgeListenerI.h
+++ b/test/BridgeListenerI.h
@@ -7,14 +7,14 @@
*/
#pragma once
-#include <SessionCommunications/Bridging/BridgingIf.h>
+#include <SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
namespace BridgingTest
{
-class BridgeListenerI : public AsteriskSCF::SessionCommunications::Bridging::V1::BridgeListener
+class BridgeListenerI : public AsteriskSCF::SessionCommunications::V1::BridgeListener
{
public:
BridgeListenerI();
diff --git a/test/BridgeManagerListenerI.cpp b/test/BridgeManagerListenerI.cpp
index 0f2ea16..e26b62b 100644
--- a/test/BridgeManagerListenerI.cpp
+++ b/test/BridgeManagerListenerI.cpp
@@ -16,22 +16,22 @@ BridgeManagerListenerI::BridgeManagerListenerI() :
{
}
-void BridgeManagerListenerI::bridgeCreated(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& bridge, const Ice::Current&)
+void BridgeManagerListenerI::bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager,
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mCreated;
mMonitor.notify();
}
-void BridgeManagerListenerI::stopped(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager, const Ice::Current&)
+void BridgeManagerListenerI::stopped(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mStopped;
mMonitor.notify();
}
-void BridgeManagerListenerI::stopping(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager, const Ice::Current&)
+void BridgeManagerListenerI::stopping(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mStopping;
diff --git a/test/BridgeManagerListenerI.h b/test/BridgeManagerListenerI.h
index 1a09bb7..34c7923 100644
--- a/test/BridgeManagerListenerI.h
+++ b/test/BridgeManagerListenerI.h
@@ -7,21 +7,21 @@
*/
#pragma once
-#include <SessionCommunications/Bridging/BridgingIf.h>
+#include <SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
namespace BridgingTest
{
-class BridgeManagerListenerI : public AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListener
+class BridgeManagerListenerI : public AsteriskSCF::SessionCommunications::V1::BridgeManagerListener
{
public:
BridgeManagerListenerI();
- void bridgeCreated(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager,
- const AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx& bridge, const Ice::Current&);
- void stopped(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager, const Ice::Current&);
- void stopping(const AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx& manager, const Ice::Current&);
+ void bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager,
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge, const Ice::Current&);
+ void stopped(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&);
+ void stopping(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&);
unsigned long createCalls() { return mCreated; }
unsigned long stoppedCalls() { return mStopped; }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7905081..4efb4c2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories("../src")
hydra_component_add_slice(bridging_unit_test EndpointIf)
hydra_component_add_slice(bridging_unit_test ComponentServiceIf)
hydra_component_add_slice(bridging_unit_test SessionCommunicationsIf)
-hydra_component_add_slice(bridging_unit_test BridgingIf)
hydra_component_add_slice(bridging_unit_test CommandsIf)
hydra_component_add_file(bridging_unit_test TestBridging.cpp)
hydra_component_add_file(bridging_unit_test SessionListenerI.h)
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 40ddaaa..4ea316d 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp>
#include <boost/test/debug.hpp>
#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <SessionCommunications/Bridging/BridgingIf.h>
#include <Media/MediaIf.h>
#include "BridgeManagerListenerI.h"
@@ -231,11 +230,11 @@ public:
Ice::ObjectAdapterPtr testAdapter = testEnv.communicator()->createObjectAdapter("TestUtilAdapter");
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListenerPrx listenerPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mgrPrx =
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx =
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
BOOST_CHECK(mgrPrx);
mgrPrx->addListener(listenerPrx);
@@ -243,7 +242,7 @@ public:
BOOST_CHECK(servant->stoppedCalls() == 0);
BOOST_CHECK(servant->createCalls() == 0);
AsteriskSCF::SessionCommunications::V1::SessionSeq sessions;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
+ AsteriskSCF::SessionCommunications::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
bridge->shutdown();
BOOST_CHECK(servant->createCalls() == 1);
@@ -274,18 +273,18 @@ public:
Ice::ObjectAdapterPtr testAdapter = testEnv.communicator()->createObjectAdapter("TestUtilAdapter");
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListenerPrx listenerPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mgrPrx =
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx =
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
BOOST_CHECK(mgrPrx);
mgrPrx->addListener(listenerPrx);
BOOST_CHECK(servant->stoppingCalls() == 0);
BOOST_CHECK(servant->stoppedCalls() == 0);
BOOST_CHECK(servant->createCalls() == 0);
AsteriskSCF::SessionCommunications::V1::SessionSeq sessions;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
+ AsteriskSCF::SessionCommunications::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
TestChannelWrapper channel(env()->properties());
AsteriskSCF::SessionCommunications::V1::SessionPrx a = channel.getSession("311");
@@ -360,18 +359,18 @@ public:
Ice::ObjectAdapterPtr testAdapter = testEnv.communicator()->createObjectAdapter("TestUtilAdapter");
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerListenerPrx listenerPrx;
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx mgrPrx =
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx =
+ AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx::checkedCast(testEnv.communicator()->propertyToProxy("TestBridge.Proxy"));
BOOST_CHECK(mgrPrx);
mgrPrx->addListener(listenerPrx);
BOOST_CHECK(servant->stoppingCalls() == 0);
BOOST_CHECK(servant->stoppedCalls() == 0);
BOOST_CHECK(servant->createCalls() == 0);
AsteriskSCF::SessionCommunications::V1::SessionSeq sessions;
- AsteriskSCF::SessionCommunications::Bridging::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
+ AsteriskSCF::SessionCommunications::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
servant->wait(5000);
BOOST_CHECK(servant->createCalls() == 1);
mgrPrx->removeListener(listenerPrx);
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list