[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "media" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Sat Jun 25 13:32:07 CDT 2011
branch "media" has been updated
via 73431b617126108a1fe9ac88b7209e2ac35b6542 (commit)
via 7d62474a9d3bf9f8547b219c56249dfb8e6f0bd5 (commit)
via 6c4ce6797956dc20b7ff3b05cfdaf21785c784c3 (commit)
via 96b5afdb38dfef7013a7481e3f50070ae0eb7efd (commit)
via 8ed9d6b193c0b85a3507849203ebe61d4403de36 (commit)
via d936cbd5026288ed4755a37c4098c1ac7004f002 (commit)
via 5e65b5e27253cd5b107d1f55cf3609cf82280375 (commit)
via 4839afaadcc83190f077ba6b14c5187d210b22e1 (commit)
via 160e7d974100203dee133003f5cbf51aa447b19e (commit)
from b1974a9302e151484e2c9936038de6c10091004d (commit)
Summary of changes:
.gitmodules | 6 ---
CMakeLists.txt | 6 +--
cmake | 1 -
local_slice/CMakeLists.txt | 9 ----
slice | 1 -
.../AsteriskSCF/TestChannel/CommandsIf.ice | 0
slice/CMakeLists.txt | 11 +++++
src/CMakeLists.txt | 41 +++++++++----------
src/Service.cpp | 2 +-
src/TestEndpoint.cpp | 37 +++++++++++++----
10 files changed, 61 insertions(+), 53 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 100644 local_slice/CMakeLists.txt
delete mode 160000 slice
rename {local_slice => slice}/AsteriskSCF/TestChannel/CommandsIf.ice (100%)
create mode 100644 slice/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 73431b617126108a1fe9ac88b7209e2ac35b6542
Merge: b1974a9 7d62474
Author: Joshua Colp <jcolp at digium.com>
Date: Sat Jun 25 14:58:39 2011 -0300
Merge branch 'master' into media
commit 7d62474a9d3bf9f8547b219c56249dfb8e6f0bd5
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Jun 21 17:01:29 2011 -0300
Merge session cookies support.
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 94c3cab..cf07e45 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -73,41 +73,46 @@ public:
//
void connected()
{
- mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication());
+ mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication(),
+ AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void flashed()
{
- mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication());
+ mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication(),
+ AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void held()
{
- mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication());
+ mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication(),
+ AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
{
AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
indication->response = response;
- mPublisher->indicated(mSession, indication);
+ mPublisher->indicated(mSession, indication, AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void ringing()
{
- mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication());
+ mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication(),
+ AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
{
- AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
- indication->response = response;
- mPublisher->indicated(mSession, indication);
+ AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
+ indication->response = response;
+ mPublisher->indicated(mSession, indication, AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void unheld()
{
- mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication());
+ mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication(),
+ AsteriskSCF::SessionCommunications::V1::SessionCookies());
}
void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& prx)
@@ -317,6 +322,20 @@ public:
mListeners->stopped(new AsteriskSCF::SessionCommunications::V1::ResponseCode);
}
+ void setCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
+ {
+ }
+
+ void removeCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
+ {
+ }
+
+ AsteriskSCF::SessionCommunications::V1::SessionCookies getCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
+ {
+ AsteriskSCF::SessionCommunications::V1::SessionCookies cookies;
+ return cookies;
+ }
+
void die()
{
}
commit 6c4ce6797956dc20b7ff3b05cfdaf21785c784c3
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/slice/CMakeLists.txt b/slice/CMakeLists.txt
index 1fbe0d0..0e3ac15 100644
--- a/slice/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -8,7 +8,4 @@ astscf_slice_collection(GLOBAL
astscf_component_init(astscf-test-channel)
astscf_component_add_slices(astscf-test-channel TEST_CHANNEL GLOB_RECURSE "*.ice")
astscf_component_build_library(astscf-test-channel)
-astscf_component_install(astscf-test-channel)
-
-astscf_slice_headers_install()
-astscf_slice_install(AsteriskSCF)
+astscf_slice_collection_install(TEST_CHANNEL)
commit 96b5afdb38dfef7013a7481e3f50070ae0eb7efd
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/CMakeLists.txt b/CMakeLists.txt
index e70f65f..d16051d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,5 +2,3 @@ astscf_project("Test Channel" 3.4)
add_subdirectory(slice)
add_subdirectory(src)
-
-set(TEST_CHANNEL_API_INCLUDE_DIR ${TEST_CHANNEL_API_INCLUDE_DIR} PARENT_SCOPE)
diff --git a/slice/CMakeLists.txt b/slice/CMakeLists.txt
index c3ac365..1fbe0d0 100644
--- a/slice/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -1,9 +1,14 @@
-astscf_component_init(test-channel-api)
-astscf_component_add_slices(test-channel-api PROJECT AsteriskSCF/TestChannel/CommandsIf.ice)
-astscf_component_build_library(test-channel-api)
-astscf_component_install(test-channel-api)
+astscf_slice_collection(GLOBAL
+ NAME TEST_CHANNEL
+ PATH "."
+ HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-test-channel/slice-TEST_CHANNEL"
+ LIBRARY astscf-test-channel
+ )
+
+astscf_component_init(astscf-test-channel)
+astscf_component_add_slices(astscf-test-channel TEST_CHANNEL GLOB_RECURSE "*.ice")
+astscf_component_build_library(astscf-test-channel)
+astscf_component_install(astscf-test-channel)
astscf_slice_headers_install()
astscf_slice_install(AsteriskSCF)
-
-set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/test-channel-api/slice-PROJECT PARENT_SCOPE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb3ac8a..5ffa22a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-include_directories(${API_INCLUDE_DIR})
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
+astscf_slice_include_collection(TEST_CHANNEL)
astscf_component_init(test_channel)
astscf_component_add_files(test_channel Service.cpp)
@@ -8,17 +7,15 @@ astscf_component_add_files(test_channel MediaSession.cpp)
astscf_component_add_files(test_channel TestEndpoint.cpp)
astscf_component_add_files(test_channel TestEndpoint.h)
astscf_component_add_ice_libraries(test_channel IceStorm)
-astscf_component_add_boost_libraries(test_channel thread)
-astscf_component_add_boost_libraries(test_channel date_time)
+astscf_component_add_boost_libraries(test_channel thread date_time)
+astscf_component_add_slice_collection_libraries(test_channel ASTSCF TEST_CHANNEL)
astscf_component_build_icebox(test_channel)
-target_link_libraries(test_channel astscf-api)
-target_link_libraries(test_channel test-channel-api)
astscf_component_install(test_channel)
astscf_component_init(console_driver)
astscf_component_add_files(console_driver ConsoleDriver.cpp)
astscf_component_add_files(console_driver ConsoleDriver.h)
astscf_component_add_files(console_driver main.cpp)
+astscf_component_add_slice_collection_libraries(console_driver TEST_CHANNEL)
astscf_component_build_standalone(console_driver)
-target_link_libraries(console_driver test-channel-api)
astscf_component_install(console_driver)
commit 8ed9d6b193c0b85a3507849203ebe61d4403de36
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 7 16:53:58 2011 -0500
Use proper path for generated headers.
diff --git a/slice/CMakeLists.txt b/slice/CMakeLists.txt
index 6f9c181..c3ac365 100644
--- a/slice/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -6,4 +6,4 @@ astscf_component_install(test-channel-api)
astscf_slice_headers_install()
astscf_slice_install(AsteriskSCF)
-set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-PROJECT PARENT_SCOPE)
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/test-channel-api/slice-PROJECT PARENT_SCOPE)
commit d936cbd5026288ed4755a37c4098c1ac7004f002
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 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/CMakeLists.txt b/CMakeLists.txt
index bb153b8..e70f65f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_project("Test Channel" 3.4)
-add_subdirectory(local_slice)
+add_subdirectory(slice)
add_subdirectory(src)
set(TEST_CHANNEL_API_INCLUDE_DIR ${TEST_CHANNEL_API_INCLUDE_DIR} PARENT_SCOPE)
diff --git a/local_slice/AsteriskSCF/TestChannel/CommandsIf.ice b/slice/AsteriskSCF/TestChannel/CommandsIf.ice
similarity index 100%
rename from local_slice/AsteriskSCF/TestChannel/CommandsIf.ice
rename to slice/AsteriskSCF/TestChannel/CommandsIf.ice
diff --git a/local_slice/CMakeLists.txt b/slice/CMakeLists.txt
similarity index 52%
rename from local_slice/CMakeLists.txt
rename to slice/CMakeLists.txt
index 999e8b2..6f9c181 100644
--- a/local_slice/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -1,9 +1,9 @@
astscf_component_init(test-channel-api)
-astscf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
+astscf_component_add_slices(test-channel-api PROJECT AsteriskSCF/TestChannel/CommandsIf.ice)
astscf_component_build_library(test-channel-api)
astscf_component_install(test-channel-api)
astscf_slice_headers_install()
astscf_slice_install(AsteriskSCF)
-set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-PROJECT PARENT_SCOPE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87a15ec..bb3ac8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,23 +2,23 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
astscf_component_init(test_channel)
-astscf_component_add_file(test_channel Service.cpp)
-astscf_component_add_file(test_channel MediaEchoThread.cpp)
-astscf_component_add_file(test_channel MediaSession.cpp)
-astscf_component_add_file(test_channel TestEndpoint.cpp)
-astscf_component_add_file(test_channel TestEndpoint.h)
+astscf_component_add_files(test_channel Service.cpp)
+astscf_component_add_files(test_channel MediaEchoThread.cpp)
+astscf_component_add_files(test_channel MediaSession.cpp)
+astscf_component_add_files(test_channel TestEndpoint.cpp)
+astscf_component_add_files(test_channel TestEndpoint.h)
astscf_component_add_ice_libraries(test_channel IceStorm)
astscf_component_add_boost_libraries(test_channel thread)
astscf_component_add_boost_libraries(test_channel date_time)
astscf_component_build_icebox(test_channel)
-target_link_libraries(test_channel asterisk-scf-api)
+target_link_libraries(test_channel astscf-api)
target_link_libraries(test_channel test-channel-api)
astscf_component_install(test_channel)
astscf_component_init(console_driver)
-astscf_component_add_file(console_driver ConsoleDriver.cpp)
-astscf_component_add_file(console_driver ConsoleDriver.h)
-astscf_component_add_file(console_driver main.cpp)
+astscf_component_add_files(console_driver ConsoleDriver.cpp)
+astscf_component_add_files(console_driver ConsoleDriver.h)
+astscf_component_add_files(console_driver main.cpp)
astscf_component_build_standalone(console_driver)
target_link_libraries(console_driver test-channel-api)
astscf_component_install(console_driver)
commit 5e65b5e27253cd5b107d1f55cf3609cf82280375
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/Service.cpp b/src/Service.cpp
index 7d6169a..3d3e78c 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -119,7 +119,7 @@ void TestChannelDriver::stop()
}
extern "C" {
-ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr)
{
return new TestChannelDriver;
}
commit 4839afaadcc83190f077ba6b14c5187d210b22e1
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 70ce5fd..bb153b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_project("Test Channel" 3.4)
+astscf_project("Test Channel" 3.4)
add_subdirectory(local_slice)
add_subdirectory(src)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 81f71ea..999e8b2 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1,9 +1,9 @@
-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)
+astscf_component_init(test-channel-api)
+astscf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
+astscf_component_build_library(test-channel-api)
+astscf_component_install(test-channel-api)
-asterisk_scf_slice_headers_install()
-asterisk_scf_slice_install(AsteriskSCF)
+astscf_slice_headers_install()
+astscf_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 cc29ab6..87a15ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,24 +1,24 @@
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)
-asterisk_scf_component_add_file(test_channel TestEndpoint.cpp)
-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)
-asterisk_scf_component_build_icebox(test_channel)
+astscf_component_init(test_channel)
+astscf_component_add_file(test_channel Service.cpp)
+astscf_component_add_file(test_channel MediaEchoThread.cpp)
+astscf_component_add_file(test_channel MediaSession.cpp)
+astscf_component_add_file(test_channel TestEndpoint.cpp)
+astscf_component_add_file(test_channel TestEndpoint.h)
+astscf_component_add_ice_libraries(test_channel IceStorm)
+astscf_component_add_boost_libraries(test_channel thread)
+astscf_component_add_boost_libraries(test_channel date_time)
+astscf_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)
+astscf_component_install(test_channel)
-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)
-asterisk_scf_component_build_standalone(console_driver)
+astscf_component_init(console_driver)
+astscf_component_add_file(console_driver ConsoleDriver.cpp)
+astscf_component_add_file(console_driver ConsoleDriver.h)
+astscf_component_add_file(console_driver main.cpp)
+astscf_component_build_standalone(console_driver)
target_link_libraries(console_driver test-channel-api)
-asterisk_scf_component_install(console_driver)
+astscf_component_install(console_driver)
commit 160e7d974100203dee133003f5cbf51aa447b19e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 15:11:19 2011 -0500
Remove directories used for submodules.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index eba8938..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = ssh://git@git.asterisk.org/asterisk-scf/release/cmake
-[submodule "slice"]
- path = slice
- url = ssh://git@git.asterisk.org/asterisk-scf/integration/slice
diff --git a/cmake b/cmake
deleted file mode 160000
index 17066de..0000000
--- a/cmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
diff --git a/slice b/slice
deleted file mode 160000
index 03ea08a..0000000
--- a/slice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
-----------------------------------------------------------------------
--
asterisk-scf/integration/test_channel.git
More information about the asterisk-scf-commits
mailing list