[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:04:53 UTC 2011
branch "master" has been updated
via 33213eecc8c29508c1a2d897cc34e3df0572f9b5 (commit)
from 3558bb645bbfb16f74cee4cc1ea4e04d1419adb4 (commit)
Summary of changes:
local-slice/SipStateReplicationIf.ice | 6 +++---
src/CMakeLists.txt | 7 +++----
src/PJSipLoggingModule.cpp | 3 ++-
src/PJSipManager.cpp | 2 +-
src/PJSipManager.h | 4 +++-
src/PJSipModule.cpp | 2 +-
src/PJSipSessionModule.cpp | 10 +++++-----
src/PJSipSessionModule.h | 5 +++--
src/SipEndpoint.cpp | 4 ++--
src/SipEndpoint.h | 9 +++++----
src/SipEndpointFactory.h | 2 +-
src/SipSession.cpp | 3 ++-
src/SipSession.h | 10 +++++-----
src/SipSessionManagerApp.cpp | 17 +++++++++--------
src/SipSessionManagerEndpointLocator.h | 3 ++-
src/SipSessionManagerEventPublisher.cpp | 3 ++-
src/SipStateReplicator.h | 3 ++-
src/SipStateReplicatorApp.cpp | 9 +++++----
18 files changed, 56 insertions(+), 46 deletions(-)
- Log -----------------------------------------------------------------
commit 33213eecc8c29508c1a2d897cc34e3df0572f9b5
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 14:57:00 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
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..e69dc6a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,8 +46,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)
@@ -73,8 +72,8 @@ asterisk_scf_component_add_slice(SipStateReplicator MediaRTPIf)
#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)
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSipLoggingModule.cpp
index 4699e00..729aaf0 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSipLoggingModule.cpp
@@ -14,8 +14,9 @@
* at the top of the source tree.
*/
+#include <AsteriskSCF/logger.h>
+
#include "PJSipLoggingModule.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 8c83419..366ce6f 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -13,9 +13,9 @@
* 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;
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 7fb9e52..c53a60e 100644
--- a/src/PJSipModule.cpp
+++ b/src/PJSipModule.cpp
@@ -13,10 +13,10 @@
* 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;
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 82da897..3256155 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,7 +27,6 @@
#include "SipSession.h"
#include "PJSipManager.h"
#include "SipStateReplicator.h"
-#include "logger.h"
using namespace AsteriskSCF::System::Logging;
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 2cb4682..03f88b9 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -17,12 +17,12 @@
#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;
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 81b37ba..0c6dd3e 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -20,11 +20,12 @@
#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;
diff --git a/src/SipSession.h b/src/SipSession.h
index 5b5e39e..e2e7181 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 <pjsip.h>
#include <pjmedia.h>
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 587263d..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;
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 0bacfae..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;
diff --git a/src/SipStateReplicator.h b/src/SipStateReplicator.h
index 8275693..0714a87 100644
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@ -17,8 +17,9 @@
#pragma once
#include <Ice/Ice.h>
+
+#include <AsteriskSCF/StateReplicator.h>
#include "SipStateReplicationIf.h"
-#include "StateReplicator.h"
#include "SipEndpointFactory.h"
namespace AsteriskSCF
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index 31518c2..02fce6d 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 <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;
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list