[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 18:57:02 CDT 2010
branch "master" has been updated
via 8e75cc2bc788e16acd3b6cb219284da261d111ab (commit)
from d4c31d85cb3e32eaa9e723ab82e572a841ff0565 (commit)
Summary of changes:
CMakeLists.txt | 4 +-
cmake | 2 +-
logger | 2 +-
slice | 2 +-
src/BasicRoutingServiceApp.cpp | 2 +-
src/CMakeLists.txt | 48 ++++++++++++++++++++--------------------
test/CMakeLists.txt | 38 +++++++++++++++---------------
test/TestRouting.cpp | 2 +-
8 files changed, 50 insertions(+), 50 deletions(-)
- Log -----------------------------------------------------------------
commit 8e75cc2bc788e16acd3b6cb219284da261d111ab
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 18:55:29 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92503d7..a0fd807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure. Make sure your submodules are pulled.
+ # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4 of Ice.
- hydra_project(RoutingService 3.4 CXX)
+ asterisk_scf_project(RoutingService 3.4 CXX)
# Take care of slice definitions
add_subdirectory(slice)
diff --git a/cmake b/cmake
index 17066de..cd39ae8 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
+Subproject commit cd39ae824f03a19dc934709caee21e930f3b9988
diff --git a/logger b/logger
index 0cc0c02..e376034 160000
--- a/logger
+++ b/logger
@@ -1 +1 @@
-Subproject commit 0cc0c02a16e404b94d54c8cb6736dee14a671352
+Subproject commit e376034d1791e30821dc5f37bd64fd155643d478
diff --git a/slice b/slice
index 03ea08a..bdfc399 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
+Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index cc92018..b35eed0 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -364,7 +364,7 @@ void BasicRoutingServiceApp::stop()
extern "C"
{
- HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new AsteriskSCF::BasicRoutingService::BasicRoutingServiceApp;
}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b51a6d7..0a3f840 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,29 +1,29 @@
# Create the actual standalone basic routing component
-hydra_component_init(BasicRoutingService CXX)
+asterisk_scf_component_init(BasicRoutingService CXX)
find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
-hydra_component_add_slice(BasicRoutingService RoutingIf)
-hydra_component_add_slice(BasicRoutingService ServiceLocatorIf)
-hydra_component_add_slice(BasicRoutingService EndpointIf)
-hydra_component_add_slice(BasicRoutingService SessionCommunicationsIf)
-hydra_component_add_slice(BasicRoutingService ComponentServiceIf)
-hydra_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
-hydra_component_add_file(BasicRoutingService SessionRouter.cpp)
-hydra_component_add_file(BasicRoutingService SessionRouter.h)
-hydra_component_add_file(BasicRoutingService RoutingAdmin.cpp)
-hydra_component_add_file(BasicRoutingService RoutingAdmin.h)
-hydra_component_add_file(BasicRoutingService EndpointRegistry.cpp)
-hydra_component_add_file(BasicRoutingService EndpointRegistry.h)
-hydra_component_add_file(BasicRoutingService ScriptProcessor.h)
-hydra_component_add_file(BasicRoutingService LuaScriptProcessor.cpp)
-hydra_component_add_file(BasicRoutingService LuaScriptProcessor.h)
-hydra_component_add_file(BasicRoutingService RoutingServiceEventPublisher.cpp)
-hydra_component_add_file(BasicRoutingService RoutingServiceEventPublisher.h)
-hydra_component_add_file(BasicRoutingService BridgeManagerAccessor.cpp)
-hydra_component_add_file(BasicRoutingService BridgeManagerAccessor.h)
+asterisk_scf_component_add_slice(BasicRoutingService RoutingIf)
+asterisk_scf_component_add_slice(BasicRoutingService ServiceLocatorIf)
+asterisk_scf_component_add_slice(BasicRoutingService EndpointIf)
+asterisk_scf_component_add_slice(BasicRoutingService SessionCommunicationsIf)
+asterisk_scf_component_add_slice(BasicRoutingService ComponentServiceIf)
+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 BridgeManagerAccessor.cpp)
+asterisk_scf_component_add_file(BasicRoutingService BridgeManagerAccessor.h)
-hydra_component_add_ice_libraries(BasicRoutingService IceStorm)
-hydra_component_add_boost_libraries(BasicRoutingService thread core regex)
+asterisk_scf_component_add_ice_libraries(BasicRoutingService IceStorm)
+asterisk_scf_component_add_boost_libraries(BasicRoutingService thread core regex)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -31,8 +31,8 @@ endif()
include_directories(${logger_dir}/common)
include_directories(${logger_dir}/client/src)
-hydra_component_build_icebox(BasicRoutingService)
+asterisk_scf_component_build_icebox(BasicRoutingService)
target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
target_link_libraries(BasicRoutingService logging-client)
-#hydra_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
+#asterisk_scf_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0450b1b..fca99ba 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,25 +1,25 @@
# Create Basic Routing Service test project.
-hydra_component_init(RoutingTest CXX)
-hydra_component_add_slice(RoutingTest RoutingIf)
-hydra_component_add_slice(RoutingTest ServiceLocatorIf)
-hydra_component_add_slice(RoutingTest SessionCommunicationsIf)
+asterisk_scf_component_init(RoutingTest CXX)
+asterisk_scf_component_add_slice(RoutingTest RoutingIf)
+asterisk_scf_component_add_slice(RoutingTest ServiceLocatorIf)
+asterisk_scf_component_add_slice(RoutingTest SessionCommunicationsIf)
-hydra_component_add_file(RoutingTest TestRouting.cpp)
-hydra_component_add_file(RoutingTest SharedTestData.h)
-hydra_component_add_file(RoutingTest MockBridgeManager.h)
-hydra_component_add_file(RoutingTest MockBridgeManager.cpp)
-hydra_component_add_file(RoutingTest MockBridge.h)
-hydra_component_add_file(RoutingTest MockBridge.cpp)
-hydra_component_add_file(RoutingTest MockSession.h)
-hydra_component_add_file(RoutingTest MockSession.cpp)
-hydra_component_add_file(RoutingTest MockSessionEndpoint.h)
-hydra_component_add_file(RoutingTest MockSessionEndpoint.cpp)
-hydra_component_add_file(RoutingTest MockEndpointLocator.h)
-hydra_component_add_file(RoutingTest MockEndpointLocator.cpp)
+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)
-hydra_component_add_ice_libraries(RoutingTest IceStorm)
-hydra_component_add_boost_libraries(RoutingTest unit_test_framework)
-hydra_component_build_icebox(RoutingTest)
+asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
+asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
+asterisk_scf_component_build_icebox(RoutingTest)
if(integrated_build STREQUAL "true")
icebox_add_test(RoutingTest ../config/routingtest-integ.config)
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 3857388..bf51511 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -79,7 +79,7 @@ void RoutingServiceTest::stop()
extern "C"
{
- HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new RoutingServiceTest;
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/routing.git
More information about the asterisk-scf-commits
mailing list