[asterisk-scf-commits] asterisk-scf/release/servicediscovery.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  624e9a297370e7c219c3b35461979f70809ac27a (commit)
       via  f8538d8aa2a01195253cbafd18c233dc3ef03915 (commit)
      from  600eccc635534673c860f2ea11dd74a95eeea4d5 (commit)

Summary of changes:
 src/CMakeLists.txt               |    3 +--
 src/ServiceLocator.cpp           |    8 ++++----
 src/ServiceLocatorManagement.cpp |    6 +++---
 src/ServiceManagement.cpp        |    6 +++---
 test/TestComparatorBlocking.cpp  |    2 +-
 test/TestServiceLocator.cpp      |    4 ++--
 6 files changed, 14 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit 624e9a297370e7c219c3b35461979f70809ac27a
Merge: f8538d8 600eccc
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Jan 7 15:04:31 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/servicediscovery


commit f8538d8aa2a01195253cbafd18c233dc3ef03915
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Jan 7 14:56:35 2011 -0600

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d9a45b..16acc68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,8 +28,7 @@ asterisk_scf_component_add_boost_libraries(service_locator core 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)
 
 asterisk_scf_component_build_icebox(service_locator)
 target_link_libraries(service_locator logging-client)
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index d5242fa..9c4f70b 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -18,14 +18,14 @@
 #include <IceStorm/IceStorm.h>
 #include <IceBox/IceBox.h>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Core/Discovery/ServiceLocatorEventsIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
+#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger/IceLogger.h>
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
 #include "CollocatedIceStorm.h"
-#include "logger.h"
-#include "IceLogger.h"
 
 using namespace std;
 using namespace AsteriskSCF::System::Discovery;
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index 29ca8b8..793fd0f 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -19,12 +19,12 @@
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Core/Discovery/ServiceLocatorEventsIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
+#include <AsteriskSCF/logger.h>
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
-#include "logger.h"
 
 using namespace std;
 using namespace AsteriskSCF::System::Discovery;
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 678bbd0..7c04930 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -19,12 +19,12 @@
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Core/Discovery/ServiceLocatorEventsIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
+#include <AsteriskSCF/logger.h>
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
-#include "logger.h"
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;
diff --git a/test/TestComparatorBlocking.cpp b/test/TestComparatorBlocking.cpp
index dc679ac..c77d2df 100644
--- a/test/TestComparatorBlocking.cpp
+++ b/test/TestComparatorBlocking.cpp
@@ -33,7 +33,7 @@
 
 #include <Ice/Ice.h>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 
 using namespace AsteriskSCF::Core::Discovery::V1;
 
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index 0450919..3c7292d 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -23,8 +23,8 @@
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Core/Discovery/ServiceLocatorEventsIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;

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


-- 
asterisk-scf/release/servicediscovery.git