[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Sep 9 08:41:08 CDT 2010
branch "master" has been updated
via f89cf4f41f2b75e87ac8a3041db15e610401807d (commit)
from 90bb8cb03131d5506439847a4eb7c33f7d99c12f (commit)
Summary of changes:
slice | 2 +-
src/ServiceLocator.cpp | 4 ++--
src/ServiceLocatorManagement.cpp | 16 ++++++++--------
src/ServiceLocatorManagement.h | 14 +++++++-------
src/ServiceManagement.cpp | 14 +++++++-------
src/ServiceManagement.h | 10 +++++-----
test/TestServiceLocator.cpp | 2 +-
7 files changed, 31 insertions(+), 31 deletions(-)
- Log -----------------------------------------------------------------
commit f89cf4f41f2b75e87ac8a3041db15e610401807d
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Sep 9 10:47:59 2010 -0300
Update to latest slice.
diff --git a/slice b/slice
index 079ecce..14413db 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 079ecce809a4748542aaea1dda341c5d78f649d9
+Subproject commit 14413db47bfae3d1ff57d36e80cfe700d755ae0b
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 81755d7..27d02b4 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -16,8 +16,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Discovery;
-using namespace Hydra::Core::Discovery::V1;
+using namespace AsteriskSCF::System::Discovery;
+using namespace AsteriskSCF::Core::Discovery::V1;
/**
* Implementation of the Ice::Application class
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index c835d51..f0a1d26 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -18,8 +18,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Discovery;
-using namespace Hydra::Core::Discovery::V1;
+using namespace AsteriskSCF::System::Discovery;
+using namespace AsteriskSCF::Core::Discovery::V1;
/**
* Small internal class which is used to store information about a comparator.
@@ -32,7 +32,7 @@ public:
*
* @param compare A proxy to the comparator service we are wrapping.
*/
- ServiceLocatorComparator(const Hydra::Core::Discovery::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
+ ServiceLocatorComparator(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
/**
* API call which forwards an isSupported over ICE to a remote comparator.
@@ -41,12 +41,12 @@ public:
*
* @return A boolean value with true indicating the parameters are supported while false indicates otherwise.
*/
- bool isSupported(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
+ bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
private:
/**
* A proxy to the comparator service that we are wrapping.
*/
- Hydra::Core::Discovery::V1::ServiceLocatorParamsComparePrx mCompare;
+ AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsComparePrx mCompare;
};
/**
@@ -55,7 +55,7 @@ private:
class ServiceLocatorManagementImplPriv : public Ice::Object
{
public:
- ServiceLocatorManagementImplPriv(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic) :
+ ServiceLocatorManagementImplPriv(Ice::ObjectAdapterPtr adapter, const AsteriskSCF::System::Discovery::EventsPrx& service_discovery_topic) :
mAdapter(adapter), mLocatorTopic(service_discovery_topic) { };
/**
* Shared mutex lock which protects the services and comparators.
@@ -82,13 +82,13 @@ public:
/**
* A proxy that can be used to publish locator events.
*/
- Hydra::System::Discovery::EventsPrx mLocatorTopic;
+ AsteriskSCF::System::Discovery::EventsPrx mLocatorTopic;
};
/**
* Implementation of a constructor for the ServiceLocatorManagementImpl class.
*/
-ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic)
+ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const AsteriskSCF::System::Discovery::EventsPrx& service_discovery_topic)
: mImpl(new ServiceLocatorManagementImplPriv(adapter, service_discovery_topic))
{
}
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 26ca380..525bfc9 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -30,16 +30,16 @@ class ServiceLocatorManagementImplPriv;
/**
* Implementation of the ServiceLocatorManagement interface as defined in service_locator.ice
*/
-class ServiceLocatorManagementImpl : public Hydra::Core::Discovery::V1::ServiceLocatorManagement
+class ServiceLocatorManagementImpl : public AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagement
{
public:
- ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Discovery::EventsPrx& service_discovery_topic);
- Ice::ObjectPrx locate(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&);
- Ice::ObjectProxySeq locateAll(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&);
- Hydra::Core::Discovery::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
- void addCompare(const std::string&, const Hydra::Core::Discovery::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
+ ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const AsteriskSCF::System::Discovery::EventsPrx& service_discovery_topic);
+ Ice::ObjectPrx locate(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
+ Ice::ObjectProxySeq locateAll(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
+ AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
+ void addCompare(const std::string&, const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
void removeCompare(const std::string&, const Ice::Current&);
- bool isSupported(const std::string&, const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const std::string&, const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
void removeService(ServiceManagementImplPtr);
private:
/**
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 565782f..3283725 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -18,22 +18,22 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::System::Discovery;
-using namespace Hydra::Core::Discovery::V1;
+using namespace AsteriskSCF::System::Discovery;
+using namespace AsteriskSCF::Core::Discovery::V1;
/**
* Small internal class which is used to store information about supported parameters.
*/
class ServiceLocatorParamsSpec {
public:
- ServiceLocatorParamsSpec(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
+ ServiceLocatorParamsSpec(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
: mParams(params), mCompareGuid(compare_guid), mManagement(management) { };
- bool isSupported(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
private:
/**
* A pointer to a parameters structure which describes what is supported.
*/
- Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr mParams;
+ AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr mParams;
/**
* A string containing the comparator uuid that should be used when comparing the parameters
@@ -89,7 +89,7 @@ public:
/**
* A local proxy to this management service.
*/
- Hydra::Core::Discovery::V1::ServiceManagementPrx mManagementPrx;
+ AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx mManagementPrx;
/**
* A vector of locator parameters that this service supports.
@@ -99,7 +99,7 @@ public:
/**
* A proxy that can be used to publish events to the service locator topic.
*/
- Hydra::System::Discovery::EventsPrx mLocatorTopic;
+ AsteriskSCF::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 efd0d0f..e8cc0ad 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -20,17 +20,17 @@ class ServiceManagementImplPriv;
/**
* An implementation of the ServiceManagement interface as defined in service_locator.ice
*/
-class ServiceManagementImpl : public Hydra::Core::Discovery::V1::ServiceManagement
+class ServiceManagementImpl : public AsteriskSCF::Core::Discovery::V1::ServiceManagement
{
public:
- ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, Ice::ObjectAdapterPtr, const Hydra::System::Discovery::EventsPrx&, const std::string&);
- void addLocatorParams(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&, const std::string&, const Ice::Current&);
+ ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, Ice::ObjectAdapterPtr, const AsteriskSCF::System::Discovery::EventsPrx&, const std::string&);
+ void addLocatorParams(const AsteriskSCF::Core::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::Core::Discovery::V1::ServiceManagementPrx GetServiceManagementPrx();
- bool isSupported(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr&);
+ AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx GetServiceManagementPrx();
+ bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
private:
/**
* Private implementation data for ServiceManagementImpl.
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index 917448b..1da8ce9 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -19,7 +19,7 @@
#include "Core/Discovery/ServiceLocatorEventsIf.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
+using namespace AsteriskSCF::Core::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.
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list