[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "session_cookies" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Mar 21 14:54:08 CDT 2011 

branch "session_cookies" has been created
        at  ed1292522c2fa00c8b55eaecb6a5f0ed1494d8d7 (commit)

- Log -----------------------------------------------------------------
commit ed1292522c2fa00c8b55eaecb6a5f0ed1494d8d7
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Mar 21 11:48:04 2011 -0300

    Add bits for session cookies.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 830bdbf..16bd1a6 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -73,37 +73,37 @@ public:
     //
     void connected()
     {
-        mPublisher->connected(mSession);
+        mPublisher->connected(mSession,  AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 
     void flashed()
     {
-        mPublisher->flashed(mSession);
+        mPublisher->flashed(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 
     void held()
     {
-        mPublisher->held(mSession);
+        mPublisher->held(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 
     void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-        mPublisher->progressing(mSession, response);
+        mPublisher->progressing(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies(), response);
     }
 
     void ringing()
     {
-        mPublisher->ringing(mSession);
+        mPublisher->ringing(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 
     void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-        mPublisher->stopped(mSession, response);
+        mPublisher->stopped(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies(), response);
     }
 
     void unheld()
     {
-        mPublisher->unheld(mSession);
+        mPublisher->unheld(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 
     void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& prx)
@@ -270,6 +270,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 e1a841a22e980cd585e18e4f1b4e3f67cc1d50d5
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 20 12:33:27 2011 -0600

    Refactored out several install functions for installation.
    
    * asterisk_scf_component_install - Install a component
    * asterisk_scf_slice_headers_install - Install generated .h files
    * asterisk_scf_slice_install - Install .ice files

diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 85cbc7e..6ca7452 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -17,10 +17,6 @@ asterisk_scf_component_build_library(test-channel-api)
 set(TEST_CHANNEL_API_INCLUDE_DIR
     ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
 
-install(TARGETS test-channel-api
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
-install(DIRECTORY AsteriskSCF DESTINATION ${ASTERISK_SCF_INSTALL_SLICE_DIR})
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
-    DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR}
-    FILES_MATCHING PATTERN "*.h")
+asterisk_scf_component_install(test-channel-api)
+asterisk_scf_slice_headers_install()
+asterisk_scf_slice_install(AsteriskSCF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 927ef1d..98e88b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,9 +14,7 @@ asterisk_scf_component_build_icebox(test_channel)
 target_link_libraries(test_channel asterisk-scf-api)
 target_link_libraries(test_channel test-channel-api)
 
-install(TARGETS test_channel
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+asterisk_scf_component_install(test_channel)
 
 asterisk_scf_component_init(console_driver CXX)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
@@ -27,5 +25,4 @@ include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(console_driver)
 target_link_libraries(console_driver test-channel-api)
 
-install(TARGETS console_driver
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
+asterisk_scf_component_install(console_driver)

commit 39340b9a0c43ec386c7a270ffed22544f002b17e
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 20:24:07 2011 -0600

    Install test-channel artifacts.
    
    * Install the slice file in a AsteriskSCF/TestChannel directory
    * Install the api in libdir

diff --git a/local_slice/CommandsIf.ice b/local_slice/AsteriskSCF/TestChannel/CommandsIf.ice
similarity index 100%
rename from local_slice/CommandsIf.ice
rename to local_slice/AsteriskSCF/TestChannel/CommandsIf.ice
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 95c6e7d..85cbc7e 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -8,10 +8,19 @@
 
 asterisk_scf_component_init(test-channel-api CXX)
 
-asterisk_scf_component_add_slice(test-channel-api CommandsIf.ice)
+asterisk_scf_component_add_slice(test-channel-api
+    AsteriskSCF/TestChannel/CommandsIf.ice)
 
 asterisk_scf_add_ice_libraries(Ice IceUtil)
 asterisk_scf_component_build_library(test-channel-api)
 
-set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+set(TEST_CHANNEL_API_INCLUDE_DIR
+    ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
 
+install(TARGETS test-channel-api
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
+install(DIRECTORY AsteriskSCF DESTINATION ${ASTERISK_SCF_INSTALL_SLICE_DIR})
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
+    DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR}
+    FILES_MATCHING PATTERN "*.h")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04cd2e7..927ef1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,10 @@ asterisk_scf_component_build_icebox(test_channel)
 target_link_libraries(test_channel asterisk-scf-api)
 target_link_libraries(test_channel test-channel-api)
 
+install(TARGETS test_channel
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+
 asterisk_scf_component_init(console_driver CXX)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
@@ -22,3 +26,6 @@ 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)
+
+install(TARGETS console_driver
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index ed267e6..680b311 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -18,7 +18,7 @@
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Thread.h>
 #include <string>
-#include <CommandsIf.h>
+#include <AsteriskSCF/TestChannel/CommandsIf.h>
 
 namespace AsteriskSCF
 {
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 2ce0024..830bdbf 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -28,7 +28,7 @@
 
 #include "Logger.h"
 #include "MediaSession.h"
-#include <CommandsIf.h>
+#include <AsteriskSCF/TestChannel/CommandsIf.h>
 
 
 using namespace AsteriskSCF::TestUtil;

commit 89fa8df660c8d4783a1271ff26d63acb74c264bd
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 19 12:18:10 2011 -0600

    We require cmake 2.8 or better.
    
    Now make it a specific "You're cmake is old" failure, as opposed to some
    random failure later on.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0b3d8f..2fe01ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@
 
 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)
+  # 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)

commit c58affd9d4f15ac511c40a461ef1708382778aaa
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 19:06:34 2011 -0600

    Building a single API library.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b032c3..b0b3d8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,3 +20,4 @@ endif()
 add_subdirectory(local_slice)
 add_subdirectory(src)
 
+set(TEST_CHANNEL_API_INCLUDE_DIR ${TEST_CHANNEL_API_INCLUDE_DIR} PARENT_SCOPE)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index a1ed80b..95c6e7d 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1 +1,17 @@
-asterisk_scf_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
+asterisk_scf_component_init(test-channel-api CXX)
+
+asterisk_scf_component_add_slice(test-channel-api CommandsIf.ice)
+
+asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_build_library(test-channel-api)
+
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33d3155..04cd2e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,4 @@
 asterisk_scf_component_init(test_channel CXX)
-asterisk_scf_component_add_slice(test_channel EndpointIf)
-asterisk_scf_component_add_slice(test_channel ComponentServiceIf)
-asterisk_scf_component_add_slice(test_channel SessionCommunicationsIf)
-asterisk_scf_component_add_slice(test_channel RoutingIf)
-asterisk_scf_component_add_slice(test_channel CommandsIf)
 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)
@@ -12,12 +7,18 @@ 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_init(console_driver CXX)
-asterisk_scf_component_add_slice(console_driver CommandsIf)
 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)
 
+include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
+asterisk_scf_component_build_standalone(console_driver)
+target_link_libraries(console_driver test-channel-api)

commit b3f41ed61d129016b88180536ad967adacade764
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 18:28:14 2011 -0600

    Fix slice #includes

diff --git a/src/MediaEchoThread.h b/src/MediaEchoThread.h
index 6fc87fb..e6d0ea5 100644
--- a/src/MediaEchoThread.h
+++ b/src/MediaEchoThread.h
@@ -7,7 +7,7 @@
  */
 #pragma once
 #include <Ice/Ice.h>
-#include <Media/MediaIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
 
 namespace AsteriskSCF
 {
diff --git a/src/MediaSession.h b/src/MediaSession.h
index c6196e0..a95faeb 100644
--- a/src/MediaSession.h
+++ b/src/MediaSession.h
@@ -7,7 +7,7 @@
  */
 #pragma once
 #include <Ice/Ice.h>
-#include <Media/MediaIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "MediaEchoThread.h"
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index ab80576..2ce0024 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -28,7 +28,7 @@
 
 #include "Logger.h"
 #include "MediaSession.h"
-#include "CommandsIf.h"
+#include <CommandsIf.h>
 
 
 using namespace AsteriskSCF::TestUtil;

commit 78d578d6b7a2eb331aab6a82839ee9b212adf088
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Jan 7 15:01:11 2011 -0600

    Adjust #includes to use <> and prefix paths with AsteriskSCF.

diff --git a/src/Service.cpp b/src/Service.cpp
index 6212ed9..9ec19e5 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -16,8 +16,8 @@
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
 
-#include <Core/Discovery/ServiceLocatorIf.h>
-#include <Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
 #include "Logger.h"
 #include "TestEndpoint.h"
 
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index e912020..ab80576 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -20,7 +20,7 @@
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
 
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
 
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
diff --git a/src/TestEndpoint.h b/src/TestEndpoint.h
index 3ff36ab..827efa8 100644
--- a/src/TestEndpoint.h
+++ b/src/TestEndpoint.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <Core/Endpoint/EndpointIf.h>
-#include <Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
 
 #include <boost/thread/shared_mutex.hpp>
 

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/test_channel.git

More information about the asterisk-scf-commits mailing list