[hydra-commits] hydra/servicediscovery.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  e768c04d261d1efb3f7c0cac3570e66812bac893 (commit)
      from  a3e959f403c977c1cbebee6892c927b5dd338d75 (commit)

Summary of changes:
 slice                            |    2 +-
 src/ServiceLocator.cpp           |    4 ++--
 src/ServiceLocatorManagement.cpp |    4 ++--
 src/ServiceManagement.cpp        |    4 ++--
 test/TestServiceLocator.cpp      |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit e768c04d261d1efb3f7c0cac3570e66812bac893
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Aug 6 13:17:26 2010 -0300

    Update to the new location for service locator slice.

diff --git a/slice b/slice
index 4bcec48..5caa209 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 4bcec48e26831c99d66af8c46c6ed68b2dcd0687
+Subproject commit 5caa209193d349a49ebb6035201e093b68eba945
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index eca0a41..6493f39 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -19,8 +19,8 @@
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 
-#include "Core/ServiceLocatorI.h"
-#include "Core/ServiceLocatorEventsI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorEventsI.h"
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index a54ae06..6ca2c33 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -20,8 +20,8 @@
 
 #include <boost/thread/shared_mutex.hpp>
 
-#include "Core/ServiceLocatorI.h"
-#include "Core/ServiceLocatorEventsI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorEventsI.h"
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 45c77b1..8aeef74 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -20,8 +20,8 @@
 
 #include <boost/thread/shared_mutex.hpp>
 
-#include "Core/ServiceLocatorI.h"
-#include "Core/ServiceLocatorEventsI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorEventsI.h"
 
 #include "ServiceLocatorManagement.h"
 #include "ServiceManagement.h"
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index eeac3a1..4ad6f48 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -7,8 +7,8 @@
 
 #include <Ice/Ice.h>
 
-#include "Core/ServiceLocatorI.h"
-#include "Core/ServiceLocatorEventsI.h"
+#include "Core/Discovery/ServiceLocatorI.h"
+#include "Core/Discovery/ServiceLocatorEventsI.h"
 
 using namespace std;
 using namespace Hydra::Core::Discovery::V1;

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


-- 
hydra/servicediscovery.git