[asterisk-scf-commits] asterisk-scf/release/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:03:53 UTC 2011
branch "master" has been updated
via 4412b56c2b6c9c7c0a8e67674e4b25fa62126cc8 (commit)
via fd0cca72f9619ceed4127ca377d17fcd9bbadb8e (commit)
from 0ec69e310c04cc5adc0fea1f363d35126c653c82 (commit)
Summary of changes:
src/BasicRoutingServiceApp.cpp | 14 +++++++-------
src/CMakeLists.txt | 5 ++---
src/EndpointRegistry.cpp | 3 ++-
src/EndpointRegistry.h | 2 +-
src/LuaScriptProcessor.cpp | 3 ++-
src/LuaScriptProcessor.h | 2 +-
src/RoutingAdmin.h | 2 +-
src/RoutingServiceEventPublisher.cpp | 3 ++-
src/RoutingServiceEventPublisher.h | 2 +-
src/ScriptProcessor.h | 2 +-
src/SessionRouter.cpp | 7 ++++---
src/SessionRouter.h | 5 +++--
test/MockBridge.h | 2 +-
test/MockBridgeManager.h | 2 +-
test/MockEndpointLocator.cpp | 5 +++--
test/MockSession.h | 2 +-
test/MockSessionEndpoint.h | 2 +-
test/SharedTestData.h | 8 ++++----
test/TestRouting.cpp | 8 ++++----
19 files changed, 42 insertions(+), 37 deletions(-)
- Log -----------------------------------------------------------------
commit 4412b56c2b6c9c7c0a8e67674e4b25fa62126cc8
Merge: fd0cca7 0ec69e3
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 15:03:54 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/routing
commit fd0cca72f9619ceed4127ca377d17fcd9bbadb8e
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 14:55:59 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index f32d60e..75c5a8f 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -19,19 +19,19 @@
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include "SmartProxy.h"
-#include "Core/Routing/RoutingIf.h"
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "SessionCommunications/SessionCommunicationsIf.h"
-#include "System/Component/ComponentServiceIf.h"
+#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/logger.h>
#include "LuaScriptProcessor.h"
#include "RoutingServiceEventPublisher.h"
#include "EndpointRegistry.h"
#include "RoutingAdmin.h"
#include "SessionRouter.h"
-#include "IceLogger.h"
-#include "logger.h"
using namespace std;
using namespace AsteriskSCF::SessionCommunications::V1;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04c5eda..cc8fe61 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,10 +26,9 @@ asterisk_scf_component_add_boost_libraries(BasicRoutingService thread date_time
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)
-include_directories(${utils_dir}/SmartProxy/src)
+include_directories(${utils_dir}/SmartProxy/include)
asterisk_scf_component_build_icebox(BasicRoutingService)
target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
diff --git a/src/EndpointRegistry.cpp b/src/EndpointRegistry.cpp
index 6993aeb..020d069 100644
--- a/src/EndpointRegistry.cpp
+++ b/src/EndpointRegistry.cpp
@@ -17,10 +17,11 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <AsteriskSCF/logger.h>
+
#include "RoutingServiceEventPublisher.h"
#include "EndpointRegistry.h"
#include "ScriptProcessor.h"
-#include "logger.h"
using namespace ::AsteriskSCF::Core::Routing::V1;
using namespace ::AsteriskSCF::System::Logging;
diff --git a/src/EndpointRegistry.h b/src/EndpointRegistry.h
index d85a015..e59044f 100644
--- a/src/EndpointRegistry.h
+++ b/src/EndpointRegistry.h
@@ -17,7 +17,7 @@
#include <boost/shared_ptr.hpp>
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
namespace AsteriskSCF
{
diff --git a/src/LuaScriptProcessor.cpp b/src/LuaScriptProcessor.cpp
index 08ee85a..fcc3066 100644
--- a/src/LuaScriptProcessor.cpp
+++ b/src/LuaScriptProcessor.cpp
@@ -18,8 +18,9 @@
#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <AsteriskSCF/logger.h>
+
#include "LuaScriptProcessor.h"
-#include "logger.h"
using namespace ::AsteriskSCF::Core::Endpoint::V1;
using namespace ::AsteriskSCF::System::Logging;
diff --git a/src/LuaScriptProcessor.h b/src/LuaScriptProcessor.h
index aa34bfd..b43c60a 100644
--- a/src/LuaScriptProcessor.h
+++ b/src/LuaScriptProcessor.h
@@ -17,8 +17,8 @@
#include <boost/shared_ptr.hpp>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include "ScriptProcessor.h"
-#include "RoutingIf.h"
namespace AsteriskSCF
{
diff --git a/src/RoutingAdmin.h b/src/RoutingAdmin.h
index dece098..9cf679a 100644
--- a/src/RoutingAdmin.h
+++ b/src/RoutingAdmin.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include "EndpointRegistry.h"
namespace AsteriskSCF
diff --git a/src/RoutingServiceEventPublisher.cpp b/src/RoutingServiceEventPublisher.cpp
index 5d120c5..fa00a8a 100644
--- a/src/RoutingServiceEventPublisher.cpp
+++ b/src/RoutingServiceEventPublisher.cpp
@@ -16,8 +16,9 @@
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
+#include <AsteriskSCF/logger.h>
+
#include "RoutingServiceEventPublisher.h"
-#include "logger.h"
using namespace ::std;
using namespace ::AsteriskSCF::Core::Routing::V1;
diff --git a/src/RoutingServiceEventPublisher.h b/src/RoutingServiceEventPublisher.h
index b3972b6..65ebd12 100644
--- a/src/RoutingServiceEventPublisher.h
+++ b/src/RoutingServiceEventPublisher.h
@@ -18,7 +18,7 @@
#include <Ice/Ice.h>
#include <boost/shared_ptr.hpp>
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
namespace AsteriskSCF
{
diff --git a/src/ScriptProcessor.h b/src/ScriptProcessor.h
index 3d549e6..cb1a988 100644
--- a/src/ScriptProcessor.h
+++ b/src/ScriptProcessor.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
namespace AsteriskSCF
{
diff --git a/src/SessionRouter.cpp b/src/SessionRouter.cpp
index 874f312..30abafe 100644
--- a/src/SessionRouter.cpp
+++ b/src/SessionRouter.cpp
@@ -16,11 +16,12 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/logger.h>
+
#include "SessionRouter.h"
#include "EndpointRegistry.h"
-#include "RoutingIf.h"
-#include "EndpointIf.h"
-#include "logger.h"
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Endpoint::V1;
diff --git a/src/SessionRouter.h b/src/SessionRouter.h
index d955519..6332292 100644
--- a/src/SessionRouter.h
+++ b/src/SessionRouter.h
@@ -18,8 +18,9 @@
#include <Ice/Ice.h>
#include <boost/shared_ptr.hpp>
-#include "SmartProxy.h"
-#include "SessionCommunications/SessionCommunicationsIf.h"
+#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+
#include "EndpointRegistry.h"
namespace AsteriskSCF
diff --git a/test/MockBridge.h b/test/MockBridge.h
index 1854c72..5a116bb 100644
--- a/test/MockBridge.h
+++ b/test/MockBridge.h
@@ -16,7 +16,7 @@
#pragma once
#include <Ice/Ice.h>
-#include "SessionCommunications/SessionCommunicationsIf.h"
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/MockBridgeManager.h b/test/MockBridgeManager.h
index 7c25c73..f741908 100644
--- a/test/MockBridgeManager.h
+++ b/test/MockBridgeManager.h
@@ -16,7 +16,7 @@
#pragma once
#include <Ice/Ice.h>
-#include "SessionCommunications/SessionCommunicationsIf.h"
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/MockEndpointLocator.cpp b/test/MockEndpointLocator.cpp
index a8a9066..7bf3d12 100644
--- a/test/MockEndpointLocator.cpp
+++ b/test/MockEndpointLocator.cpp
@@ -15,8 +15,9 @@
*/
#include <Ice/Ice.h>
-#include "EndpointIf.h"
-#include "RoutingIf.h"
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+
#include "MockEndpointLocator.h"
#include "SharedTestData.h"
diff --git a/test/MockSession.h b/test/MockSession.h
index 3bdcdd8..0e59151 100644
--- a/test/MockSession.h
+++ b/test/MockSession.h
@@ -16,7 +16,7 @@
#pragma once
#include <Ice/Ice.h>
-#include "SessionCommunicationsIf.h"
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/MockSessionEndpoint.h b/test/MockSessionEndpoint.h
index cebcd0e..55a2de6 100644
--- a/test/MockSessionEndpoint.h
+++ b/test/MockSessionEndpoint.h
@@ -16,7 +16,7 @@
#pragma once
#include <Ice/Ice.h>
-#include "SessionCommunicationsIf.h"
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include "MockSession.h"
namespace AsteriskSCF
diff --git a/test/SharedTestData.h b/test/SharedTestData.h
index e1770eb..dd7d145 100644
--- a/test/SharedTestData.h
+++ b/test/SharedTestData.h
@@ -17,13 +17,13 @@
#include <Ice/Ice.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+
#include "MockBridgeManager.h"
#include "MockEndpointLocator.h"
-#include "RoutingIf.h"
-#include "ServiceLocatorIf.h"
-#include "SessionCommunicationsIf.h"
-
namespace AsteriskSCF
{
namespace RoutingTest
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 9ba8016..0c5d4c7 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -22,16 +22,16 @@
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+
#include "SharedTestData.h"
#include "MockBridge.h"
#include "MockBridgeManager.h"
#include "MockSession.h"
#include "MockSessionEndpoint.h"
-#include "RoutingIf.h"
-#include "ServiceLocatorIf.h"
-#include "SessionCommunicationsIf.h"
-
using namespace std;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Endpoint::V1;
-----------------------------------------------------------------------
--
asterisk-scf/release/routing.git
More information about the asterisk-scf-commits
mailing list