[asterisk-scf-commits] asterisk-scf/release/sip.git branch "ami" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jan 17 17:10:24 CST 2011
branch "ami" has been updated
via f7a6cead5eeedcc9a3db7ff81445ea797a855419 (commit)
from 2c23158b5f9480270b1dcfa7f44f7d73abc255f2 (commit)
Summary of changes:
CMakeLists.txt | 11 ++++-----
CMakeSubDirs.txt | 8 -------
local-slice/CMakeLists.txt | 5 ----
local-slice/SipStateReplicationIf.ice | 6 ++--
src/CMakeLists.txt | 36 ++++++++++++-------------------
src/PJSipLoggingModule.cpp | 5 ++-
src/PJSipManager.cpp | 4 +-
src/PJSipManager.h | 4 ++-
src/PJSipModule.cpp | 4 +-
src/PJSipModule.h | 2 +-
src/PJSipSessionModule.cpp | 25 ++++++++++-----------
src/PJSipSessionModule.h | 5 ++-
src/SipEndpoint.cpp | 6 ++--
src/SipEndpoint.h | 9 ++++---
src/SipEndpointFactory.h | 2 +-
src/SipSession.cpp | 5 ++-
src/SipSession.h | 12 +++++-----
src/SipSessionManagerApp.cpp | 19 ++++++++-------
src/SipSessionManagerEndpointLocator.h | 3 +-
src/SipSessionManagerEventPublisher.cpp | 5 ++-
src/SipSessionManagerEventPublisher.h | 2 +-
src/SipStateReplicator.h | 5 ++-
src/SipStateReplicatorApp.cpp | 13 ++++++-----
23 files changed, 92 insertions(+), 104 deletions(-)
delete mode 100644 CMakeSubDirs.txt
delete mode 100644 local-slice/CMakeLists.txt
- Log -----------------------------------------------------------------
commit f7a6cead5eeedcc9a3db7ff81445ea797a855419
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Jan 17 11:20:01 2011 -0600
Big ol' merge. Capitalized constant names.
This is to prepare for some additional changes I'm going to make as
an effort to increase the CPS.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6900dba..abcb21a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6
cmake_minimum_required(VERSION 2.6)
- # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
+ # Include common AsteriskSCF build infrastructure. Make sure your submodules
+ # are pulled.
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4 of Ice.
+ # This project is C++ based and requires a minimum of 3.4 of Ice.
asterisk_scf_project(SipSessionManager 3.4 CXX)
# Include pjproject build integration
@@ -36,7 +37,5 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
-# Include the subdirectory information. This is separate so that
-# a higher-level CMakeLists.txt can act as a master for integrated
-# builds.
-include(CMakeSubDirs.txt)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 6ad9e82..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_subdirectory(local-slice)
-
-# Add our component's source code
-add_subdirectory(src)
-
-# Pull in the test suite
-add_subdirectory(test)
\ No newline at end of file
diff --git a/local-slice/CMakeLists.txt b/local-slice/CMakeLists.txt
deleted file mode 100644
index a886e38..0000000
--- a/local-slice/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Compile SIP Session Manager Component's own slice
-asterisk_scf_slice_include_directories("${CMAKE_SOURCE_DIR}/slice")
-asterisk_scf_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipSessionManager)
-asterisk_scf_compile_slice(SipStateReplicationIf.ice lib "SIP State Replicator" SipSessionManager)
-#asterisk_scf_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipSessionManager)
diff --git a/local-slice/SipStateReplicationIf.ice b/local-slice/SipStateReplicationIf.ice
index 6e2e5c3..80d9fae 100644
--- a/local-slice/SipStateReplicationIf.ice
+++ b/local-slice/SipStateReplicationIf.ice
@@ -17,9 +17,9 @@
#pragma once
#include <Ice/BuiltinSequences.ice>
#include <Ice/Identity.ice>
-#include "Media/MediaIf.ice"
-#include "SessionCommunications/SessionCommunicationsIf.ice"
-#include "Core/Discovery/ServiceLocatorIf.ice"
+#include "AsteriskSCF/Media/MediaIf.ice"
+#include "AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice"
+#include "AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice"
module AsteriskSCF
{
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5a2e7ff..538af14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,10 @@
# Define the SIP Session Manager component
-asterisk_scf_component_init(SipSessionManager CXX)
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_add_slice(SipSessionManager RoutingIf)
-asterisk_scf_component_add_slice(SipSessionManager ServiceLocatorIf)
-asterisk_scf_component_add_slice(SipSessionManager EndpointIf)
-asterisk_scf_component_add_slice(SipSessionManager ComponentServiceIf)
-asterisk_scf_component_add_slice(SipSessionManager MediaIf)
-asterisk_scf_component_add_slice(SipSessionManager MediaRTPIf)
-asterisk_scf_component_add_slice(SipSessionManager SessionCommunicationsIf)
-asterisk_scf_component_add_slice(SipSessionManager SipStateReplicationIf)
-asterisk_scf_component_add_slice(SipSessionManager ReplicaIf)
+asterisk_scf_component_init(SipSessionManager CXX)
# Add our component's own slice types.
-asterisk_scf_component_add_slice(SipSessionManager SipIf)
asterisk_scf_component_add_file(SipSessionManager SipSessionManagerApp.cpp)
asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.cpp)
@@ -38,6 +29,9 @@ asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModuleConstruction
asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModule.h)
asterisk_scf_component_add_file(SipSessionManager SipStateReplicatorListener.cpp)
asterisk_scf_component_add_file(SipSessionManager SipStateReplicator.h)
+asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipIf.ice)
+asterisk_scf_component_add_slice(SipSessionManager
+ ../local-slice/SipStateReplicationIf.ice)
asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
@@ -46,8 +40,7 @@ asterisk_scf_component_add_boost_libraries(SipSessionManager core)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
endif()
-include_directories(${logger_dir}/common)
-include_directories(${logger_dir}/client/src)
+include_directories(${logger_dir}/include)
asterisk_scf_component_build_icebox(SipSessionManager)
@@ -62,28 +55,27 @@ pjproject_link(SipSessionManager pjlib)
asterisk_scf_component_init(SipStateReplicator CXX)
-asterisk_scf_component_add_slice(SipStateReplicator ServiceLocatorIf)
-asterisk_scf_component_add_slice(SipStateReplicator ComponentServiceIf)
-asterisk_scf_component_add_slice(SipStateReplicator SipIf)
-asterisk_scf_component_add_slice(SipStateReplicator SipStateReplicationIf)
-asterisk_scf_component_add_slice(SipStateReplicator RoutingIf)
-asterisk_scf_component_add_slice(SipStateReplicator MediaRTPIf)
#This line allows us to use the templated state replicator
#code from the SIP component. This statement is not the most
#permanent of changes and assumes the directories are
#structured in the way that gitall structures them.
-include_directories(${utils_dir}/StateReplicator/src)
-include_directories(${utils_dir}/SmartProxy/src)
+include_directories(${utils_dir}/StateReplicator/include)
+include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
-#asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.cpp)
+asterisk_scf_component_add_slice(SipStateReplicator
+ ../local-slice/SipStateReplicationIf.ice)
+asterisk_scf_component_add_slice(SipStateReplicator
+ ../local-slice/SipIf.ice)
asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
asterisk_scf_component_add_boost_libraries(SipStateReplicator thread date_time)
asterisk_scf_component_build_icebox(SipStateReplicator)
target_link_libraries(SipStateReplicator logging-client)
+target_link_libraries(SipStateReplicator asterisk-scf-api)
#asterisk_scf_component_install(SipStateReplicator RUNTIME bin "Sip State Replicator" SipStateReplicator)
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSipLoggingModule.cpp
index f5f8b8b..729aaf0 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSipLoggingModule.cpp
@@ -14,14 +14,15 @@
* at the top of the source tree.
*/
+#include <AsteriskSCF/logger.h>
+
#include "PJSipLoggingModule.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 8d299d7..366ce6f 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -13,15 +13,15 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
+#include <AsteriskSCF/logger.h>
#include "PJSipManager.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 6340407..3db7875 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -24,9 +24,11 @@
#include <pjsip.h>
#include <boost/shared_ptr.hpp>
+
+#include <AsteriskSCF/SmartProxy.h>
+
#include "PJSipSessionModule.h"
#include "PJSipLoggingModule.h"
-#include "SmartProxy.h"
namespace AsteriskSCF
{
diff --git a/src/PJSipModule.cpp b/src/PJSipModule.cpp
index 0b92ec6..c53a60e 100644
--- a/src/PJSipModule.cpp
+++ b/src/PJSipModule.cpp
@@ -13,16 +13,16 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
+#include <AsteriskSCF/logger.h>
#include <IceUtil/UUID.h>
#include "PJSipModule.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/PJSipModule.h b/src/PJSipModule.h
index 2134ae3..df38f5a 100644
--- a/src/PJSipModule.h
+++ b/src/PJSipModule.h
@@ -22,7 +22,7 @@
#include <pjsip_ua.h>
#include <pjlib.h>
-#include "SipStateReplicationIf.h"
+#include <SipStateReplicationIf.h>
namespace AsteriskSCF
{
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 22fd4b5..3c1ece4 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -15,10 +15,11 @@
*/
#include <IceUtil/UUID.h>
-#include <Core/Endpoint/EndpointIf.h>
-#include <Core/Routing/RoutingIf.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <Media/MediaIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/logger.h>
#include "PJSipSessionModule.h"
#include "SipEndpoint.h"
@@ -26,19 +27,17 @@
#include "SipSession.h"
#include "PJSipManager.h"
#include "SipStateReplicator.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
-
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
//Constants used for AMI callback class construction when calling
//SessionListenerPrx methods.
-const std::string ringingCallbackName("ringing");
-const std::string progressingCallbackName("progressing");
-const std::string connectedCallbackName("connected");
+const std::string RingingCallbackName("ringing");
+const std::string ProgressingCallbackName("progressing");
+const std::string ConnectedCallbackName("connected");
}
namespace AsteriskSCF
@@ -812,7 +811,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
{
try
{
- ListenerCallbackPtr cb(new ListenerCallback(ringingCallbackName));
+ ListenerCallbackPtr cb(new ListenerCallback(RingingCallbackName));
Callback_SessionListener_ringingPtr ringingCB =
newCallback_SessionListener_ringing(cb, &ListenerCallback::failure);
(*listener)->begin_ringing(session->getSessionProxy(), ringingCB);
@@ -835,7 +834,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
{
try
{
- ListenerCallbackPtr cb(new ListenerCallback(progressingCallbackName));
+ ListenerCallbackPtr cb(new ListenerCallback(ProgressingCallbackName));
Callback_SessionListener_progressingPtr progressingCB =
newCallback_SessionListener_progressing(cb, &ListenerCallback::failure);
(*listener)->begin_progressing(session->getSessionProxy(), response, progressingCB);
@@ -858,7 +857,7 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
{
try
{
- ListenerCallbackPtr cb(new ListenerCallback(connectedCallbackName));
+ ListenerCallbackPtr cb(new ListenerCallback(ConnectedCallbackName));
Callback_SessionListener_connectedPtr connectedCB =
newCallback_SessionListener_connected(cb, &ListenerCallback::failure);
(*listener)->begin_connected(session->getSessionProxy(), connectedCB);
diff --git a/src/PJSipSessionModule.h b/src/PJSipSessionModule.h
index 270849d..5569170 100644
--- a/src/PJSipSessionModule.h
+++ b/src/PJSipSessionModule.h
@@ -23,11 +23,12 @@
#include <boost/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/System/Component/ReplicaIf.h>
+
#include "SipStateReplicator.h"
#include "SipSession.h"
#include "PJSipModule.h"
-#include "ReplicaIf.h"
-#include "SmartProxy.h"
namespace AsteriskSCF
{
diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index e1550b9..03f88b9 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -17,18 +17,18 @@
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
-#include <Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/logger.h>
#include "PJSipManager.h"
#include "SipEndpointFactory.h"
#include "SipSession.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/SipEndpoint.h b/src/SipEndpoint.h
index 72f9449..63471f1 100644
--- a/src/SipEndpoint.h
+++ b/src/SipEndpoint.h
@@ -21,10 +21,11 @@
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <Core/Endpoint/EndpointIf.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <Media/MediaIf.h>
-#include <Media/RTP/MediaRTPIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
+
#include "SipSession.h"
#include <pjsip.h>
diff --git a/src/SipEndpointFactory.h b/src/SipEndpointFactory.h
index 1496b9e..77a34fa 100644
--- a/src/SipEndpointFactory.h
+++ b/src/SipEndpointFactory.h
@@ -19,7 +19,7 @@
#include <Ice/Ice.h>
#include <boost/enable_shared_from_this.hpp>
-#include <Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
#include "SipEndpoint.h"
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 4580a21..0c6dd3e 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -20,17 +20,18 @@
#include <boost/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <AsteriskSCF/logger.h>
+
#include "PJSipManager.h"
#include "SipEndpointFactory.h"
#include "SipEndpoint.h"
#include "SipSession.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/SipSession.h b/src/SipSession.h
index 5b5e39e..105af5c 100644
--- a/src/SipSession.h
+++ b/src/SipSession.h
@@ -21,13 +21,13 @@
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <Core/Endpoint/EndpointIf.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <Media/MediaIf.h>
-#include <Media/RTP/MediaRTPIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
+#include <AsteriskSCF/System/Component/ReplicaIf.h>
-#include "SipStateReplicationIf.h"
-#include "ReplicaIf.h"
+#include <SipStateReplicationIf.h>
#include <pjsip.h>
#include <pjmedia.h>
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index e185bba..4c5a5ae 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -23,13 +23,15 @@
#include <pjlib.h>
-#include "RoutingIf.h"
-#include "ServiceLocatorIf.h"
-#include "ComponentServiceIf.h"
-#include "SessionCommunicationsIf.h"
-#include "ReplicaIf.h"
-#include "IceLogger.h"
-#include "logger.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/System/Component/ReplicaIf.h>
+#include <AsteriskSCF/SmartProxy.h>
+
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/logger.h>
#include "SipSessionManagerEventPublisher.h"
#include "SipSessionManagerEndpointLocator.h"
@@ -38,7 +40,6 @@
#include "PJSipManager.h"
#include "SipSession.h"
#include "SipStateReplicator.h"
-#include "SmartProxy.h"
using namespace std;
using namespace AsteriskSCF::SipSessionManager;
@@ -52,7 +53,7 @@ using namespace AsteriskSCF::SmartProxy;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/SipSessionManagerEndpointLocator.h b/src/SipSessionManagerEndpointLocator.h
index e1e74c5..afa65b9 100644
--- a/src/SipSessionManagerEndpointLocator.h
+++ b/src/SipSessionManagerEndpointLocator.h
@@ -16,7 +16,8 @@
#pragma once
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+
#include "SipEndpointFactory.h"
namespace AsteriskSCF
diff --git a/src/SipSessionManagerEventPublisher.cpp b/src/SipSessionManagerEventPublisher.cpp
index aac7c32..ae98668 100644
--- a/src/SipSessionManagerEventPublisher.cpp
+++ b/src/SipSessionManagerEventPublisher.cpp
@@ -17,8 +17,9 @@
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
+#include <AsteriskSCF/logger.h>
+
#include "SipSessionManagerEventPublisher.h"
-#include "logger.h"
using namespace ::std;
using namespace ::AsteriskSCF::SIP::V1;
@@ -26,7 +27,7 @@ using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
namespace AsteriskSCF
diff --git a/src/SipSessionManagerEventPublisher.h b/src/SipSessionManagerEventPublisher.h
index e62c602..81bbfd1 100644
--- a/src/SipSessionManagerEventPublisher.h
+++ b/src/SipSessionManagerEventPublisher.h
@@ -18,7 +18,7 @@
#include <boost/shared_ptr.hpp>
-#include "SipIf.h"
+#include <SipIf.h>
namespace AsteriskSCF
{
diff --git a/src/SipStateReplicator.h b/src/SipStateReplicator.h
index 8275693..b025afb 100644
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@ -17,8 +17,9 @@
#pragma once
#include <Ice/Ice.h>
-#include "SipStateReplicationIf.h"
-#include "StateReplicator.h"
+
+#include <AsteriskSCF/StateReplicator.h>
+#include <SipStateReplicationIf.h>
#include "SipEndpointFactory.h"
namespace AsteriskSCF
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index a5b1422..32f35b9 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -19,12 +19,13 @@
#include <IceStorm/IceStorm.h>
#include <IceBox/IceBox.h>
-#include "ServiceLocatorIf.h"
-#include "ComponentServiceIf.h"
-#include "SipIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
+#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger/IceLogger.h>
+
+#include <SipIf.h>
#include "SipStateReplicator.h"
-#include "IceLogger.h"
-#include "logger.h"
using namespace std;
using namespace AsteriskSCF::Core;
@@ -35,7 +36,7 @@ using namespace AsteriskSCF::SipSessionManager;
namespace
{
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
}
class SipStateReplicatorService : public IceBox::Service
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list