[asterisk-scf-commits] asterisk-scf/release/servicediscovery.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 319c1b4439acfb3f28e524da673c4b434e3e78ee (commit)
via 48009bb4fd430cc800b6a24e4917d9a73b83fa36 (commit)
via 9e1c696302da2ca71ebf9e9179de942eface5289 (commit)
via 99ce1d4026d48638a394eaa147639b5f8f1cdef1 (commit)
via 4cba5c90fa6d211279477fd401d204c15d677277 (commit)
via dd09277c87324c95bb65205dbd727715c0995cef (commit)
via 955fdfafd81174e168604e7499cb9cb16d0226ed (commit)
via 21d2f9f40890c86df42ac4fa07b308fd7a87f459 (commit)
from 0d46bc10161fc5f1e93d2786c152915675c6ddce (commit)
Summary of changes:
.gitmodules | 9 ---
CMakeLists.txt | 7 ++-
cmake | 1 -
logger | 1 -
slice | 1 -
.../ServiceLocatorStateReplicationIf.ice | 16 +++---
src/CMakeLists.txt | 52 +++++++++-----------
src/ServiceLocator.cpp | 3 +-
src/ServiceLocatorManagement.cpp | 5 +-
src/ServiceLocatorManagement.h | 6 +-
src/ServiceLocatorStateListener.cpp | 1 +
src/ServiceLocatorStateReplicator.h | 10 ++--
src/ServiceLocatorStateReplicatorApp.cpp | 2 +-
src/ServiceManagement.cpp | 1 +
test/CMakeLists.txt | 18 +++----
test/TestServiceLocator.cpp | 2 +-
16 files changed, 62 insertions(+), 73 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 160000 logger
delete mode 160000 slice
rename {local-slice => slice/AsteriskSCF/Replication/ServiceLocator}/ServiceLocatorStateReplicationIf.ice (86%)
- Log -----------------------------------------------------------------
commit 319c1b4439acfb3f28e524da673c4b434e3e78ee
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 0463db9..e57bafc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
astscf_component_init(service_locator)
commit 48009bb4fd430cc800b6a24e4917d9a73b83fa36
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 f12d74d..0ca4b77 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/ServiceLocatorStateReplicationIf.ice b/slice/AsteriskSCF/Replication/ServiceLocator/ServiceLocatorStateReplicationIf.ice
similarity index 86%
rename from slice/ServiceLocatorStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/ServiceLocator/ServiceLocatorStateReplicationIf.ice
index c0fc4e2..3ec0dd1 100644
--- a/slice/ServiceLocatorStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/ServiceLocator/ServiceLocatorStateReplicationIf.ice
@@ -23,10 +23,10 @@
module AsteriskSCF
{
-module Core
+module Replication
{
-module Discovery
+module ServiceLocator
{
["suppress"]
@@ -66,20 +66,20 @@ module V1
class ServiceLocatorParamsStateItem extends ServiceLocatorStateItem
{
string serviceKey;
- ServiceLocatorParams params;
+ AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams params;
string compareGuid;
};
class ServiceLocatorComparatorStateItem extends ServiceLocatorStateItem
{
string name;
- ServiceLocatorParamsCompare *comparator;
+ AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsCompare *comparator;
};
-}; //module V1
+}; /* module V1 */
-}; //module Discovery
+}; /* module ServiceLocator */
-}; //module Core
+}; /* module Replication */
-}; //module Asterisk SCF
+}; /* module AsteriskSCF */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f852f54..0463db9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
astscf_component_init(service_locator)
-astscf_component_add_slices(service_locator PROJECT ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_slices(service_locator PROJECT AsteriskSCF/Replication/ServiceLocator/ServiceLocatorStateReplicationIf.ice)
astscf_component_add_files(service_locator ServiceLocator.cpp)
astscf_component_add_files(service_locator ServiceLocatorManagement.cpp)
astscf_component_add_files(service_locator ServiceManagement.cpp)
@@ -19,7 +19,7 @@ target_link_libraries(service_locator logging-client)
astscf_component_install(service_locator)
astscf_component_init(ServiceLocatorStateReplicator)
-astscf_component_add_slices(ServiceLocatorStateReplicator PROJECT ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_slices(ServiceLocatorStateReplicator PROJECT AsteriskSCF/Replication/ServiceLocator/ServiceLocatorStateReplicationIf.ice)
astscf_component_add_files(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
astscf_component_add_files(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
astscf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index f075227..ab3bb0d 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -33,6 +33,7 @@ using namespace std;
using namespace AsteriskSCF::System::Discovery;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Replication::ServiceLocator::V1;
using namespace AsteriskSCF::ServiceDiscovery;
using namespace AsteriskSCF::System::Component::V1;
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index b1cfe2a..28168cd 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -34,6 +34,7 @@ using namespace std;
using namespace AsteriskSCF::System::Discovery;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Replication::ServiceLocator::V1;
using namespace AsteriskSCF::ServiceDiscovery;
using namespace AsteriskSCF;
@@ -585,7 +586,7 @@ void ServiceLocatorManagementImpl::removeService(
/**
* Function which replicates state items.
*/
-void ServiceLocatorManagementImpl::replicateState(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemPtr& item)
+void ServiceLocatorManagementImpl::replicateState(const ServiceLocatorStateItemPtr& item)
{
if (!item)
{
@@ -615,7 +616,7 @@ void ServiceLocatorManagementImpl::replicateState(const AsteriskSCF::Core::Disco
/**
* Function which removes state items from the replicator.
*/
-void ServiceLocatorManagementImpl::removeState(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemPtr& item)
+void ServiceLocatorManagementImpl::removeState(const ServiceLocatorStateItemPtr& item)
{
if (!item)
{
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 2251ad5..468565f 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -79,9 +79,9 @@ public:
// Replication related functions.
ServiceManagementImplPtr addService(const Ice::ObjectPrx&, const std::string&, const
Ice::Identity&);
- void replicateState(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemPtr&);
- void removeState(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemPtr&);
- void setStateReplicator(AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateReplicatorPrx);
+ void replicateState(const AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateItemPtr&);
+ void removeState(const AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateItemPtr&);
+ void setStateReplicator(AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateReplicatorPrx);
//
// AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagement interface.
diff --git a/src/ServiceLocatorStateListener.cpp b/src/ServiceLocatorStateListener.cpp
index b5f9733..a549e3b 100644
--- a/src/ServiceLocatorStateListener.cpp
+++ b/src/ServiceLocatorStateListener.cpp
@@ -31,6 +31,7 @@
#include "ServiceLocatorStateReplicator.h"
using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Replication::ServiceLocator::V1;
using namespace AsteriskSCF::ServiceDiscovery;
class ServiceLocatorStateReplicatorItem
diff --git a/src/ServiceLocatorStateReplicator.h b/src/ServiceLocatorStateReplicator.h
index cb102d3..8b64b67 100644
--- a/src/ServiceLocatorStateReplicator.h
+++ b/src/ServiceLocatorStateReplicator.h
@@ -29,20 +29,20 @@
struct ServiceLocatorStateReplicatorListenerImpl;
typedef AsteriskSCF::Replication::StateReplicator<
- AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateReplicator,
- AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemPtr,
+ AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateReplicator,
+ AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateItemPtr,
std::string,
- AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateReplicatorListenerPrx>
+ AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateReplicatorListenerPrx>
ServiceLocatorStateReplicatorI;
typedef IceUtil::Handle<ServiceLocatorStateReplicatorI> ServiceLocatorStateReplicatorIPtr;
class ServiceLocatorStateReplicatorListenerI :
- public AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateReplicatorListener
+ public AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateReplicatorListener
{
public:
ServiceLocatorStateReplicatorListenerI(const AsteriskSCF::ServiceDiscovery::ServiceLocatorManagementImplPtr&);
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateSet(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::Replication::ServiceLocator::V1::ServiceLocatorStateItemSeq&, const Ice::Current&);
bool operator==(const ServiceLocatorStateReplicatorListenerI& rhs);
private:
boost::shared_ptr<ServiceLocatorStateReplicatorListenerImpl> mImpl;
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 3406157..00397f1 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -33,6 +33,7 @@
using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Replication::ServiceLocator::V1;
using namespace AsteriskSCF::ServiceDiscovery;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF;
commit 9e1c696302da2ca71ebf9e9179de942eface5289
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 a342ae1..f852f54 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index be6e6a9..d5cf790 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,10 @@
-include_directories(${API_INCLUDE_DIR})
-
astscf_component_init(service_locator_test)
astscf_component_add_files(service_locator_test TestServiceLocator.cpp)
astscf_component_add_files(service_locator_test TestComparatorBlocking.cpp)
astscf_component_add_ice_libraries(service_locator_test IceStorm)
astscf_component_add_boost_libraries(service_locator_test unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(service_locator_test ASTSCF)
astscf_component_build_icebox(service_locator_test)
-target_link_libraries(service_locator_test astscf-api)
astscf_test_icebox(service_locator_test config/test_component.config)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)
commit 99ce1d4026d48638a394eaa147639b5f8f1cdef1
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/ServiceLocatorStateReplicationIf.ice b/slice/ServiceLocatorStateReplicationIf.ice
similarity index 100%
rename from local-slice/ServiceLocatorStateReplicationIf.ice
rename to slice/ServiceLocatorStateReplicationIf.ice
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20197c9..a342ae1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,30 +2,27 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(service_locator)
-astscf_component_add_slice(service_locator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-astscf_component_add_file(service_locator ServiceLocator.cpp)
-astscf_component_add_file(service_locator ServiceLocatorManagement.cpp)
-astscf_component_add_file(service_locator ServiceManagement.cpp)
-astscf_component_add_file(service_locator CollocatedIceStorm.cpp)
-astscf_component_add_file(service_locator CollocatedIceStorm.h)
-astscf_component_add_file(service_locator ServiceManagement.h)
-astscf_component_add_file(service_locator ServiceLocatorManagement.h)
-astscf_component_add_file(service_locator ServiceLocatorStateReplicator.h)
-astscf_component_add_file(service_locator ServiceLocatorStateListener.cpp)
+astscf_component_add_slices(service_locator PROJECT ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_files(service_locator ServiceLocator.cpp)
+astscf_component_add_files(service_locator ServiceLocatorManagement.cpp)
+astscf_component_add_files(service_locator ServiceManagement.cpp)
+astscf_component_add_files(service_locator CollocatedIceStorm.cpp)
+astscf_component_add_files(service_locator CollocatedIceStorm.h)
+astscf_component_add_files(service_locator ServiceManagement.h)
+astscf_component_add_files(service_locator ServiceLocatorManagement.h)
+astscf_component_add_files(service_locator ServiceLocatorStateReplicator.h)
+astscf_component_add_files(service_locator ServiceLocatorStateListener.cpp)
astscf_component_add_ice_libraries(service_locator IceStorm)
-astscf_component_add_ice_libraries(service_locator IceBox)
astscf_component_add_boost_libraries(service_locator core thread date_time)
astscf_component_build_icebox(service_locator)
target_link_libraries(service_locator logging-client)
astscf_component_install(service_locator)
astscf_component_init(ServiceLocatorStateReplicator)
-astscf_component_add_slice(ServiceLocatorStateReplicator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-astscf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
-astscf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
+astscf_component_add_slices(ServiceLocatorStateReplicator PROJECT ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_files(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
+astscf_component_add_files(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
astscf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
astscf_component_add_boost_libraries(ServiceLocatorStateReplicator thread date_time)
astscf_component_build_icebox(ServiceLocatorStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2a67a65..be6e6a9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,12 @@
include_directories(${API_INCLUDE_DIR})
astscf_component_init(service_locator_test)
-astscf_component_add_file(service_locator_test TestServiceLocator.cpp)
-astscf_component_add_file(service_locator_test TestComparatorBlocking.cpp)
+astscf_component_add_files(service_locator_test TestServiceLocator.cpp)
+astscf_component_add_files(service_locator_test TestComparatorBlocking.cpp)
astscf_component_add_ice_libraries(service_locator_test IceStorm)
astscf_component_add_boost_libraries(service_locator_test unit_test_framework thread date_time)
astscf_component_build_icebox(service_locator_test)
-target_link_libraries(service_locator_test asterisk-scf-api)
+target_link_libraries(service_locator_test astscf-api)
astscf_test_icebox(service_locator_test config/test_component.config)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)
commit 4cba5c90fa6d211279477fd401d204c15d677277
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/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 59274ab..f075227 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -304,7 +304,7 @@ void ServiceLocatorApp::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new ServiceLocatorApp;
}
diff --git a/src/ServiceLocatorStateReplicatorApp.cpp b/src/ServiceLocatorStateReplicatorApp.cpp
index cc2aab4..93bd340 100644
--- a/src/ServiceLocatorStateReplicatorApp.cpp
+++ b/src/ServiceLocatorStateReplicatorApp.cpp
@@ -114,7 +114,7 @@ void ServiceLocatorStateReplicatorService::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new ServiceLocatorStateReplicatorService;
}
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index 85a8cbf..8016b04 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -761,7 +761,7 @@ void ServiceLocatorTest::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new ServiceLocatorTest;
}
commit dd09277c87324c95bb65205dbd727715c0995cef
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 213cb26..f12d74d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_project(service_locator 3.4)
+astscf_project(service_locator 3.4)
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d45ea7..20197c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,32 +2,32 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(service_locator)
-asterisk_scf_component_add_slice(service_locator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-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)
-asterisk_scf_component_add_file(service_locator ServiceLocatorStateReplicator.h)
-asterisk_scf_component_add_file(service_locator ServiceLocatorStateListener.cpp)
-asterisk_scf_component_add_ice_libraries(service_locator IceStorm)
-asterisk_scf_component_add_ice_libraries(service_locator IceBox)
-asterisk_scf_component_add_boost_libraries(service_locator core thread date_time)
-asterisk_scf_component_build_icebox(service_locator)
+astscf_component_init(service_locator)
+astscf_component_add_slice(service_locator ../local-slice/ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_file(service_locator ServiceLocator.cpp)
+astscf_component_add_file(service_locator ServiceLocatorManagement.cpp)
+astscf_component_add_file(service_locator ServiceManagement.cpp)
+astscf_component_add_file(service_locator CollocatedIceStorm.cpp)
+astscf_component_add_file(service_locator CollocatedIceStorm.h)
+astscf_component_add_file(service_locator ServiceManagement.h)
+astscf_component_add_file(service_locator ServiceLocatorManagement.h)
+astscf_component_add_file(service_locator ServiceLocatorStateReplicator.h)
+astscf_component_add_file(service_locator ServiceLocatorStateListener.cpp)
+astscf_component_add_ice_libraries(service_locator IceStorm)
+astscf_component_add_ice_libraries(service_locator IceBox)
+astscf_component_add_boost_libraries(service_locator core thread date_time)
+astscf_component_build_icebox(service_locator)
target_link_libraries(service_locator logging-client)
-asterisk_scf_component_install(service_locator)
+astscf_component_install(service_locator)
-asterisk_scf_component_init(ServiceLocatorStateReplicator)
-asterisk_scf_component_add_slice(ServiceLocatorStateReplicator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-asterisk_scf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
-asterisk_scf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
-asterisk_scf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
-asterisk_scf_component_add_boost_libraries(ServiceLocatorStateReplicator thread date_time)
-asterisk_scf_component_build_icebox(ServiceLocatorStateReplicator)
+astscf_component_init(ServiceLocatorStateReplicator)
+astscf_component_add_slice(ServiceLocatorStateReplicator ../local-slice/ServiceLocatorStateReplicationIf.ice)
+astscf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
+astscf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
+astscf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
+astscf_component_add_boost_libraries(ServiceLocatorStateReplicator thread date_time)
+astscf_component_build_icebox(ServiceLocatorStateReplicator)
target_link_libraries(ServiceLocatorStateReplicator logging-client)
-asterisk_scf_component_install(ServiceLocatorStateReplicator)
+astscf_component_install(ServiceLocatorStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b177d0b..2a67a65 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,12 @@
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_component_init(service_locator_test)
-asterisk_scf_component_add_file(service_locator_test TestServiceLocator.cpp)
-asterisk_scf_component_add_file(service_locator_test TestComparatorBlocking.cpp)
-asterisk_scf_component_add_ice_libraries(service_locator_test IceStorm)
-asterisk_scf_component_add_boost_libraries(service_locator_test unit_test_framework thread date_time)
-asterisk_scf_component_build_icebox(service_locator_test)
+astscf_component_init(service_locator_test)
+astscf_component_add_file(service_locator_test TestServiceLocator.cpp)
+astscf_component_add_file(service_locator_test TestComparatorBlocking.cpp)
+astscf_component_add_ice_libraries(service_locator_test IceStorm)
+astscf_component_add_boost_libraries(service_locator_test unit_test_framework thread date_time)
+astscf_component_build_icebox(service_locator_test)
target_link_libraries(service_locator_test asterisk-scf-api)
-asterisk_scf_test_icebox(service_locator_test config/test_component.config)
+astscf_test_icebox(service_locator_test config/test_component.config)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)
commit 955fdfafd81174e168604e7499cb9cb16d0226ed
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 8166a0c..213cb26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
asterisk_scf_project(service_locator 3.4)
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
commit 21d2f9f40890c86df42ac4fa07b308fd7a87f459
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 15:10:45 2011 -0500
Remove directories used for submodules.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a628faf..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = ../../release/cmake
-[submodule "slice"]
- path = slice
- url = ../../integration/slice
-[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 a867306..0000000
--- a/logger
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a867306cbc5dce5b0cd899094b3215921f0263d3
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/servicediscovery.git
More information about the asterisk-scf-commits
mailing list