[hydra-commits] hydra/servicediscovery.git branch "master" updated.
Commits to the Hydra project code repositories
hydra-commits at lists.digium.com
Tue Aug 3 17:14:38 CDT 2010
branch "master" has been updated
via 49307005f3b586500cb3d1ce2a0f9eeb10e1a3cd (commit)
via c93e77fc245f52fdb8b7cd9e61a10b863da0eb81 (commit)
via c1a246713b7a40c08c9fac0768ad8f98dc0ff53a (commit)
from bf0d9d84ec852304cf65493760303bdb0883a723 (commit)
Summary of changes:
slice/service_locator.ice | 17 ++++++++---------
slice/service_locator_events.ice | 5 +++++
src/ServiceLocator.cpp | 11 +++++------
src/ServiceLocatorManagement.cpp | 11 +++++------
src/ServiceLocatorManagement.h | 28 ++++++++++++++--------------
src/ServiceManagement.cpp | 11 +++++------
src/ServiceManagement.h | 26 +++++++++++++-------------
test/TestServiceLocator.cpp | 2 +-
8 files changed, 56 insertions(+), 55 deletions(-)
- Log -----------------------------------------------------------------
commit 49307005f3b586500cb3d1ce2a0f9eeb10e1a3cd
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 3 19:28:17 2010 -0300
Ken won't let me have any fun so place TBD in spots that will need to be filled in.
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index c728e58..215255c 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -1,12 +1,12 @@
/*
- * ZOMGZHYDRA?!? -- An open source telephony framework.
+ * TBD -- An open source telephony framework.
*
* Copyright (C) 2010, Digium, Inc.
*
* Joshua Colp <jcolp at digium.com>
*
- * See http://www.IcanhazURL.org for more information about
- * the ZOMGZHYDRA?!? project. Please do not directly contact
+ * See TBD for more information about
+ * the TBD project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index 29f7016..b3707d6 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -1,12 +1,12 @@
/*
- * ZOMGZHYDRA?!? -- An open source telephony framework.
+ * TBD -- An open source telephony framework.
*
* Copyright (C) 2010, Digium, Inc.
*
* Joshua Colp <jcolp at digium.com>
*
- * See http://www.IcanhazURL.org for more information about
- * the ZOMGZHYDRA?!? project. Please do not directly contact
+ * See TBD for more information about
+ * the TBD project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index df3d54f..87b7810 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -1,12 +1,12 @@
/*
- * ZOMGZHYDRA?!? -- An open source telephony framework.
+ * TBD -- An open source telephony framework.
*
* Copyright (C) 2010, Digium, Inc.
*
* Joshua Colp <jcolp at digium.com>
*
- * See http://www.IcanhazURL.org for more information about
- * the ZOMGZHYDRA?!? project. Please do not directly contact
+ * See TBD for more information about
+ * the TBD project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index dbd7cc6..4e9fac7 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -1,12 +1,12 @@
/*
- * ZOMGZHYDRA?!? -- An open source telephony framework.
+ * TBD -- An open source telephony framework.
*
* Copyright (C) 2010, Digium, Inc.
*
* Joshua Colp <jcolp at digium.com>
*
- * See http://www.IcanhazURL.org for more information about
- * the ZOMGZHYDRA?!? project. Please do not directly contact
+ * See TBD for more information about
+ * the TBD project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index d6d2be8..f485ab4 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -1,12 +1,12 @@
/*
- * ZOMGZHYDRA?!? -- An open source telephony framework.
+ * TBD -- An open source telephony framework.
*
* Copyright (C) 2010, Digium, Inc.
*
* Joshua Colp <jcolp at digium.com>
*
- * See http://www.IcanhazURL.org for more information about
- * the ZOMGZHYDRA?!? project. Please do not directly contact
+ * See TBD for more information about
+ * the TBD project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
commit c93e77fc245f52fdb8b7cd9e61a10b863da0eb81
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 3 19:26:13 2010 -0300
Follow the style guideline a bit more.
diff --git a/slice/service_locator.ice b/slice/service_locator.ice
index 47a46b6..d385588 100644
--- a/slice/service_locator.ice
+++ b/slice/service_locator.ice
@@ -15,23 +15,17 @@ module V1
/**
* Exception used for service locator requests to indicate that no service could be found.
*/
- exception ServiceNotFound
- {
- };
+ exception ServiceNotFound { };
/**
* Exception used for indicating that a comparator is already registered with a given guid.
*/
- exception DuplicateCompare
- {
- };
+ exception DuplicateCompare { };
/**
* Exception used for indicating that a comparator was not found.
*/
- exception CompareNotFound
- {
- };
+ exception CompareNotFound { };
/**
* Generic service locator parameters class that more specific parameter classes can extend.
commit c1a246713b7a40c08c9fac0768ad8f98dc0ff53a
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 3 19:23:02 2010 -0300
We should actually be Hydra::System::Location and not just Hydra::Location
diff --git a/slice/service_locator.ice b/slice/service_locator.ice
index 5b97a58..47a46b6 100644
--- a/slice/service_locator.ice
+++ b/slice/service_locator.ice
@@ -3,6 +3,9 @@
module Hydra
{
+module System
+{
+
module Location
{
@@ -155,4 +158,6 @@ module V1
}; // end module Location
+}; // end module System
+
}; // end module Hydra
diff --git a/slice/service_locator_events.ice b/slice/service_locator_events.ice
index a42a2c1..aff6a1a 100644
--- a/slice/service_locator_events.ice
+++ b/slice/service_locator_events.ice
@@ -1,6 +1,9 @@
module Hydra
{
+module System
+{
+
module Location
{
@@ -59,4 +62,6 @@ module Location
}; // end module Location
+}; // end module System
+
}; // end module Hydra
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index a3cc274..c728e58 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -19,7 +19,6 @@
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
-#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
#include "service_locator.h"
@@ -29,8 +28,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::Location;
-using namespace Hydra::Location::V1;
+using namespace Hydra::System::Location;
+using namespace Hydra::System::Location::V1;
/**
* Implementation of the Ice::Application class
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index 72eb845..29f7016 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -18,7 +18,6 @@
#include <Ice/Ice.h>
-#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
#include "service_locator.h"
@@ -28,8 +27,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::Location;
-using namespace Hydra::Location::V1;
+using namespace Hydra::System::Location;
+using namespace Hydra::System::Location::V1;
/**
* Implementation of the locate method as defined in service_locator.ice
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index e66e761..df3d54f 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -36,7 +36,7 @@ public:
*
* @param compare A proxy to the comparator service we are wrapping.
*/
- ServiceLocatorComparator(const Hydra::Location::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
+ ServiceLocatorComparator(const Hydra::System::Location::V1::ServiceLocatorParamsComparePrx& compare) : mCompare(compare) { };
/**
* API call which forwards an isSupported over ICE to a remote comparator.
@@ -45,12 +45,12 @@ public:
*
* @return A boolean value with true indicating the parameters are supported while false indicates otherwise.
*/
- bool isSupported(const Hydra::Location::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
+ bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr& params) { return mCompare->isSupported(params); };
private:
/**
* A proxy to the comparator service that we are wrapping.
*/
- Hydra::Location::V1::ServiceLocatorParamsComparePrx mCompare;
+ Hydra::System::Location::V1::ServiceLocatorParamsComparePrx mCompare;
};
/**
@@ -61,17 +61,17 @@ typedef IceUtil::Handle<ServiceManagementImpl> ServiceManagementImplPtr;
/**
* Implementation of the ServiceLocatorManagement interface as defined in service_locator.ice
*/
-class ServiceLocatorManagementImpl : public Hydra::Location::V1::ServiceLocatorManagement
+class ServiceLocatorManagementImpl : public Hydra::System::Location::V1::ServiceLocatorManagement
{
public:
-ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::Location::EventsPrx& service_discovery_topic)
+ServiceLocatorManagementImpl(Ice::ObjectAdapterPtr adapter, const Hydra::System::Location::EventsPrx& service_discovery_topic)
: mAdapter(adapter), mLocatorTopic(service_discovery_topic) { };
- Ice::ObjectPrx locate(const Hydra::Location::V1::ServiceLocatorParamsPtr&);
- Ice::ObjectProxySeq locateAll(const Hydra::Location::V1::ServiceLocatorParamsPtr&);
- Hydra::Location::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
- void addCompare(const std::string&, const Hydra::Location::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
+ 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&);
void removeCompare(const std::string&, const Ice::Current&);
- bool isSupported(const std::string&, const Hydra::Location::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const std::string&, const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
void removeService(ServiceManagementImplPtr);
private:
/**
@@ -99,7 +99,7 @@ private:
/**
* A proxy that can be used to publish locator events.
*/
- Hydra::Location::EventsPrx mLocatorTopic;
+ Hydra::System::Location::EventsPrx mLocatorTopic;
};
#endif
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 4dfa3dc..dbd7cc6 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -18,7 +18,6 @@
#include <Ice/Ice.h>
-#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
#include "service_locator.h"
@@ -28,8 +27,8 @@
#include "ServiceManagement.h"
using namespace std;
-using namespace Hydra::Location;
-using namespace Hydra::Location::V1;
+using namespace Hydra::System::Location;
+using namespace Hydra::System::Location::V1;
/**
* Constructor for the ServiceManagementImpl class. This adds itself to the object adapter so the service can perform some management and
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index 49f72c6..d6d2be8 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -25,14 +25,14 @@
*/
class ServiceLocatorParamsSpec {
public:
-ServiceLocatorParamsSpec(const Hydra::Location::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
+ServiceLocatorParamsSpec(const Hydra::System::Location::V1::ServiceLocatorParamsPtr& params, const std::string& compare_guid, ServiceLocatorManagementImpl* management)
: mParams(params), mCompareGuid(compare_guid), mManagement(management) { };
- bool isSupported(const Hydra::Location::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
private:
/**
* A pointer to a parameters structure which describes what is supported.
*/
- Hydra::Location::V1::ServiceLocatorParamsPtr mParams;
+ Hydra::System::Location::V1::ServiceLocatorParamsPtr mParams;
/**
* A string containing the comparator uuid that should be used when comparing the parameters
@@ -49,11 +49,11 @@ private:
/**
* An implementation of the ServiceManagement interface as defined in service_locator.ice
*/
-class ServiceManagementImpl : public Hydra::Location::V1::ServiceManagement
+class ServiceManagementImpl : public Hydra::System::Location::V1::ServiceManagement
{
public:
- ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, Ice::ObjectAdapterPtr, const Hydra::Location::EventsPrx&, const std::string&);
- void addLocatorParams(const Hydra::Location::V1::ServiceLocatorParamsPtr&, const std::string&, const Ice::Current&);
+ 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&);
void suspend(const Ice::Current&);
void unsuspend(const Ice::Current&);
void unregister(const Ice::Current&);
@@ -66,9 +66,9 @@ public:
/**
* Function which returns a local proxy to this service's management interface.
*/
- Hydra::Location::V1::ServiceManagementPrx GetServiceManagementPrx() { return mManagementPrx; };
+ Hydra::System::Location::V1::ServiceManagementPrx GetServiceManagementPrx() { return mManagementPrx; };
- bool isSupported(const Hydra::Location::V1::ServiceLocatorParamsPtr&);
+ bool isSupported(const Hydra::System::Location::V1::ServiceLocatorParamsPtr&);
private:
/**
* Shared mutex lock which protects the service.
@@ -98,7 +98,7 @@ private:
/**
* A local proxy to this management service.
*/
- Hydra::Location::V1::ServiceManagementPrx mManagementPrx;
+ Hydra::System::Location::V1::ServiceManagementPrx mManagementPrx;
/**
* A vector of locator parameters that this service supports.
@@ -108,7 +108,7 @@ private:
/**
* A proxy that can be used to publish events to the service locator topic.
*/
- Hydra::Location::EventsPrx mLocatorTopic;
+ Hydra::System::Location::EventsPrx mLocatorTopic;
/**
* A string which contains a unique identifier for this service. This is used
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index a520371..ec3652e 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -11,7 +11,7 @@
#include "service_locator_events.h"
using namespace std;
-using namespace Hydra::Location::V1;
+using namespace Hydra::System::Location::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