[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "ami-collector" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:29:30 UTC 2011
branch "ami-collector" has been updated
via 9b8eccbfc360a670bc17745dc7b3a5e6f2130095 (commit)
via 624e9a297370e7c219c3b35461979f70809ac27a (commit)
via f8538d8aa2a01195253cbafd18c233dc3ef03915 (commit)
via 600eccc635534673c860f2ea11dd74a95eeea4d5 (commit)
from af8f47d218d96feef91bdd8ab11595b65d543bf5 (commit)
Summary of changes:
src/CMakeLists.txt | 3 +--
src/ServiceLocator.cpp | 8 ++++----
src/ServiceLocatorManagement.cpp | 8 ++++----
src/ServiceManagement.cpp | 8 ++++----
test/TestComparatorBlocking.cpp | 4 ++--
test/TestServiceLocator.cpp | 4 ++--
6 files changed, 17 insertions(+), 18 deletions(-)
- Log -----------------------------------------------------------------
commit 9b8eccbfc360a670bc17745dc7b3a5e6f2130095
Merge: af8f47d 624e9a2
Author: David M. Lee <dlee at digium.com>
Date: Fri Jan 7 15:29:15 2011 -0600
Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/servicediscovery into ami-collector
Conflicts:
src/CMakeLists.txt
src/ServiceLocatorManagement.cpp
src/ServiceManagement.cpp
diff --cc src/CMakeLists.txt
index 113a797,16acc68..4771d6a
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -28,9 -28,7 +28,8 @@@ asterisk_scf_component_add_boost_librar
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(${utils_dir}/AmiCollector/src)
+ include_directories(${logger_dir}/include)
asterisk_scf_component_build_icebox(service_locator)
target_link_libraries(service_locator logging-client)
diff --cc src/ServiceLocatorManagement.cpp
index f620d85,793fd0f..ad1e367
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@@ -19,8 -19,9 +19,10 @@@
#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 <AsteriskSCF/ResponseCollector.h>
#include "ServiceLocatorManagement.h"
#include "ServiceManagement.h"
diff --cc src/ServiceManagement.cpp
index 7e3f108,7c04930..6542f01
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@@ -19,8 -19,9 +19,10 @@@
#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 <AsteriskSCF/ResponseCollector.h>
#include "ServiceLocatorManagement.h"
#include "ServiceManagement.h"
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;
commit 600eccc635534673c860f2ea11dd74a95eeea4d5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 07:50:02 2011 -0600
Another named but unused exception variable... Visual Studio unhappy.
diff --git a/test/TestComparatorBlocking.cpp b/test/TestComparatorBlocking.cpp
index dc679ac..7879561 100644
--- a/test/TestComparatorBlocking.cpp
+++ b/test/TestComparatorBlocking.cpp
@@ -212,7 +212,7 @@ BOOST_AUTO_TEST_CASE(testNonBlocking)
{
Ice::ObjectPrx undiscovered = discovery->locate(dne);
BOOST_FAIL("Should not have found dne");
- } catch (const ServiceNotFound& expected) {
+ } catch (const ServiceNotFound&) {
// expected
}
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list