[asterisk-scf-commits] asterisk-scf/release/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 21 14:18:49 CDT 2011
branch "master" has been updated
via d20df1dbdcb0d015f1c6a5950299f20f63d215a5 (commit)
via 2c2d0bbe4ee4f9207fb753fcc84528a379b97197 (commit)
via 50997b766f8e6993405a1177479c20b19fbbd6ab (commit)
via ea3d0aa0f2a3ea56a4d65a158a742f3dcac122db (commit)
via 00c5e1e0ad94a04c59697fa5a6c9d72efb6dfb4a (commit)
via 3fa16f2e43b041ecb0fe7a5f3c6de2da8adb2520 (commit)
via 98c3600ed137bf106fb0a0b867e726703bae791e (commit)
via 677904c4cbc3b187bf95d79c9d617d4296d6a67c (commit)
via 8b001d8a60ab6461de7576a50b64c224224ce2af (commit)
from 7fcb7f067f0bff9f56f2563e67f47ea5ef63bbd9 (commit)
Summary of changes:
.gitmodules | 9 --
CMakeLists.txt | 7 +-
cmake | 1 -
logger | 1 -
slice | 1 -
.../BasicRoutingStateReplicationIf.ice | 7 +-
src/BasicRoutingServiceApp.cpp | 16 ++--
src/BasicRoutingStateReplicatorApp.cpp | 23 +++--
src/CMakeLists.txt | 101 +++++++++-----------
...nectBridgedSessionsWithDestinationOperation.cpp | 20 ++--
...onnectBridgedSessionsWithDestinationOperation.h | 8 +-
src/EndpointRegistry.cpp | 3 +-
src/OperationReplicaCache.cpp | 3 +-
src/OperationReplicaCache.h | 4 +-
src/ReplicationContext.h | 2 +-
src/RouteSessionOperation.cpp | 20 ++--
src/RouteSessionOperation.h | 8 +-
src/RoutingServiceEventPublisher.cpp | 2 +-
src/RoutingStateReplicatorListener.cpp | 43 ++++----
src/RoutingStateReplicatorListener.h | 6 +-
test/CMakeLists.txt | 39 ++++----
21 files changed, 155 insertions(+), 169 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 160000 logger
delete mode 160000 slice
rename {local-slice => slice/AsteriskSCF/Replication/BasicRoutingService}/BasicRoutingStateReplicationIf.ice (98%)
- Log -----------------------------------------------------------------
commit d20df1dbdcb0d015f1c6a5950299f20f63d215a5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:55:31 2011 -0500
Provide 'astscf' prefix for linking to ice-util-cpp library.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b9b5408..5e236a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
include_directories(${logger_dir}/include)
include_directories(${util-cpp_dir}/include)
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4db355b..2578402 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
astscf_component_init(RoutingTest)
astscf_component_add_files(RoutingTest TestRouting.cpp)
commit 2c2d0bbe4ee4f9207fb753fcc84528a379b97197
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:50:49 2011 -0500
Provide 'astscf' prefix for linking to util-cpp library.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 214efbb..b9b5408 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
astscf_component_add_slice_collection_libraries(BasicRoutingService ASTSCF)
astscf_component_build_icebox(BasicRoutingService)
-target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client util-cpp)
+target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client astscf-util-cpp)
astscf_component_install(BasicRoutingService)
astscf_component_init(BasicRoutingStateReplicator)
commit 50997b766f8e6993405a1177479c20b19fbbd6ab
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Install component-specific Slice files.
Use astscf_slice_collection_install() to install the Slice files provided
by each component, that define its interfaces. As part of this change, many
of these Slice files were renamed and moved into different namespaces, to
provide consistency.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35e9749..ba8ff6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
+astscf_slice_collection_install(PROJECT)
diff --git a/slice/BasicRoutingStateReplicationIf.ice b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
similarity index 98%
rename from slice/BasicRoutingStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
index 4ea55c1..507444c 100644
--- a/slice/BasicRoutingStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
@@ -22,6 +22,10 @@
module AsteriskSCF
{
+
+module Replication
+{
+
module BasicRoutingService
{
["suppress"]
@@ -184,5 +188,6 @@ module V1
};
}; //module V1
-}; //module BasicRouting
+}; //module BasicRoutingService
+}; //module Replication
}; //module Asterisk SCF
diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index 32c6ff9..ef38e4a 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -47,7 +47,7 @@ using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
-using namespace AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace AsteriskSCF::Discovery;
namespace
@@ -355,8 +355,8 @@ void BasicRoutingServiceApp::listenToStateReplicator()
// Are we in standby mode?
if (mReplicationContext->isComponentActive() == false)
{
- AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorPrx oneWayStateReplicator =
- AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorPrx::uncheckedCast(mReplicationContext->getReplicatorService()->ice_oneway());
+ AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorPrx oneWayStateReplicator =
+ AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorPrx::uncheckedCast(mReplicationContext->getReplicatorService()->ice_oneway());
oneWayStateReplicator->addListener(mReplicatorListenerProxy);
mListeningToReplicator = true;
@@ -385,8 +385,8 @@ void BasicRoutingServiceApp::stopListeningToStateReplicator()
try
{
- AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorPrx oneWayStateReplicator =
- AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorPrx::uncheckedCast(mReplicationContext->getReplicatorService()->ice_oneway());
+ AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorPrx oneWayStateReplicator =
+ AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorPrx::uncheckedCast(mReplicationContext->getReplicatorService()->ice_oneway());
oneWayStateReplicator->removeListener(mReplicatorListenerProxy);
@@ -576,8 +576,8 @@ void BasicRoutingServiceApp::locateBridgeManager()
*/
void BasicRoutingServiceApp::locateStateReplicator()
{
- BasicRoutingService::V1::RoutingStateReplicatorParamsPtr replicatorParams = new BasicRoutingService::V1::RoutingStateReplicatorParams();
- replicatorParams->category = BasicRoutingService::V1::StateReplicatorDiscoveryCategory;
+ RoutingStateReplicatorParamsPtr replicatorParams = new RoutingStateReplicatorParams();
+ replicatorParams->category = StateReplicatorDiscoveryCategory;
replicatorParams->name = mCommunicator->getProperties()->getPropertyWithDefault(mAppName + ".StateReplicatorName", "default");
try
diff --git a/src/BasicRoutingStateReplicatorApp.cpp b/src/BasicRoutingStateReplicatorApp.cpp
index 5fc57a6..198b97a 100644
--- a/src/BasicRoutingStateReplicatorApp.cpp
+++ b/src/BasicRoutingStateReplicatorApp.cpp
@@ -31,8 +31,7 @@ using namespace AsteriskSCF::Core;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
-using namespace AsteriskSCF::BasicRoutingService;
-using namespace AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace AsteriskSCF::Core::Routing::V1;
namespace
@@ -45,15 +44,17 @@ namespace AsteriskSCF
namespace BasicRoutingService
{
-typedef AsteriskSCF::Replication::StateReplicator< AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicator,
- AsteriskSCF::BasicRoutingService::V1::RoutingStateItemPtr,
+typedef AsteriskSCF::Replication::StateReplicator< RoutingStateReplicator,
+ RoutingStateItemPtr,
std::string,
- AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorListenerPrx> RoutingStateReplicatorI;
+ RoutingStateReplicatorListenerPrx> RoutingStateReplicatorI;
typedef IceUtil::Handle<RoutingStateReplicatorI> RoutingStateReplicatorIPtr;
};
};
+using namespace AsteriskSCF::BasicRoutingService;
+
/**
* This class implements a very simplistic replication capability using the StateReplicator template.
*/
@@ -86,7 +87,7 @@ private:
Discovery::V1::ServiceManagementPrx mComponentServiceManagement;
Discovery::V1::ServiceManagementPrx mStateReplicationManagement;
ConfiguredIceLoggerPtr mIceLogger;
- AsteriskSCF::BasicRoutingService::RoutingStateReplicatorIPtr mStateReplicator;
+ RoutingStateReplicatorIPtr mStateReplicator;
ComponentServicePrx mComponentServicePrx;
RoutingStateReplicatorPrx mStateReplicatorPrx;
@@ -166,16 +167,16 @@ void BasicRoutingStateReplicatorService::registerWithServiceLocator()
{
// Add our ComponentService interface and add it to the Service Locator.
// Note that this interface has its own adapter.
- string componentServiceGuid(AsteriskSCF::BasicRoutingService::V1::StateReplicatorComponentCategory);
+ string componentServiceGuid(StateReplicatorComponentCategory);
mComponentServiceManagement = mServiceLocatorManagement->addService(mComponentServicePrx, componentServiceGuid);
- setCategory(mComponentServiceManagement, AsteriskSCF::BasicRoutingService::V1::StateReplicatorComponentCategory);
+ setCategory(mComponentServiceManagement, StateReplicatorComponentCategory);
// Add our Replicator interface and add it to the Service Locator.
- string stateReplicationGuid(AsteriskSCF::BasicRoutingService::V1::StateReplicatorDiscoveryCategory);
+ string stateReplicationGuid(StateReplicatorDiscoveryCategory);
mStateReplicationManagement = mServiceLocatorManagement->addService(mStateReplicatorPrx, stateReplicationGuid);
ServiceLocatorParamsPtr discoveryParams = new ServiceLocatorParams();
- discoveryParams->category = AsteriskSCF::BasicRoutingService::V1::StateReplicatorDiscoveryCategory;
+ discoveryParams->category = StateReplicatorDiscoveryCategory;
string replicatorName = mCommunicator->getProperties()->getPropertyWithDefault(mAppName + ".InstanceName", "default");
ServiceLocatorParamsComparePrx compareProxy = ServiceLocatorParamsComparePrx::uncheckedCast(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1be47e4..214efbb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
astscf_component_init(BasicRoutingService)
-astscf_component_add_slices(BasicRoutingService PROJECT BasicRoutingStateReplicationIf.ice)
+astscf_component_add_slices(BasicRoutingService PROJECT AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice)
astscf_component_add_files(BasicRoutingService BasicRoutingServiceApp.cpp)
astscf_component_add_files(BasicRoutingService SessionRouter.cpp)
astscf_component_add_files(BasicRoutingService SessionRouter.h)
@@ -46,7 +46,7 @@ astscf_component_install(BasicRoutingService)
astscf_component_init(BasicRoutingStateReplicator)
astscf_component_add_files(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
-astscf_component_add_slices(BasicRoutingStateReplicator PROJECT BasicRoutingStateReplicationIf.ice)
+astscf_component_add_slices(BasicRoutingStateReplicator PROJECT AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice)
astscf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
astscf_component_add_slice_collection_libraries(BasicRoutingStateReplicator ASTSCF)
astscf_component_build_icebox(BasicRoutingStateReplicator)
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.cpp b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
index ca07b82..449d36c 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.cpp
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
@@ -25,7 +25,8 @@ using namespace AsteriskSCF;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::System::Logging;
-using namespace ::AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::BasicRoutingService;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace AsteriskSCF::StateMachine;
namespace
@@ -76,8 +77,7 @@ public:
ConnectBridgedSessionsWithDestinationOpStartPtr
opStart(new ConnectBridgedSessionsWithDestinationOpStart());
opStart->operationId = mOperation->getOperationId();
- opStart->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestStartKeyMod;
+ opStart->key = mOperation->getOperationId() + ConnectBridgedSessionsWithDestStartKeyMod;
opStart->sessionToReplace = mOperation->getSessionToReplace();
opStart->destination = mOperation->getDestination();
@@ -91,8 +91,7 @@ public:
ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr
waitLookup(new ConnectBridgedSessionsWithDestinationOpWaitLookupState());
waitLookup->operationId = mOperation->getOperationId();
- waitLookup->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupKeyMod;
+ waitLookup->key = mOperation->getOperationId() + RouteSessionOpWaitLookupKeyMod;
waitLookup->endpoints = mOperation->getLookupResult();
waitLookup->remainingSessions = mOperation->getRemainingSessions();
@@ -167,8 +166,7 @@ public:
ConnectBridgedSessionsWithDestinationOpBridgingStatePtr
bridgeOp(new ConnectBridgedSessionsWithDestinationOpBridgingState());
bridgeOp->operationId = mOperation->getOperationId();
- bridgeOp->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingKeyMod;
+ bridgeOp->key = mOperation->getOperationId() + RouteSessionOpBridgingKeyMod;
bridgeOp->bridge = mOperation->getBridge();
pushState(bridgeOp);
@@ -282,7 +280,7 @@ ConnectBridgedSessionsWithDestinationOperation::~ConnectBridgedSessionsWithDesti
lg(Debug) << "ConnectBridgedSessionsWithDestinationOperation() being destroyed for " << mDestination ;
}
-void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& stateItem)
+void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr& stateItem)
{
ConnectBridgedSessionsWithDestinationOpStartPtr start;
ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr waitLookup;
@@ -302,7 +300,7 @@ void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const Asteris
}
}
-void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpStartPtr& item)
+void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const ConnectBridgedSessionsWithDestinationOpStartPtr& item)
{
mSessionToReplace = item->sessionToReplace;
mDestination = item->destination;
@@ -311,13 +309,13 @@ void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const Asteris
mReplicatedStates.push_back(ConnectBridgedSessionsWithDestinationOp::STATE_LOOKUP);
}
-void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& item)
+void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& item)
{
mLookupResult = item->endpoints;
mReplicatedStates.push_back(ConnectBridgedSessionsWithDestinationOp::STATE_WAIT_LOOKUP_RESULTS);
}
-void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& item)
+void ConnectBridgedSessionsWithDestinationOperation::reflectUpdate(const ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& item)
{
mBridge = item->bridge;
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.h b/src/ConnectBridgedSessionsWithDestinationOperation.h
index 8730a61..c7a142f 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.h
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.h
@@ -92,7 +92,7 @@ public:
/**
* Update a replica object with new state information.
*/
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& stateItem);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr& stateItem);
/**
* Set the state machine into the highest state possible based on all of the state updates
@@ -121,9 +121,9 @@ protected:
private:
void initStateMachine();
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpStartPtr& stateItem);
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& stateItem);
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& stateItem);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpStartPtr& stateItem);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& stateItem);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& stateItem);
/**
* This is a state handler for one of this operation's states.
diff --git a/src/EndpointRegistry.cpp b/src/EndpointRegistry.cpp
index 8756701..bc794ca 100644
--- a/src/EndpointRegistry.cpp
+++ b/src/EndpointRegistry.cpp
@@ -30,7 +30,8 @@ using namespace ::AsteriskSCF::Core::Endpoint::V1;
using namespace ::AsteriskSCF::Core::Routing::V1;
using namespace ::AsteriskSCF::System::Logging;
using namespace ::AsteriskSCF::Core::Routing::V1::Event;
-using namespace ::AsteriskSCF::BasicRoutingService::V1;
+using namespace ::AsteriskSCF::BasicRoutingService;
+using namespace ::AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace ::AsteriskSCF::Discovery;
namespace
diff --git a/src/OperationReplicaCache.cpp b/src/OperationReplicaCache.cpp
index a0c5866..56c22e6 100644
--- a/src/OperationReplicaCache.cpp
+++ b/src/OperationReplicaCache.cpp
@@ -21,7 +21,8 @@
#include "SessionRouterOperation.h"
using namespace AsteriskSCF::Threading;
-using namespace AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::BasicRoutingService;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
namespace AsteriskSCF
{
diff --git a/src/OperationReplicaCache.h b/src/OperationReplicaCache.h
index 5d207fb..740c66c 100644
--- a/src/OperationReplicaCache.h
+++ b/src/OperationReplicaCache.h
@@ -37,7 +37,7 @@ class OperationCachePriv;
class OperationReplicaCachePriv;
class SessionContext;
-typedef std::map<std::string, AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr> StateItemMapType;
+typedef std::map<std::string, AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr> StateItemMapType;
/**
* For each transaction id, we're going to cache the all the state items for the operation.
@@ -71,7 +71,7 @@ public:
{
}
- void cacheOperationState(const AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& item)
+ void cacheOperationState(const AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr& item)
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
diff --git a/src/ReplicationContext.h b/src/ReplicationContext.h
index 1e82e00..3050d48 100644
--- a/src/ReplicationContext.h
+++ b/src/ReplicationContext.h
@@ -25,7 +25,7 @@ namespace AsteriskSCF
{
namespace BasicRoutingService
{
-typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorPrx> ReplicatorServicePrx;
+typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorPrx> ReplicatorServicePrx;
class ReplicationContextPriv;
diff --git a/src/RouteSessionOperation.cpp b/src/RouteSessionOperation.cpp
index 80c15e8..d8d25da 100644
--- a/src/RouteSessionOperation.cpp
+++ b/src/RouteSessionOperation.cpp
@@ -26,7 +26,8 @@ using namespace AsteriskSCF;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::System::Logging;
-using namespace ::AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::BasicRoutingService;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace AsteriskSCF::StateMachine;
namespace
@@ -78,8 +79,7 @@ public:
// Push this information to the state replicator.
RouteSessionOpStartPtr routeSessionOpStart(new RouteSessionOpStart());
routeSessionOpStart->operationId = mOperation->getOperationId();
- routeSessionOpStart->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::RouteSessionOpStartKeyMod;
+ routeSessionOpStart->key = mOperation->getOperationId() + RouteSessionOpStartKeyMod;
routeSessionOpStart->source = mOperation->getSource();
routeSessionOpStart->destination = mOperation->getDestination();
@@ -92,8 +92,7 @@ public:
// We've obtained a result from our AMI lookup request.
RouteSessionOpWaitLookupStatePtr routeSessionOpWaitLookup(new RouteSessionOpWaitLookupState());
routeSessionOpWaitLookup->operationId = mOperation->getOperationId();
- routeSessionOpWaitLookup->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupKeyMod;
+ routeSessionOpWaitLookup->key = mOperation->getOperationId() + RouteSessionOpWaitLookupKeyMod;
routeSessionOpWaitLookup->endpoints = mOperation->getLookupResult();
pushState(routeSessionOpWaitLookup);
@@ -165,8 +164,7 @@ public:
// Push this information to the state replicator.
RouteSessionOpBridgingStatePtr routeSessionOpBridging(new RouteSessionOpBridgingState());
routeSessionOpBridging->operationId = mOperation->getOperationId();
- routeSessionOpBridging->key = mOperation->getOperationId() +
- AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingKeyMod;
+ routeSessionOpBridging->key = mOperation->getOperationId() + RouteSessionOpBridgingKeyMod;
routeSessionOpBridging->bridge = mOperation->getBridge();
pushState(routeSessionOpBridging);
@@ -279,7 +277,7 @@ RouteSessionOperationPtr RouteSessionOperation::createReplica(const SessionConte
return op;
}
-void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& stateItem)
+void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr& stateItem)
{
RouteSessionOpStartPtr start;
RouteSessionOpWaitLookupStatePtr waitLookup;
@@ -299,7 +297,7 @@ void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService
}
}
-void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpStartPtr& item)
+void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpStartPtr& item)
{
mSource = item->source;
mDestination = item->destination;
@@ -308,14 +306,14 @@ void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService
mReplicatedStates.push_back(RouteSessionOp::STATE_LOOKUP);
}
-void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& item)
+void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& item)
{
mLookupResult = item->endpoints;
mReplicatedStates.push_back(RouteSessionOp::STATE_WAIT_LOOKUP_RESULTS);
}
-void RouteSessionOperation::reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& item)
+void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& item)
{
mBridge = item->bridge;
diff --git a/src/RouteSessionOperation.h b/src/RouteSessionOperation.h
index 1846f92..b5ce75c 100644
--- a/src/RouteSessionOperation.h
+++ b/src/RouteSessionOperation.h
@@ -89,7 +89,7 @@ public:
/**
* Update a replica object with new state information.
*/
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& stateItem);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::OperationStateItemPtr& stateItem);
/**
* Set the state machine into the highest state possible based on all of the state updates
@@ -116,17 +116,17 @@ private:
/**
* Update a replica object with new state information of a specific type.
*/
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpStartPtr& item);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpStartPtr& item);
/**
* Update a replica object with new state information of a specific type.
*/
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& item);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& item);
/**
* Update a replica object with new state information of a specific type.
*/
- void reflectUpdate(const AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& item);
+ void reflectUpdate(const AsteriskSCF::Replication::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& item);
/**
* This is a state handler for one of this operation's states.
diff --git a/src/RoutingServiceEventPublisher.cpp b/src/RoutingServiceEventPublisher.cpp
index 788a805..80031e2 100644
--- a/src/RoutingServiceEventPublisher.cpp
+++ b/src/RoutingServiceEventPublisher.cpp
@@ -25,7 +25,7 @@
using namespace ::std;
using namespace ::AsteriskSCF::Core::Routing::V1;
using namespace ::AsteriskSCF::System::Logging;
-using namespace ::AsteriskSCF::BasicRoutingService::V1;
+using namespace ::AsteriskSCF::BasicRoutingService;
namespace
{
diff --git a/src/RoutingStateReplicatorListener.cpp b/src/RoutingStateReplicatorListener.cpp
index 3f4a729..3e96cc0 100644
--- a/src/RoutingStateReplicatorListener.cpp
+++ b/src/RoutingStateReplicatorListener.cpp
@@ -25,7 +25,8 @@
#include "RouteSessionOperation.h"
#include "EndpointRegistry.h"
-using namespace AsteriskSCF::BasicRoutingService::V1;
+using namespace AsteriskSCF::BasicRoutingService;
+using namespace AsteriskSCF::Replication::BasicRoutingService::V1;
using namespace AsteriskSCF::System::Logging;
namespace
@@ -53,7 +54,7 @@ public:
void stateRemovedForItems(const RoutingStateItemSeq& items, const Ice::Current& )
{
// Method local visitor implementation for handling removal of state items.
- class visitor : public AsteriskSCF::BasicRoutingService::V1::RoutingStateItemVisitor
+ class visitor : public RoutingStateItemVisitor
{
public:
visitor(RoutingStateReplicatorListenerPriv *impl) : mImpl(impl)
@@ -64,7 +65,7 @@ public:
RoutingStateReplicatorListenerPriv *mImpl;
// Used an intermediate class in the slice types, and the visitor didn't pick up the leaf classes to visit.
- void visitOperationStateItem(const ::AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& operation)
+ void visitOperationStateItem(const OperationStateItemPtr& operation)
{
RouteSessionOpStartPtr routeSessinOpStart = RouteSessionOpStartPtr::dynamicCast(operation);
if (routeSessinOpStart != 0)
@@ -109,38 +110,38 @@ public:
}
}
- void visitRouteSessionOpStart(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpStartPtr& opState)
+ void visitRouteSessionOpStart(const RouteSessionOpStartPtr& opState)
{
// The operation cache keeps all the collected state for an operation under the transaction id.
mImpl->mOperationReplicaCache->getRouteSessionCache()->dropOperation(opState->operationId);
}
- void visitRouteSessionOpWaitLookupState(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& )
+ void visitRouteSessionOpWaitLookupState(const RouteSessionOpWaitLookupStatePtr& )
{
// Removing the Start state for this operation will clean it up.
}
- void visitRouteSessionOpBridgingState(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& )
+ void visitRouteSessionOpBridgingState(const RouteSessionOpBridgingStatePtr& )
{
// Removing the Start state for this operation will clean it up.
}
- void visitConnectBridgedSessionsWithDestinationOpStart(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpStartPtr& opState)
+ void visitConnectBridgedSessionsWithDestinationOpStart(const ConnectBridgedSessionsWithDestinationOpStartPtr& opState)
{
mImpl->mOperationReplicaCache->getConnectBridgedSessionsWithDestCache()->dropOperation(opState->operationId);
}
- void visitConnectBridgedSessionsWithDestinationOpWaitLookupState(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& )
+ void visitConnectBridgedSessionsWithDestinationOpWaitLookupState(const ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& )
{
// Removing the Start state for this operation will clean it up.
}
- void visitConnectBridgedSessionsWithDestinationOpBridgingState(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& )
+ void visitConnectBridgedSessionsWithDestinationOpBridgingState(const ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& )
{
// Removing the Start state for this operation will clean it up.
}
- void visitEndpointLocatorState(const ::AsteriskSCF::BasicRoutingService::V1::EndpointLocatorStatePtr& item)
+ void visitEndpointLocatorState(const EndpointLocatorStatePtr& item)
{
mImpl->mEndpointRegistry->removeEndpointLocator(item->key, ::Ice::Current());
}
@@ -148,7 +149,7 @@ public:
}; // end method-local visitor def
// Create the visitor. Smart pointer will cleanup when this method exits.
- AsteriskSCF::BasicRoutingService::V1::RoutingStateItemVisitorPtr v = new visitor(this);
+ RoutingStateItemVisitorPtr v = new visitor(this);
for (RoutingStateItemSeq::const_iterator item = items.begin(); item != items.end(); ++item)
{
@@ -165,7 +166,7 @@ public:
{
// Method-local visitor class for handling new state.
- class visitor : public AsteriskSCF::BasicRoutingService::V1::RoutingStateItemVisitor
+ class visitor : public RoutingStateItemVisitor
{
public:
visitor(RoutingStateReplicatorListenerPriv *impl, const Ice::Current& cur)
@@ -178,7 +179,7 @@ public:
const Ice::Current& mCurrent;
// Used an intermediate class in the slice types, and the visitor didn't pick up the leaf classes to visit.
- void visitOperationStateItem(const ::AsteriskSCF::BasicRoutingService::V1::OperationStateItemPtr& operation)
+ void visitOperationStateItem(const OperationStateItemPtr& operation)
{
RouteSessionOpStartPtr routeSessinOpStart = RouteSessionOpStartPtr::dynamicCast(operation);
if (routeSessinOpStart != 0)
@@ -223,37 +224,37 @@ public:
}
}
- void visitRouteSessionOpStart(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpStartPtr& opState)
+ void visitRouteSessionOpStart(const RouteSessionOpStartPtr& opState)
{
mImpl->mOperationReplicaCache->getRouteSessionCache()->cacheOperationState(opState);
}
- void visitRouteSessionOpWaitLookupState(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpWaitLookupStatePtr& opState)
+ void visitRouteSessionOpWaitLookupState(const RouteSessionOpWaitLookupStatePtr& opState)
{
mImpl->mOperationReplicaCache->getRouteSessionCache()->cacheOperationState(opState);
}
- void visitRouteSessionOpBridgingState(const ::AsteriskSCF::BasicRoutingService::V1::RouteSessionOpBridgingStatePtr& opState)
+ void visitRouteSessionOpBridgingState(const RouteSessionOpBridgingStatePtr& opState)
{
mImpl->mOperationReplicaCache->getRouteSessionCache()->cacheOperationState(opState);
}
- void visitConnectBridgedSessionsWithDestinationOpStart(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpStartPtr& opState)
+ void visitConnectBridgedSessionsWithDestinationOpStart(const ConnectBridgedSessionsWithDestinationOpStartPtr& opState)
{
mImpl->mOperationReplicaCache->getConnectBridgedSessionsWithDestCache()->cacheOperationState(opState);
}
- void visitConnectBridgedSessionsWithDestinationOpWaitLookupState(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& opState)
+ void visitConnectBridgedSessionsWithDestinationOpWaitLookupState(const ConnectBridgedSessionsWithDestinationOpWaitLookupStatePtr& opState)
{
mImpl->mOperationReplicaCache->getConnectBridgedSessionsWithDestCache()->cacheOperationState(opState);
}
- void visitConnectBridgedSessionsWithDestinationOpBridgingState(const ::AsteriskSCF::BasicRoutingService::V1::ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& opState)
+ void visitConnectBridgedSessionsWithDestinationOpBridgingState(const ConnectBridgedSessionsWithDestinationOpBridgingStatePtr& opState)
{
mImpl->mOperationReplicaCache->getConnectBridgedSessionsWithDestCache()->cacheOperationState(opState);
}
- void visitEndpointLocatorState(const ::AsteriskSCF::BasicRoutingService::V1::EndpointLocatorStatePtr& item)
+ void visitEndpointLocatorState(const EndpointLocatorStatePtr& item)
{
mImpl->mEndpointRegistry->addEndpointLocator(item->key, item->regExList, item->locator, mCurrent);
}
@@ -261,7 +262,7 @@ public:
}; // end method-local visitor def
// Create the visitor. Smart pointer will cleanup when this method exits.
- AsteriskSCF::BasicRoutingService::V1::RoutingStateItemVisitorPtr v = new visitor(this, current);
+ RoutingStateItemVisitorPtr v = new visitor(this, current);
for (RoutingStateItemSeq::const_iterator item = items.begin(); item != items.end(); ++item)
{
diff --git a/src/RoutingStateReplicatorListener.h b/src/RoutingStateReplicatorListener.h
index 5732494..d483a13 100644
--- a/src/RoutingStateReplicatorListener.h
+++ b/src/RoutingStateReplicatorListener.h
@@ -36,14 +36,14 @@ class RoutingStateReplicatorListenerPriv;
* this service is in standby mode, and ensures that this instance of the
* service has the latest dynamic state in case it is activated.
*/
-class RoutingStateReplicatorListenerImpl : public AsteriskSCF::BasicRoutingService::V1::RoutingStateReplicatorListener
+class RoutingStateReplicatorListenerImpl : public AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateReplicatorListener
{
public:
RoutingStateReplicatorListenerImpl(const EndpointRegistryPtr& registry, const boost::shared_ptr<OperationReplicaCache>& opCache);
~RoutingStateReplicatorListenerImpl();
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateRemovedForItems(const AsteriskSCF::BasicRoutingService::V1::RoutingStateItemSeq&, const Ice::Current&);
- void stateSet(const AsteriskSCF::BasicRoutingService::V1::RoutingStateItemSeq&, const Ice::Current&);
+ void stateRemovedForItems(const AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::Replication::BasicRoutingService::V1::RoutingStateItemSeq&, const Ice::Current&);
bool operator==(RoutingStateReplicatorListenerImpl &rhs);
private:
commit ea3d0aa0f2a3ea56a4d65a158a742f3dcac122db
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 46ef49c..1be47e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
include_directories(${util-cpp_dir}/include)
include_directories(${ice-util-cpp_dir}/include)
@@ -40,14 +39,16 @@ astscf_component_add_files(BasicRoutingService RoutingStateReplicatorListener.h)
astscf_component_add_files(BasicRoutingService RoutingStateReplicatorListener.cpp)
astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
+astscf_component_add_slice_collection_libraries(BasicRoutingService ASTSCF)
astscf_component_build_icebox(BasicRoutingService)
-target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client util-cpp astscf-api)
+target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client util-cpp)
astscf_component_install(BasicRoutingService)
astscf_component_init(BasicRoutingStateReplicator)
astscf_component_add_files(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
astscf_component_add_slices(BasicRoutingStateReplicator PROJECT BasicRoutingStateReplicationIf.ice)
astscf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
+astscf_component_add_slice_collection_libraries(BasicRoutingStateReplicator ASTSCF)
astscf_component_build_icebox(BasicRoutingStateReplicator)
-target_link_libraries(BasicRoutingStateReplicator logging-client astscf-api)
+target_link_libraries(BasicRoutingStateReplicator logging-client)
astscf_component_install(BasicRoutingStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 37324e7..4db355b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
astscf_component_init(RoutingTest)
@@ -16,6 +15,6 @@ astscf_component_add_files(RoutingTest MockEndpointLocator.h)
astscf_component_add_files(RoutingTest MockEndpointLocator.cpp)
astscf_component_add_ice_libraries(RoutingTest IceStorm)
astscf_component_add_boost_libraries(RoutingTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(RoutingTest ASTSCF)
astscf_component_build_icebox(RoutingTest)
-target_link_libraries(RoutingTest astscf-api)
astscf_test_icebox(RoutingTest config/routingtest-integ.config)
commit 00c5e1e0ad94a04c59697fa5a6c9d72efb6dfb4a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:26 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/local-slice/BasicRoutingStateReplicationIf.ice b/slice/BasicRoutingStateReplicationIf.ice
similarity index 100%
rename from local-slice/BasicRoutingStateReplicationIf.ice
rename to slice/BasicRoutingStateReplicationIf.ice
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3bcbbb9..46ef49c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,58 +6,48 @@ include_directories(${ice-util-cpp_dir}/include)
find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(BasicRoutingService)
-astscf_component_add_slice(BasicRoutingService ../local-slice/BasicRoutingStateReplicationIf.ice)
-astscf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
-astscf_component_add_file(BasicRoutingService SessionRouter.cpp)
-astscf_component_add_file(BasicRoutingService SessionRouter.h)
-astscf_component_add_file(BasicRoutingService RoutingAdmin.cpp)
-astscf_component_add_file(BasicRoutingService RoutingAdmin.h)
-astscf_component_add_file(BasicRoutingService EndpointRegistry.cpp)
-astscf_component_add_file(BasicRoutingService EndpointRegistry.h)
-astscf_component_add_file(BasicRoutingService ScriptProcessor.h)
-astscf_component_add_file(BasicRoutingService LuaScriptProcessor.cpp)
-astscf_component_add_file(BasicRoutingService LuaScriptProcessor.h)
-astscf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.cpp)
-astscf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.h)
-astscf_component_add_file(BasicRoutingService SessionRouterOperation.h)
-astscf_component_add_file(BasicRoutingService SessionRouterOperation.cpp)
-astscf_component_add_file(BasicRoutingService RouteSessionOperation.h)
-astscf_component_add_file(BasicRoutingService RouteSessionOperation.cpp)
-astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.h)
-astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.cpp)
-astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.h)
-astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.cpp)
-astscf_component_add_file(BasicRoutingService SessionListener.h)
-astscf_component_add_file(BasicRoutingService SessionListener.cpp)
-astscf_component_add_file(BasicRoutingService OperationReplicaCache.h)
-astscf_component_add_file(BasicRoutingService OperationReplicaCache.cpp)
-astscf_component_add_file(BasicRoutingService ReplicationContext.h)
-astscf_component_add_file(BasicRoutingService ReplicationContext.cpp)
-astscf_component_add_file(BasicRoutingService TestContext.h)
-astscf_component_add_file(BasicRoutingService TestContext.cpp)
-astscf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.h)
-astscf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.cpp)
+astscf_component_add_slices(BasicRoutingService PROJECT BasicRoutingStateReplicationIf.ice)
+astscf_component_add_files(BasicRoutingService BasicRoutingServiceApp.cpp)
+astscf_component_add_files(BasicRoutingService SessionRouter.cpp)
+astscf_component_add_files(BasicRoutingService SessionRouter.h)
+astscf_component_add_files(BasicRoutingService RoutingAdmin.cpp)
+astscf_component_add_files(BasicRoutingService RoutingAdmin.h)
+astscf_component_add_files(BasicRoutingService EndpointRegistry.cpp)
+astscf_component_add_files(BasicRoutingService EndpointRegistry.h)
+astscf_component_add_files(BasicRoutingService ScriptProcessor.h)
+astscf_component_add_files(BasicRoutingService LuaScriptProcessor.cpp)
+astscf_component_add_files(BasicRoutingService LuaScriptProcessor.h)
+astscf_component_add_files(BasicRoutingService RoutingServiceEventPublisher.cpp)
+astscf_component_add_files(BasicRoutingService RoutingServiceEventPublisher.h)
+astscf_component_add_files(BasicRoutingService SessionRouterOperation.h)
+astscf_component_add_files(BasicRoutingService SessionRouterOperation.cpp)
+astscf_component_add_files(BasicRoutingService RouteSessionOperation.h)
+astscf_component_add_files(BasicRoutingService RouteSessionOperation.cpp)
+astscf_component_add_files(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.h)
+astscf_component_add_files(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.cpp)
+astscf_component_add_files(BasicRoutingService ConnectBridgedSessionsOperation.h)
+astscf_component_add_files(BasicRoutingService ConnectBridgedSessionsOperation.cpp)
+astscf_component_add_files(BasicRoutingService SessionListener.h)
+astscf_component_add_files(BasicRoutingService SessionListener.cpp)
+astscf_component_add_files(BasicRoutingService OperationReplicaCache.h)
+astscf_component_add_files(BasicRoutingService OperationReplicaCache.cpp)
+astscf_component_add_files(BasicRoutingService ReplicationContext.h)
+astscf_component_add_files(BasicRoutingService ReplicationContext.cpp)
+astscf_component_add_files(BasicRoutingService TestContext.h)
+astscf_component_add_files(BasicRoutingService TestContext.cpp)
+astscf_component_add_files(BasicRoutingService RoutingStateReplicatorListener.h)
+astscf_component_add_files(BasicRoutingService RoutingStateReplicatorListener.cpp)
astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
astscf_component_build_icebox(BasicRoutingService)
-target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
-target_link_libraries(BasicRoutingService logging-client)
-target_link_libraries(BasicRoutingService Threading)
-target_link_libraries(BasicRoutingService asterisk-scf-api)
+target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client util-cpp astscf-api)
astscf_component_install(BasicRoutingService)
astscf_component_init(BasicRoutingStateReplicator)
-astscf_component_add_slice(BasicRoutingStateReplicator ServiceLocatorIf)
-astscf_component_add_slice(BasicRoutingStateReplicator ComponentServiceIf)
-astscf_component_add_slice(BasicRoutingStateReplicator BasicRoutingStateReplicationIf)
-astscf_component_add_slice(BasicRoutingStateReplicator RoutingIf)
-astscf_component_add_file(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
-astscf_component_add_slice(BasicRoutingStateReplicator ../local-slice/BasicRoutingStateReplicationIf.ice)
+astscf_component_add_files(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
+astscf_component_add_slices(BasicRoutingStateReplicator PROJECT BasicRoutingStateReplicationIf.ice)
astscf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
astscf_component_build_icebox(BasicRoutingStateReplicator)
-target_link_libraries(BasicRoutingStateReplicator logging-client)
-target_link_libraries(BasicRoutingStateReplicator asterisk-scf-api)
+target_link_libraries(BasicRoutingStateReplicator logging-client astscf-api)
astscf_component_install(BasicRoutingStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bec7266..37324e7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,20 +2,20 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
astscf_component_init(RoutingTest)
-astscf_component_add_file(RoutingTest TestRouting.cpp)
-astscf_component_add_file(RoutingTest SharedTestData.h)
-astscf_component_add_file(RoutingTest MockBridgeManager.h)
-astscf_component_add_file(RoutingTest MockBridgeManager.cpp)
-astscf_component_add_file(RoutingTest MockBridge.h)
-astscf_component_add_file(RoutingTest MockBridge.cpp)
-astscf_component_add_file(RoutingTest MockSession.h)
-astscf_component_add_file(RoutingTest MockSession.cpp)
-astscf_component_add_file(RoutingTest MockSessionEndpoint.h)
-astscf_component_add_file(RoutingTest MockSessionEndpoint.cpp)
-astscf_component_add_file(RoutingTest MockEndpointLocator.h)
-astscf_component_add_file(RoutingTest MockEndpointLocator.cpp)
+astscf_component_add_files(RoutingTest TestRouting.cpp)
+astscf_component_add_files(RoutingTest SharedTestData.h)
+astscf_component_add_files(RoutingTest MockBridgeManager.h)
+astscf_component_add_files(RoutingTest MockBridgeManager.cpp)
+astscf_component_add_files(RoutingTest MockBridge.h)
+astscf_component_add_files(RoutingTest MockBridge.cpp)
+astscf_component_add_files(RoutingTest MockSession.h)
+astscf_component_add_files(RoutingTest MockSession.cpp)
+astscf_component_add_files(RoutingTest MockSessionEndpoint.h)
+astscf_component_add_files(RoutingTest MockSessionEndpoint.cpp)
+astscf_component_add_files(RoutingTest MockEndpointLocator.h)
+astscf_component_add_files(RoutingTest MockEndpointLocator.cpp)
astscf_component_add_ice_libraries(RoutingTest IceStorm)
astscf_component_add_boost_libraries(RoutingTest unit_test_framework)
astscf_component_build_icebox(RoutingTest)
-target_link_libraries(RoutingTest asterisk-scf-api)
+target_link_libraries(RoutingTest astscf-api)
astscf_test_icebox(RoutingTest config/routingtest-integ.config)
commit 3fa16f2e43b041ecb0fe7a5f3c6de2da8adb2520
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 3 15:20:33 2011 -0500
Accommodate change from ASTERISK_SCF_ICEBOX_EXPORT to ASTSCF_DLL_EXPORT.
diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index 99f1669..32c6ff9 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -819,7 +819,7 @@ void BasicRoutingServiceApp::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(::Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(::Ice::CommunicatorPtr)
{
return new AsteriskSCF::BasicRoutingService::BasicRoutingServiceApp;
}
diff --git a/src/BasicRoutingStateReplicatorApp.cpp b/src/BasicRoutingStateReplicatorApp.cpp
index 22fdab0..5fc57a6 100644
--- a/src/BasicRoutingStateReplicatorApp.cpp
+++ b/src/BasicRoutingStateReplicatorApp.cpp
@@ -348,7 +348,7 @@ void BasicRoutingStateReplicatorService::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr )
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr )
{
return new BasicRoutingStateReplicatorService;
}
commit 98c3600ed137bf106fb0a0b867e726703bae791e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cb24a5..35e9749 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_project(RoutingService 3.4)
+astscf_project(RoutingService 3.4)
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53674ea..3bcbbb9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,58 +6,58 @@ include_directories(${ice-util-cpp_dir}/include)
find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(BasicRoutingService)
-asterisk_scf_component_add_slice(BasicRoutingService ../local-slice/BasicRoutingStateReplicationIf.ice)
-asterisk_scf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
-asterisk_scf_component_add_file(BasicRoutingService SessionRouter.cpp)
-asterisk_scf_component_add_file(BasicRoutingService SessionRouter.h)
-asterisk_scf_component_add_file(BasicRoutingService RoutingAdmin.cpp)
-asterisk_scf_component_add_file(BasicRoutingService RoutingAdmin.h)
-asterisk_scf_component_add_file(BasicRoutingService EndpointRegistry.cpp)
-asterisk_scf_component_add_file(BasicRoutingService EndpointRegistry.h)
-asterisk_scf_component_add_file(BasicRoutingService ScriptProcessor.h)
-asterisk_scf_component_add_file(BasicRoutingService LuaScriptProcessor.cpp)
-asterisk_scf_component_add_file(BasicRoutingService LuaScriptProcessor.h)
-asterisk_scf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.cpp)
-asterisk_scf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.h)
-asterisk_scf_component_add_file(BasicRoutingService SessionRouterOperation.h)
-asterisk_scf_component_add_file(BasicRoutingService SessionRouterOperation.cpp)
-asterisk_scf_component_add_file(BasicRoutingService RouteSessionOperation.h)
-asterisk_scf_component_add_file(BasicRoutingService RouteSessionOperation.cpp)
-asterisk_scf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.h)
-asterisk_scf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.cpp)
-asterisk_scf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.h)
-asterisk_scf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.cpp)
-asterisk_scf_component_add_file(BasicRoutingService SessionListener.h)
-asterisk_scf_component_add_file(BasicRoutingService SessionListener.cpp)
-asterisk_scf_component_add_file(BasicRoutingService OperationReplicaCache.h)
-asterisk_scf_component_add_file(BasicRoutingService OperationReplicaCache.cpp)
-asterisk_scf_component_add_file(BasicRoutingService ReplicationContext.h)
-asterisk_scf_component_add_file(BasicRoutingService ReplicationContext.cpp)
-asterisk_scf_component_add_file(BasicRoutingService TestContext.h)
-asterisk_scf_component_add_file(BasicRoutingService TestContext.cpp)
-asterisk_scf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.h)
-asterisk_scf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.cpp)
-asterisk_scf_component_add_ice_libraries(BasicRoutingService IceStorm)
-asterisk_scf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
-asterisk_scf_component_build_icebox(BasicRoutingService)
+astscf_component_init(BasicRoutingService)
+astscf_component_add_slice(BasicRoutingService ../local-slice/BasicRoutingStateReplicationIf.ice)
+astscf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
+astscf_component_add_file(BasicRoutingService SessionRouter.cpp)
+astscf_component_add_file(BasicRoutingService SessionRouter.h)
+astscf_component_add_file(BasicRoutingService RoutingAdmin.cpp)
+astscf_component_add_file(BasicRoutingService RoutingAdmin.h)
+astscf_component_add_file(BasicRoutingService EndpointRegistry.cpp)
+astscf_component_add_file(BasicRoutingService EndpointRegistry.h)
+astscf_component_add_file(BasicRoutingService ScriptProcessor.h)
+astscf_component_add_file(BasicRoutingService LuaScriptProcessor.cpp)
+astscf_component_add_file(BasicRoutingService LuaScriptProcessor.h)
+astscf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.cpp)
+astscf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.h)
+astscf_component_add_file(BasicRoutingService SessionRouterOperation.h)
+astscf_component_add_file(BasicRoutingService SessionRouterOperation.cpp)
+astscf_component_add_file(BasicRoutingService RouteSessionOperation.h)
+astscf_component_add_file(BasicRoutingService RouteSessionOperation.cpp)
+astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.h)
+astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsWithDestinationOperation.cpp)
+astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.h)
+astscf_component_add_file(BasicRoutingService ConnectBridgedSessionsOperation.cpp)
+astscf_component_add_file(BasicRoutingService SessionListener.h)
+astscf_component_add_file(BasicRoutingService SessionListener.cpp)
+astscf_component_add_file(BasicRoutingService OperationReplicaCache.h)
+astscf_component_add_file(BasicRoutingService OperationReplicaCache.cpp)
+astscf_component_add_file(BasicRoutingService ReplicationContext.h)
+astscf_component_add_file(BasicRoutingService ReplicationContext.cpp)
+astscf_component_add_file(BasicRoutingService TestContext.h)
+astscf_component_add_file(BasicRoutingService TestContext.cpp)
+astscf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.h)
+astscf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.cpp)
+astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
+astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
+astscf_component_build_icebox(BasicRoutingService)
target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
target_link_libraries(BasicRoutingService logging-client)
target_link_libraries(BasicRoutingService Threading)
target_link_libraries(BasicRoutingService asterisk-scf-api)
-asterisk_scf_component_install(BasicRoutingService)
+astscf_component_install(BasicRoutingService)
-asterisk_scf_component_init(BasicRoutingStateReplicator)
-asterisk_scf_component_add_slice(BasicRoutingStateReplicator ServiceLocatorIf)
-asterisk_scf_component_add_slice(BasicRoutingStateReplicator ComponentServiceIf)
-asterisk_scf_component_add_slice(BasicRoutingStateReplicator BasicRoutingStateReplicationIf)
-asterisk_scf_component_add_slice(BasicRoutingStateReplicator RoutingIf)
-asterisk_scf_component_add_file(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
-asterisk_scf_component_add_slice(BasicRoutingStateReplicator ../local-slice/BasicRoutingStateReplicationIf.ice)
-asterisk_scf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
-asterisk_scf_component_build_icebox(BasicRoutingStateReplicator)
+astscf_component_init(BasicRoutingStateReplicator)
+astscf_component_add_slice(BasicRoutingStateReplicator ServiceLocatorIf)
+astscf_component_add_slice(BasicRoutingStateReplicator ComponentServiceIf)
+astscf_component_add_slice(BasicRoutingStateReplicator BasicRoutingStateReplicationIf)
+astscf_component_add_slice(BasicRoutingStateReplicator RoutingIf)
+astscf_component_add_file(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
+astscf_component_add_slice(BasicRoutingStateReplicator ../local-slice/BasicRoutingStateReplicationIf.ice)
+astscf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
+astscf_component_build_icebox(BasicRoutingStateReplicator)
target_link_libraries(BasicRoutingStateReplicator logging-client)
target_link_libraries(BasicRoutingStateReplicator asterisk-scf-api)
-asterisk_scf_component_install(BasicRoutingStateReplicator)
+astscf_component_install(BasicRoutingStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9eaa29e..bec7266 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,21 +1,21 @@
include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
-asterisk_scf_component_init(RoutingTest)
-asterisk_scf_component_add_file(RoutingTest TestRouting.cpp)
-asterisk_scf_component_add_file(RoutingTest SharedTestData.h)
-asterisk_scf_component_add_file(RoutingTest MockBridgeManager.h)
-asterisk_scf_component_add_file(RoutingTest MockBridgeManager.cpp)
-asterisk_scf_component_add_file(RoutingTest MockBridge.h)
-asterisk_scf_component_add_file(RoutingTest MockBridge.cpp)
-asterisk_scf_component_add_file(RoutingTest MockSession.h)
-asterisk_scf_component_add_file(RoutingTest MockSession.cpp)
-asterisk_scf_component_add_file(RoutingTest MockSessionEndpoint.h)
-asterisk_scf_component_add_file(RoutingTest MockSessionEndpoint.cpp)
-asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.h)
-asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.cpp)
-asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
-asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
-asterisk_scf_component_build_icebox(RoutingTest)
+astscf_component_init(RoutingTest)
+astscf_component_add_file(RoutingTest TestRouting.cpp)
+astscf_component_add_file(RoutingTest SharedTestData.h)
+astscf_component_add_file(RoutingTest MockBridgeManager.h)
+astscf_component_add_file(RoutingTest MockBridgeManager.cpp)
+astscf_component_add_file(RoutingTest MockBridge.h)
+astscf_component_add_file(RoutingTest MockBridge.cpp)
+astscf_component_add_file(RoutingTest MockSession.h)
+astscf_component_add_file(RoutingTest MockSession.cpp)
+astscf_component_add_file(RoutingTest MockSessionEndpoint.h)
+astscf_component_add_file(RoutingTest MockSessionEndpoint.cpp)
+astscf_component_add_file(RoutingTest MockEndpointLocator.h)
+astscf_component_add_file(RoutingTest MockEndpointLocator.cpp)
+astscf_component_add_ice_libraries(RoutingTest IceStorm)
+astscf_component_add_boost_libraries(RoutingTest unit_test_framework)
+astscf_component_build_icebox(RoutingTest)
target_link_libraries(RoutingTest asterisk-scf-api)
-asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
+astscf_test_icebox(RoutingTest config/routingtest-integ.config)
commit 677904c4cbc3b187bf95d79c9d617d4296d6a67c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 16:04:55 2011 -0500
Allow user to disable building of tests.
The CTest module offers a BUILD_TESTING option; if the user turns this option
off, we shouldn't bother building any of our tests.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fc6950..0cb24a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
asterisk_scf_project(RoutingService 3.4)
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
commit 8b001d8a60ab6461de7576a50b64c224224ce2af
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 15:10:37 2011 -0500
Remove directories used for submodules.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6b980ad..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "slice"]
- path = slice
- url = ../../integration/slice
-[submodule "cmake"]
- path = cmake
- url = ../../release/cmake
-[submodule "logger"]
- path = logger
- url = git at git.asterisk.org:asterisk-scf/integration/logger
diff --git a/cmake b/cmake
deleted file mode 160000
index cd39ae8..0000000
--- a/cmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cd39ae824f03a19dc934709caee21e930f3b9988
diff --git a/logger b/logger
deleted file mode 160000
index e376034..0000000
--- a/logger
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e376034d1791e30821dc5f37bd64fd155643d478
diff --git a/slice b/slice
deleted file mode 160000
index bdfc399..0000000
--- a/slice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
-----------------------------------------------------------------------
--
asterisk-scf/release/routing.git
More information about the asterisk-scf-commits
mailing list