[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 18:56:28 CDT 2010
branch "master" has been updated
via c6b8e697b1163c9866cebe216cdff53aa629614c (commit)
from ff2a953a1b3fe8a3ef15397934aaee940ce6ecaf (commit)
Summary of changes:
CMakeLists.txt | 4 ++--
cmake | 2 +-
slice | 2 +-
src/CMakeLists.txt | 30 +++++++++++++++---------------
src/ServiceLocator.cpp | 4 ++--
test/CMakeLists.txt | 18 +++++++++---------
6 files changed, 30 insertions(+), 30 deletions(-)
- Log -----------------------------------------------------------------
commit c6b8e697b1163c9866cebe216cdff53aa629614c
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 18:58:03 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f2d329..2505d99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure
+ # Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4
- hydra_project(service_locator 3.4 CXX)
+ asterisk_scf_project(service_locator 3.4 CXX)
# Take care of slice definitions
add_subdirectory(slice EXCLUDE_FROM_ALL)
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/slice b/slice
index 03ea08a..bdfc399 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
+Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44f0558..146f2aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,23 +7,23 @@
#
# Create the actual standalone service locator component
-hydra_component_init(service_locator CXX)
+asterisk_scf_component_init(service_locator CXX)
-hydra_component_add_slice(service_locator ServiceLocatorIf)
-hydra_component_add_slice(service_locator ServiceLocatorEventsIf)
+asterisk_scf_component_add_slice(service_locator ServiceLocatorIf)
+asterisk_scf_component_add_slice(service_locator ServiceLocatorEventsIf)
-hydra_component_add_file(service_locator ServiceLocator.cpp)
-hydra_component_add_file(service_locator ServiceLocatorManagement.cpp)
-hydra_component_add_file(service_locator ServiceManagement.cpp)
-hydra_component_add_file(service_locator CollocatedIceStorm.cpp)
-hydra_component_add_file(service_locator CollocatedIceStorm.h)
-hydra_component_add_file(service_locator ServiceManagement.h)
-hydra_component_add_file(service_locator ServiceLocatorManagement.h)
+asterisk_scf_component_add_file(service_locator ServiceLocator.cpp)
+asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.cpp)
+asterisk_scf_component_add_file(service_locator ServiceManagement.cpp)
+asterisk_scf_component_add_file(service_locator CollocatedIceStorm.cpp)
+asterisk_scf_component_add_file(service_locator CollocatedIceStorm.h)
+asterisk_scf_component_add_file(service_locator ServiceManagement.h)
+asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.h)
-hydra_component_add_ice_libraries(service_locator IceStorm)
-hydra_component_add_ice_libraries(service_locator IceBox)
+asterisk_scf_component_add_ice_libraries(service_locator IceStorm)
+asterisk_scf_component_add_ice_libraries(service_locator IceBox)
-hydra_component_add_boost_libraries(service_locator core thread)
+asterisk_scf_component_add_boost_libraries(service_locator core thread)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -31,6 +31,6 @@ endif()
include_directories(${logger_dir}/common)
include_directories(${logger_dir}/client/src)
-hydra_component_build_icebox(service_locator)
+asterisk_scf_component_build_icebox(service_locator)
target_link_libraries(service_locator logging-client)
-#hydra_component_install(service_locator RUNTIME bin "Service Locator." Core)
+#asterisk_scf_component_install(service_locator RUNTIME bin "Service Locator." Core)
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 8697581..213b649 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -93,7 +93,7 @@ Ice::ObjectProxySeq ServiceLocatorImpl::locateAll(const ServiceLocatorParamsPtr&
void ServiceLocatorApp::start(const string& name, const Ice::CommunicatorPtr& communicator,
const Ice::StringSeq& args)
{
- mIceStorm = new AsteriskSCF::ServiceDiscovery::CollocatedIceStorm("HydraIceStorm", communicator->getProperties());
+ mIceStorm = new AsteriskSCF::ServiceDiscovery::CollocatedIceStorm("AsteriskSCFIceStorm", communicator->getProperties());
lg(Info) << "Initializing service discovery component";
@@ -198,7 +198,7 @@ void ServiceLocatorApp::stop()
extern "C"
{
- HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new ServiceLocatorApp;
}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fe5540b..e868a5a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,18 +7,18 @@
#
# Create the actual standalone service locator test driver component
-hydra_component_init(service_locator_test CXX)
-hydra_component_add_slice(service_locator_test ServiceLocatorIf)
-hydra_component_add_slice(service_locator_test ServiceLocatorEventsIf)
-hydra_component_add_file(service_locator_test TestServiceLocator.cpp)
-hydra_component_add_ice_libraries(service_locator_test IceStorm)
-hydra_component_add_boost_libraries(service_locator_test unit_test_framework)
-hydra_component_build_icebox(service_locator_test)
-#hydra_component_install(service_locator_test RUNTIME bin "Service Locator Test Driver." Core)
+asterisk_scf_component_init(service_locator_test CXX)
+asterisk_scf_component_add_slice(service_locator_test ServiceLocatorIf)
+asterisk_scf_component_add_slice(service_locator_test ServiceLocatorEventsIf)
+asterisk_scf_component_add_file(service_locator_test TestServiceLocator.cpp)
+asterisk_scf_component_add_ice_libraries(service_locator_test IceStorm)
+asterisk_scf_component_add_boost_libraries(service_locator_test unit_test_framework)
+asterisk_scf_component_build_icebox(service_locator_test)
+#asterisk_scf_component_install(service_locator_test RUNTIME bin "Service Locator Test Driver." Core)
icebox_add_test(service_locator_test config/test_component.config)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HydraIceStorm)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)
# Copy our test config file to make it available in the test directory.
# CMake does a bit of search-and-replace, as well.
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list