[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "component-interface" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue May 10 12:55:59 CDT 2011
branch "component-interface" has been created
at 6cab0e21b6ceff0fe94d68a357eafe48e6d30a54 (commit)
- Log -----------------------------------------------------------------
commit 6cab0e21b6ceff0fe94d68a357eafe48e6d30a54
Author: Fred Anderson <fanderson at digium.com>
Date: Tue May 10 12:55:33 2011 -0500
Changed ServiceLocatorManagementProxy references to LocatorServiceManagement.Proxy
diff --git a/config/test_channel.conf b/config/test_channel.conf
index bead0c4..a87c7c6 100644
--- a/config/test_channel.conf
+++ b/config/test_channel.conf
@@ -14,7 +14,7 @@ LocatorService.Proxy=LocatorService:default -p 55558
ServiceLocatorManagementAdapter.Endpoints=tcp -p 55557
ServiceLocatorAdapter.Endpoints=tcp -p 55558
-ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 55557
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 55557
TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 55555
diff --git a/src/Service.cpp b/src/Service.cpp
index 7d6169a..abd9051 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -91,7 +91,7 @@ void TestChannelDriver::start(const std::string& name, const Ice::CommunicatorPt
AsteriskSCF::TestUtil::TestEndpoint::create(mAdapter, "TestChannel.Locator");
AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx management =
- AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx::checkedCast(communicator->propertyToProxy("ServiceLocatorManagementProxy"));
+ AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx::checkedCast(communicator->propertyToProxy("LocatorServiceManagement.Proxy"));
mServiceManagement = AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx::uncheckedCast(management->addService(endpointLocatorPrx, "TestChannel"));
AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr params = new AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams();
params->category = "TestChannel";
commit da4760e04c2e094e04b6042de510e786cc07a5a0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Apr 27 13:59:35 2011 -0500
All Asterisk SCF components built with CMake are written in C++, so there is no need to specify it.
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 8db0ca9..81f71ea 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_component_init(test-channel-api CXX)
+asterisk_scf_component_init(test-channel-api)
asterisk_scf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
asterisk_scf_component_build_library(test-channel-api)
asterisk_scf_component_install(test-channel-api)
commit b6d4460e2bbb747731a2ee57e53635361bf478f8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Apr 27 13:54:32 2011 -0500
No need to explicitly request Ice and IceUtil libraries.
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 7121584..8db0ca9 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1,5 +1,3 @@
-asterisk_scf_add_ice_libraries(Ice IceUtil)
-
asterisk_scf_component_init(test-channel-api CXX)
asterisk_scf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
asterisk_scf_component_build_library(test-channel-api)
commit 110785d6cb772f1138d7483167a1f0f8ce5662df
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Apr 27 11:10:48 2011 -0500
CMakeLists.txt cleanup across the entire tree.
* Consistent formatting.
* Removed old non-integrated build stuff.
* Organized include_directories() calls since they affect every component in
the directory they are executed in.
* Keep all scripts lines for each component together.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cfd46e..70ce5fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,3 @@
-# Test channel
-
-if(NOT integrated_build STREQUAL "true")
- # Minimum we require is 2.8, any lower and stuff would fail horribly
- cmake_minimum_required(VERSION 2.8)
-
- # Include common AsteriskSCF build infrastructure
- include(cmake/AsteriskSCF.cmake)
-endif()
-
asterisk_scf_project("Test Channel" 3.4)
add_subdirectory(local_slice)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 6ca7452..7121584 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1,22 +1,11 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
+asterisk_scf_add_ice_libraries(Ice IceUtil)
asterisk_scf_component_init(test-channel-api CXX)
-
-asterisk_scf_component_add_slice(test-channel-api
- AsteriskSCF/TestChannel/CommandsIf.ice)
-
-asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
asterisk_scf_component_build_library(test-channel-api)
-
-set(TEST_CHANNEL_API_INCLUDE_DIR
- ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
-
asterisk_scf_component_install(test-channel-api)
+
asterisk_scf_slice_headers_install()
asterisk_scf_slice_install(AsteriskSCF)
+
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98e88b4..cc29ab6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,7 @@
-asterisk_scf_component_init(test_channel CXX)
+include_directories(${API_INCLUDE_DIR})
+include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
+
+asterisk_scf_component_init(test_channel)
asterisk_scf_component_add_file(test_channel Service.cpp)
asterisk_scf_component_add_file(test_channel MediaEchoThread.cpp)
asterisk_scf_component_add_file(test_channel MediaSession.cpp)
@@ -7,22 +10,15 @@ asterisk_scf_component_add_file(test_channel TestEndpoint.h)
asterisk_scf_component_add_ice_libraries(test_channel IceStorm)
asterisk_scf_component_add_boost_libraries(test_channel thread)
asterisk_scf_component_add_boost_libraries(test_channel date_time)
-
-include_directories(${API_INCLUDE_DIR})
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
asterisk_scf_component_build_icebox(test_channel)
target_link_libraries(test_channel asterisk-scf-api)
target_link_libraries(test_channel test-channel-api)
-
asterisk_scf_component_install(test_channel)
-asterisk_scf_component_init(console_driver CXX)
+asterisk_scf_component_init(console_driver)
asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
asterisk_scf_component_add_file(console_driver main.cpp)
-
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
asterisk_scf_component_build_standalone(console_driver)
target_link_libraries(console_driver test-channel-api)
-
asterisk_scf_component_install(console_driver)
commit 4cfeb7a208a49f4b0be34130bbe755f5375840ab
Author: David M. Lee <dlee at digium.com>
Date: Wed Apr 27 10:55:22 2011 -0500
Fixed shadows-a-member-of-this warnings.
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 2ad670e..33d04b2 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -88,9 +88,9 @@ public:
void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
{
- AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr progressing(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
- progressing->response = response;
- mPublisher->indicated(mSession, progressing);
+ AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
+ indication->response = response;
+ mPublisher->indicated(mSession, indication);
}
void ringing()
@@ -100,9 +100,9 @@ public:
void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
{
- AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr stopped(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
- stopped->response = response;
- mPublisher->indicated(mSession, stopped);
+ AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
+ indication->response = response;
+ mPublisher->indicated(mSession, indication);
}
void unheld()
commit ebddbc0394fe72aff0c868e8baae0f913e00943a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Apr 27 09:03:44 2011 -0500
Remove obsolete setting of 'bindir'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f67a90..4cfd46e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
-else()
- set(test_channel_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
endif()
asterisk_scf_project("Test Channel" 3.4)
commit 7b3b4739995997119cb190eae940de948bfb1075
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:45:43 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fe01ac..6f67a90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,17 @@
# Test channel
if(NOT integrated_build STREQUAL "true")
-
# Minimum we require is 2.8, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.8)
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
-
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project("Test Channel" 3.4 CXX)
-
- # Take care of slice definitions
- add_subdirectory(slice EXCLUDE_FROM_ALL)
else()
set(test_channel_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
endif()
+asterisk_scf_project("Test Channel" 3.4)
+
add_subdirectory(local_slice)
add_subdirectory(src)
-----------------------------------------------------------------------
--
asterisk-scf/integration/test_channel.git
More information about the asterisk-scf-commits
mailing list