[hydra-commits] hydra/servicediscovery.git branch "master" updated.
Commits to the Hydra project code repositories
hydra-commits at lists.digium.com
Wed Aug 4 11:00:03 CDT 2010
branch "master" has been updated
via 6a6ba0b1030bad9f0247e8f9bd7358a76bd33db9 (commit)
from 2378b0d1916307afa63d153af41f312d5836ddac (commit)
Summary of changes:
slice/service_locator.ice | 4 ++--
slice/service_locator_events.ice | 4 ++--
src/ServiceLocator.cpp | 4 ++--
src/ServiceLocatorManagement.cpp | 16 ++++++++--------
src/ServiceLocatorManagement.h | 14 +++++++-------
src/ServiceManagement.cpp | 14 +++++++-------
src/ServiceManagement.h | 10 +++++-----
test/TestServiceLocator.cpp | 2 +-
8 files changed, 34 insertions(+), 34 deletions(-)
- Log -----------------------------------------------------------------
commit 6a6ba0b1030bad9f0247e8f9bd7358a76bd33db9
Author: Joshua Colp <jcolp at digium.com>
Date: Wed Aug 4 13:15:47 2010 -0300
Discovery is apparently fine as a package name.
diff --git a/slice/service_locator.ice b/slice/service_locator.ice
index d385588..ae0bea9 100644
--- a/slice/service_locator.ice
+++ b/slice/service_locator.ice
@@ -6,7 +6,7 @@ module Hydra
module System
{
-module Location
+module Discovery
{
module V1
@@ -150,7 +150,7 @@ module V1
}; // end module V1
-}; // end module Location
+}; // end module Discovery
}; // end module System
diff --git a/slice/service_locator_events.ice b/slice/service_locator_events.ice
index aff6a1a..9657779 100644
--- a/slice/service_locator_events.ice
+++ b/slice/service_locator_events.ice
@@ -4,7 +4,7 @@ module Hydra
module System
{
-module Location
+module Discovery
{
/**
@@ -60,7 +60,7 @@ module Location
void serviceUnsuspended(string guid);
};
-}; // end module Location
+}; // end module Discovery
}; // end module System
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 64c1965..eb3f124 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -26,8 +26,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Location;
-using namespace Hydra::System::Location::V1;
+using namespace Hydra::System::Discovery;
+using namespace Hydra::System::Discovery::V1;
/**
* Implementation of the Ice::Application class
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index b203d2a..40cc7f1 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -27,8 +27,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Location;
-using namespace Hydra::System::Location::V1;
+using namespace Hydra::System::Discovery;
+using namespace Hydra::System::Discovery::V1;
/**
* Small internal class which is used to store information about a comparator.
@@ -41,7 +41,7 @@ public:
*
* @param compare A proxy to the comparator service we are wrapping.
*/
- ServiceLocatorComparator(const Hydra::System::Location::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
+ ServiceLocatorComparator(const Hydra::System::Discovery::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
/**
* API call which forwards an isSupported over ICE to a remote comparator.
@@ -50,12 +50,12 @@ public:
*
* @return A boolean value with true indicating the parameters are supported while false indicates otherwise.
*/
- bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
+ bool isSupported(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
private:
/**
* A proxy to the comparator service that we are wrapping.
*/
- Hydra::System::Location::V1::ServiceLocatorParamsComparePrx mCompare;
+ Hydra::System::Discovery::V1::ServiceLocatorParamsComparePrx mCompare;
};
/**
@@ -64,7 +64,7 @@ private:
class ServiceLocatorManagementImplPriv : public Ice::Object
{
public:
- ServiceLocatorManagementImplPriv(Ice::ObjectAdapterPtr adapter, const Hydra::System::Location::EventsPrx& service_discovery_topic) :
+ ServiceLocatorManagementImplPriv(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic) :
mAdapter(adapter), mLocatorTopic(service_discovery_topic) { };
/**
* Shared mutex lock which protects the services and comparators.
@@ -91,13 +91,13 @@ public:
/**
* A proxy that can be used to publish locator events.
*/
- Hydra::System::Location::EventsPrx mLocatorTopic;
+ Hydra::System::Discovery::EventsPrx mLocatorTopic;
};
/**
* Implementation of a constructor for the ServiceLocatorManagementImpl class.
*/
-ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Location::EventsPrx& service_discovery_topic)
+ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic)
: mImpl(new ServiceLocatorManagementImplPriv(adapter, service_discovery_topic))
{
}
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 4d6af9a..30be1f6 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -40,16 +40,16 @@ class ServiceLocatorManagementImplPriv;
/**
* Implementation of the ServiceLocatorManagement interface as defined in service_locator.ice
*/
-class ServiceLocatorManagementImpl : public Hydra::System::Location::V1::ServiceLocatorManagement
+class ServiceLocatorManagementImpl : public Hydra::System::Discovery::V1::ServiceLocatorManagement
{
public:
- ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Location::EventsPrx& service_discovery_topic);
- Ice::ObjectPrx locate(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
- Ice::ObjectProxySeq locateAll(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
- Hydra::System::Location::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
- void addCompare(const std::string&, const Hydra::System::Location::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
+ ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic);
+ Ice::ObjectPrx locate(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&);
+ Ice::ObjectProxySeq locateAll(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&);
+ Hydra::System::Discovery::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
+ void addCompare(const std::string&, const Hydra::System::Discovery::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
void removeCompare(const std::string&, const Ice::Current&);
- bool isSupported(const std::string&, const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const std::string&, const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&);
void removeService(ServiceManagementImplPtr);
private:
/**
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index c183f04..b7bee8f 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -27,22 +27,22 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Location;
-using namespace Hydra::System::Location::V1;
+using namespace Hydra::System::Discovery;
+using namespace Hydra::System::Discovery::V1;
/**
* Small internal class which is used to store information about supported parameters.
*/
class ServiceLocatorParamsSpec {
public:
- ServiceLocatorParamsSpec(const Hydra::System::Location::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
+ ServiceLocatorParamsSpec(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
: mParams(params), mCompareGuid(compare_guid), mManagement(management) { };
- bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&);
private:
/**
* A pointer to a parameters structure which describes what is supported.
*/
- Hydra::System::Location::V1::ServiceLocatorParamsPtr mParams;
+ Hydra::System::Discovery::V1::ServiceLocatorParamsPtr mParams;
/**
* A string containing the comparator uuid that should be used when comparing the parameters
@@ -98,7 +98,7 @@ public:
/**
* A local proxy to this management service.
*/
- Hydra::System::Location::V1::ServiceManagementPrx mManagementPrx;
+ Hydra::System::Discovery::V1::ServiceManagementPrx mManagementPrx;
/**
* A vector of locator parameters that this service supports.
@@ -108,7 +108,7 @@ public:
/**
* A proxy that can be used to publish events to the service locator topic.
*/
- Hydra::System::Location::EventsPrx mLocatorTopic;
+ Hydra::System::Discovery::EventsPrx mLocatorTopic;
/**
* A string which contains a unique identifier for this service. This is used
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index 5ed468f..68ccc03 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -30,17 +30,17 @@ class ServiceManagementImplPriv;
/**
* An implementation of the ServiceManagement interface as defined in service_locator.ice
*/
-class ServiceManagementImpl : public Hydra::System::Location::V1::ServiceManagement
+class ServiceManagementImpl : public Hydra::System::Discovery::V1::ServiceManagement
{
public:
- ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, Ice::ObjectAdapterPtr, const Hydra::System::Location::EventsPrx&, const std::string&);
- void addLocatorParams(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&, const std::string&, const Ice::Current&);
+ ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, Ice::ObjectAdapterPtr, const Hydra::System::Discovery::EventsPrx&, const std::string&);
+ void addLocatorParams(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&, const std::string&, const Ice::Current&);
void suspend(const Ice::Current&);
void unsuspend(const Ice::Current&);
void unregister(const Ice::Current&);
Ice::ObjectPrx GetService();
- Hydra::System::Location::V1::ServiceManagementPrx GetServiceManagementPrx();
- bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
+ Hydra::System::Discovery::V1::ServiceManagementPrx GetServiceManagementPrx();
+ bool isSupported(const Hydra::System::Discovery::V1::ServiceLocatorParamsPtr&);
private:
/**
* Private implementation data for ServiceManagementImpl.
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index ec3652e..115c339 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -11,7 +11,7 @@
#include "service_locator_events.h"
using namespace std;
-using namespace Hydra::System::Location::V1;
+using namespace Hydra::System::Discovery::V1;
/* A basic compare service implementation that always returns true, this is registered as both a compare service
* and a regular service during testing.
-----------------------------------------------------------------------
--
hydra/servicediscovery.git
More information about the asterisk-scf-commits
mailing list