[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "boostctl" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Dec 3 14:15:13 CST 2010
branch "boostctl" has been created
at 6cbcbd657a8a8c8982a237b79fc06028688f2d7c (commit)
- Log -----------------------------------------------------------------
commit 6cbcbd657a8a8c8982a237b79fc06028688f2d7c
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Dec 3 14:09:41 2010 -0600
Manage boost link options in CMake.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 146f2aa..2d9a45b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.h)
asterisk_scf_component_add_ice_libraries(service_locator IceStorm)
asterisk_scf_component_add_ice_libraries(service_locator IceBox)
-asterisk_scf_component_add_boost_libraries(service_locator core thread)
+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}")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e868a5a..a2dc5ef 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,7 +12,7 @@ asterisk_scf_component_add_slice(service_locator_test ServiceLocatorIf)
asterisk_scf_component_add_slice(service_locator_test ServiceLocatorEventsIf)
asterisk_scf_component_add_file(service_locator_test TestServiceLocator.cpp)
asterisk_scf_component_add_ice_libraries(service_locator_test IceStorm)
-asterisk_scf_component_add_boost_libraries(service_locator_test unit_test_framework)
+asterisk_scf_component_add_boost_libraries(service_locator_test unit_test_framework -DBOOST_TEST_DYN_LINK)
asterisk_scf_component_build_icebox(service_locator_test)
#asterisk_scf_component_install(service_locator_test RUNTIME bin "Service Locator Test Driver." Core)
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index 080a822..92a49f8 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -14,7 +14,6 @@
* at the top of the source tree.
*/
-#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE ServiceLocatorTestSuite
#define BOOST_TEST_NO_MAIN
commit d41f217d31d10eb1116bbca39cc50d786794a177
Author: David M. Lee <dlee at digium.com>
Date: Thu Nov 18 15:21:56 2010 -0600
Removed redundant typedef.
diff --git a/src/CollocatedIceStorm.h b/src/CollocatedIceStorm.h
index da792f2..e8b5da5 100644
--- a/src/CollocatedIceStorm.h
+++ b/src/CollocatedIceStorm.h
@@ -31,9 +31,6 @@ namespace ServiceDiscovery
* a separate process to access IceStorm services.
*/
-class CollocatedIceStorm;
-typedef IceUtil::Handle<CollocatedIceStorm> CollocatedIceStormPtr;
-
class CollocatedIceStorm : public IceUtil::Shared
{
public:
commit 104d395b4080eb675a7846afb5cd1602349cdb01
Author: David M. Lee <dlee at digium.com>
Date: Mon Nov 15 14:03:38 2010 -0600
Updated indentation to match the style guide.
diff --git a/src/CollocatedIceStorm.h b/src/CollocatedIceStorm.h
index 8e6d32f..da792f2 100644
--- a/src/CollocatedIceStorm.h
+++ b/src/CollocatedIceStorm.h
@@ -28,7 +28,7 @@ namespace ServiceDiscovery
{
/**
* A helper class that instantiates IceStorm in-process, removing the need to launch
- * a separate process to access IceStorm services.
+ * a separate process to access IceStorm services.
*/
class CollocatedIceStorm;
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 3e2d884..b76772c 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -35,7 +35,7 @@ using namespace AsteriskSCF::ServiceDiscovery;
namespace
{
- Logger const &lg = getLoggerFactory().getLogger("AsteriskSCF.System.Discovery");
+Logger const &lg = getLoggerFactory().getLogger("AsteriskSCF.System.Discovery");
/**
* Implementation of the Ice::Application class
@@ -44,8 +44,8 @@ class ServiceLocatorApp : public IceBox::Service
{
public:
void start(const string& name,
- const Ice::CommunicatorPtr& communicator,
- const Ice::StringSeq& args);
+ const Ice::CommunicatorPtr& communicator,
+ const Ice::StringSeq& args);
void stop();
private:
@@ -61,7 +61,7 @@ private:
class ServiceLocatorImpl : public ServiceLocator
{
public:
- ServiceLocatorImpl(ServiceLocatorManagementImpl* LocatorServiceManagement) :
+ ServiceLocatorImpl(ServiceLocatorManagementImpl* LocatorServiceManagement) :
mLocatorServiceManagement(LocatorServiceManagement) { };
Ice::ObjectPrx locate(const ServiceLocatorParamsPtr&, const Ice::Current&);
Ice::ObjectProxySeq locateAll(const ServiceLocatorParamsPtr&, const Ice::Current&);
@@ -80,9 +80,9 @@ private:
* Implementation of the locate method as defined in service_locator.ice
*/
Ice::ObjectPrx ServiceLocatorImpl::locate(const ServiceLocatorParamsPtr& params,
- const Ice::Current&)
+ const Ice::Current&)
{
- /* This API call forwards into the management implementation, it is separated to
+ /* This API call forwards into the management implementation, it is separated to
* provide a level of security. */
return mLocatorServiceManagement->locate(params);
}
@@ -91,7 +91,7 @@ Ice::ObjectPrx ServiceLocatorImpl::locate(const ServiceLocatorParamsPtr& params,
* Implementation of the locateAll method as defined in service_locator.ice
*/
Ice::ObjectProxySeq ServiceLocatorImpl::locateAll(const ServiceLocatorParamsPtr& params,
- const Ice::Current&)
+ const Ice::Current&)
{
/* This API call forwards into the management implementation, it is separated to
* provide a level of security. */
@@ -108,7 +108,7 @@ void ServiceLocatorApp::start(const string& name, const Ice::CommunicatorPtr& co
/* Talk to the topic manager to either create or get the service discovery topic,
* configured or default */
IceStorm::TopicManagerPrx topicManager = IceStorm::TopicManagerPrx::checkedCast(
- communicator->propertyToProxy("TopicManager.Proxy"));
+ communicator->propertyToProxy("TopicManager.Proxy"));
EventsPrx serviceDiscoveryTopic;
@@ -153,13 +153,13 @@ void ServiceLocatorApp::start(const string& name, const Ice::CommunicatorPtr& co
* into the infrastructure while discovery as a read only function may be allowed to all.
*/
mManagementAdapter= communicator->createObjectAdapter(
- "ServiceLocatorManagementAdapter");
+ "ServiceLocatorManagementAdapter");
ServiceLocatorManagementImpl* locatorServiceManagement =
new ServiceLocatorManagementImpl(mManagementAdapter, serviceDiscoveryTopic);
mManagementAdapter->add(locatorServiceManagement,
- communicator->stringToIdentity("LocatorServiceManagement"));
+ communicator->stringToIdentity("LocatorServiceManagement"));
mManagementAdapter->activate();
@@ -206,8 +206,8 @@ void ServiceLocatorApp::stop()
extern "C"
{
- ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
- {
- return new ServiceLocatorApp;
- }
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+{
+ return new ServiceLocatorApp;
+}
}
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index 0a3b2c8..e48dbd7 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -53,8 +53,8 @@ public:
* @param compare A proxy to the comparator service we are wrapping.
*/
ServiceLocatorComparator(const ServiceLocatorParamsComparePrx& compare) :
- mCompare(compare)
- {
+ mCompare(compare)
+ {
}
/**
@@ -84,8 +84,8 @@ class ServiceLocatorManagementImplPriv : public Ice::Object
{
public:
ServiceLocatorManagementImplPriv(const Ice::ObjectAdapterPtr& adapter, const EventsPrx& serviceDiscoveryTopic) :
- mAdapter(adapter), mLocatorTopic(serviceDiscoveryTopic)
- {
+ mAdapter(adapter), mLocatorTopic(serviceDiscoveryTopic)
+ {
};
/**
@@ -123,9 +123,9 @@ using namespace AsteriskSCF::ServiceDiscovery;
/**
* Implementation of a constructor for the ServiceLocatorManagementImpl class.
*/
-ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(const Ice::ObjectAdapterPtr& adapter,
- const EventsPrx& serviceDiscoveryTopic) :
- mImpl(new ServiceLocatorManagementImplPriv(adapter, serviceDiscoveryTopic))
+ServiceLocatorManagementImpl::ServiceLocatorManagementImpl(const Ice::ObjectAdapterPtr& adapter,
+ const EventsPrx& serviceDiscoveryTopic) :
+ mImpl(new ServiceLocatorManagementImplPriv(adapter, serviceDiscoveryTopic))
{
}
@@ -151,13 +151,13 @@ Ice::ObjectPrx ServiceLocatorManagementImpl::locate(const ServiceLocatorParamsPt
* Implementation of the locateAll method as defined in service_locator.ice
*/
Ice::ObjectProxySeq ServiceLocatorManagementImpl::locateAll(
- const ServiceLocatorParamsPtr& params)
+ const ServiceLocatorParamsPtr& params)
{
boost::shared_lock<boost::shared_mutex> lock(mImpl->mLock);
Ice::ObjectProxySeq applicableServices;
- for (vector<ServiceManagementImplPtr>::iterator service = mImpl->mServices.begin();
- service != mImpl->mServices.end(); ++service)
+ for (vector<ServiceManagementImplPtr>::iterator service = mImpl->mServices.begin();
+ service != mImpl->mServices.end(); ++service)
{
if ((*service)->isSupported(params) == true)
{
@@ -180,66 +180,66 @@ Ice::ObjectProxySeq ServiceLocatorManagementImpl::locateAll(
*/
ServiceManagementPrx ServiceLocatorManagementImpl::addService(const Ice::ObjectPrx& service, const string& guid, const Ice::Current&)
{
- lg(Info) << "addService " << guid << '.';
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- ServiceManagementImplPtr new_service = new ServiceManagementImpl(this, service,
- mImpl->mAdapter, mImpl->mLocatorTopic, guid);
+ lg(Info) << "addService " << guid << '.';
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ ServiceManagementImplPtr new_service = new ServiceManagementImpl(this, service,
+ mImpl->mAdapter, mImpl->mLocatorTopic, guid);
- mImpl->mServices.push_back(new_service);
+ mImpl->mServices.push_back(new_service);
- return new_service->getServiceManagementPrx();
+ return new_service->getServiceManagementPrx();
}
ServiceInfoSeq ServiceLocatorManagementImpl::getServices(const ::Ice::Current&) const
{
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- ServiceInfoSeq r;
- for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
- i != mImpl->mServices.end();
- ++i)
- {
- ServiceInfo v = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
- r.push_back(v);
- }
- return r;
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ ServiceInfoSeq r;
+ for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
+ i != mImpl->mServices.end();
+ ++i)
+ {
+ ServiceInfo v = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
+ r.push_back(v);
+ }
+ return r;
}
ServiceInfo ServiceLocatorManagementImpl::getService(const std::string &guid, const ::Ice::Current&) const
{
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
- i != mImpl->mServices.end();
- ++i)
- {
- if (guid == (*i)->getGuid()) {
- ServiceInfo r = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
- return r;
- }
- }
- throw ServiceNotFound();
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
+ i != mImpl->mServices.end();
+ ++i)
+ {
+ if (guid == (*i)->getGuid()) {
+ ServiceInfo r = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
+ return r;
+ }
+ }
+ throw ServiceNotFound();
}
/**
* Implementation of the addCompare method as defined in service_locator.ice
*/
void ServiceLocatorManagementImpl::addCompare(const string& guid,
- const ServiceLocatorParamsComparePrx& service, const Ice::Current&)
+ const ServiceLocatorParamsComparePrx& service, const Ice::Current&)
{
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- ServiceLocatorComparator newComparator(service);
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ ServiceLocatorComparator newComparator(service);
- pair<map<string, ServiceLocatorComparator>::iterator, bool> insertPair = mImpl->mCompares.insert(pair<string, ServiceLocatorComparator>(guid,
- newComparator));
+ pair<map<string, ServiceLocatorComparator>::iterator, bool> insertPair = mImpl->mCompares.insert(pair<string, ServiceLocatorComparator>(guid,
+ newComparator));
- if (insertPair.second == false)
- {
- throw DuplicateCompare();
- }
+ if (insertPair.second == false)
+ {
+ throw DuplicateCompare();
+ }
- if (mImpl->mLocatorTopic)
- {
- mImpl->mLocatorTopic->comparisonRegistered(guid);
- }
+ if (mImpl->mLocatorTopic)
+ {
+ mImpl->mLocatorTopic->comparisonRegistered(guid);
+ }
}
/**
@@ -247,45 +247,45 @@ void ServiceLocatorManagementImpl::addCompare(const string& guid,
*/
void ServiceLocatorManagementImpl::removeCompare(const string& guid, const Ice::Current&)
{
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- int erased = mImpl->mCompares.erase(guid);
-
- if (!erased)
- {
- throw CompareNotFound();
- }
- else if (mImpl->mLocatorTopic)
- {
- mImpl->mLocatorTopic->comparisonUnregistered(guid);
- }
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ int erased = mImpl->mCompares.erase(guid);
+
+ if (!erased)
+ {
+ throw CompareNotFound();
+ }
+ else if (mImpl->mLocatorTopic)
+ {
+ mImpl->mLocatorTopic->comparisonUnregistered(guid);
+ }
}
/**
* Implementation of the isSupported method as defined in service_locator.ice
*/
bool ServiceLocatorManagementImpl::isSupported(const string& compareGuid,
- const ServiceLocatorParamsPtr& params)
+ const ServiceLocatorParamsPtr& params)
{
- /* You'll note there is no lock here. This is because we already have a lock in the locate or locateAll
- * functions.
- */
- map<string, ServiceLocatorComparator>::iterator comparator =
- mImpl->mCompares.find(compareGuid);
-
- if (comparator == mImpl->mCompares.end())
- {
- return false;
- }
-
- try
- {
- return (comparator->second).isSupported(params);
- }
- catch (...)
- {
- lg(Error) << "An exception was raised when attempting to contact comparator " << compareGuid << ".";
- return false;
- }
+ /* You'll note there is no lock here. This is because we already have a lock in the locate or locateAll
+ * functions.
+ */
+ map<string, ServiceLocatorComparator>::iterator comparator =
+ mImpl->mCompares.find(compareGuid);
+
+ if (comparator == mImpl->mCompares.end())
+ {
+ return false;
+ }
+
+ try
+ {
+ return (comparator->second).isSupported(params);
+ }
+ catch (...)
+ {
+ lg(Error) << "An exception was raised when attempting to contact comparator " << compareGuid << ".";
+ return false;
+ }
}
/**
@@ -293,16 +293,16 @@ bool ServiceLocatorManagementImpl::isSupported(const string& compareGuid,
*/
void ServiceLocatorManagementImpl::removeService(const ServiceManagementImplPtr& service)
{
- lg(Info) << "removeService " << service->getGuid() << '.';
- boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- for (vector<ServiceManagementImplPtr>::iterator existingService =
- mImpl->mServices.begin();
- existingService != mImpl->mServices.end(); ++existingService)
- {
- if ((*existingService) == service)
- {
- mImpl->mServices.erase(existingService);
- return;
- }
- }
+ lg(Info) << "removeService " << service->getGuid() << '.';
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ for (vector<ServiceManagementImplPtr>::iterator existingService =
+ mImpl->mServices.begin();
+ existingService != mImpl->mServices.end(); ++existingService)
+ {
+ if ((*existingService) == service)
+ {
+ mImpl->mServices.erase(existingService);
+ return;
+ }
+ }
}
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 8b118df..2e6a361 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -44,7 +44,7 @@ class ServiceLocatorManagementImpl : public AsteriskSCF::Core::Discovery::V1::Se
{
public:
ServiceLocatorManagementImpl(const Ice::ObjectAdapterPtr& adapter,
- const AsteriskSCF::System::Discovery::EventsPrx& serviceDiscoveryTopic);
+ const AsteriskSCF::System::Discovery::EventsPrx& serviceDiscoveryTopic);
Ice::ObjectPrx locate(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
Ice::ObjectProxySeq locateAll(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index af4c873..f8ae230 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -43,15 +43,15 @@ namespace ServiceDiscovery
/**
* Small internal class which is used to store information about supported parameters.
*/
-class ServiceLocatorParamsSpec
+class ServiceLocatorParamsSpec
{
public:
- ServiceLocatorParamsSpec(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const std::string& compareGuid,
- ServiceLocatorManagementImpl* management) :
- mParams(params),
- mCompareGuid(compareGuid),
- mManagement(management)
- {
+ ServiceLocatorParamsSpec(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const std::string& compareGuid,
+ ServiceLocatorManagementImpl* management) :
+ mParams(params),
+ mCompareGuid(compareGuid),
+ mManagement(management)
+ {
}
bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
@@ -81,9 +81,9 @@ class ServiceManagementImplPriv
{
public:
ServiceManagementImplPriv(ServiceManagementImpl* impl, ServiceLocatorManagementImpl* management,
- const Ice::ObjectPrx& service, const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Discovery::EventsPrx& serviceDiscoveryTopic,
- const string& guid) :
- mSuspended(false), mManagement(management), mService(service), mAdapter(adapter),
+ const Ice::ObjectPrx& service, const Ice::ObjectAdapterPtr& adapter, const AsteriskSCF::System::Discovery::EventsPrx& serviceDiscoveryTopic,
+ const string& guid) :
+ mSuspended(false), mManagement(management), mService(service), mAdapter(adapter),
mLocatorTopic(serviceDiscoveryTopic), mGuid(guid)
{
mManagementPrx = ServiceManagementPrx::uncheckedCast(mAdapter->addWithUUID(impl));
@@ -148,8 +148,8 @@ using namespace AsteriskSCF::System::Discovery;
* Constructor for the ServiceManagementImpl class. This adds itself to the object adapter so the service can perform some management and
* also sends out an event for those that are listening.
*/
-ServiceManagementImpl::ServiceManagementImpl(ServiceLocatorManagementImpl* management,
- const Ice::ObjectPrx& service, const Ice::ObjectAdapterPtr& adapter, const EventsPrx& serviceDiscoveryTopic, const string& guid) :
+ServiceManagementImpl::ServiceManagementImpl(ServiceLocatorManagementImpl* management,
+ const Ice::ObjectPrx& service, const Ice::ObjectAdapterPtr& adapter, const EventsPrx& serviceDiscoveryTopic, const string& guid) :
mImpl(new ServiceManagementImplPriv(this, management, service, adapter, serviceDiscoveryTopic, guid))
{
}
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index bf4fd5f..1f30b10 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -34,7 +34,7 @@ class ServiceManagementImpl : public AsteriskSCF::Core::Discovery::V1::ServiceMa
{
public:
ServiceManagementImpl(ServiceLocatorManagementImpl*, const Ice::ObjectPrx&, const Ice::ObjectAdapterPtr&,
- const AsteriskSCF::System::Discovery::EventsPrx&, const std::string&);
+ const AsteriskSCF::System::Discovery::EventsPrx&, const std::string&);
//
// AsteriskSCF::Core::Discovery::V1::ServiceManagement interface.
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index 4866df8..080a822 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -92,11 +92,11 @@ public:
ServiceLocatorParamsComparePrx foundCompare;
/* Common implementation for locating a service */
- bool findService(const string& category)
+ bool findService(const string& category)
{
bool found = true;
- try
+ try
{
/* Setup our parameters, for now we are simply using test as the category */
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
@@ -106,12 +106,12 @@ public:
foundCompare = ServiceLocatorParamsComparePrx::uncheckedCast(discovery->locate(params));
/* If we get here we didn't get an exception back telling us no service found... which is wrong! */
- }
- catch (const ServiceNotFound&)
+ }
+ catch (const ServiceNotFound&)
{
found = false;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
@@ -122,33 +122,33 @@ public:
}
/* Common implementation for finding multiple services */
- bool findServices(const string& category, unsigned int expectedNumOfResults)
+ bool findServices(const string& category, unsigned int expectedNumOfResults)
{
bool found = true;
- try
+ try
{
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
params->category = category;
Ice::ObjectProxySeq services = discovery->locateAll(params);
- if (services.size() != expectedNumOfResults)
+ if (services.size() != expectedNumOfResults)
{
found = false;
}
- }
- catch (const ServiceNotFound&)
+ }
+ catch (const ServiceNotFound&)
{
found = false;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
found = false;
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -189,14 +189,14 @@ struct GlobalIceFixture
testbed.management = ServiceLocatorManagementPrx::checkedCast(testbed.communicatorOutgoing->stringToProxy("LocatorServiceManagement:tcp -p 4422"));
- if (!testbed.management)
+ if (!testbed.management)
{
throw "Invalid service discovery management proxy";
}
testbed.discovery = ServiceLocatorPrx::checkedCast(testbed.communicatorOutgoing->stringToProxy("LocatorService:tcp -p 4411"));
- if (!testbed.discovery)
+ if (!testbed.discovery)
{
throw "Invalid service discovery proxy";
}
@@ -219,12 +219,12 @@ struct GlobalIceFixture
BOOST_TEST_MESSAGE("Tearing down service discovery test fixture");
- if (testbed.communicatorIncoming)
+ if (testbed.communicatorIncoming)
{
testbed.communicatorIncoming->shutdown();
testbed.communicatorIncoming = 0;
}
- if (testbed.communicatorOutgoing)
+ if (testbed.communicatorOutgoing)
{
testbed.communicatorOutgoing->shutdown();
testbed.communicatorOutgoing = 0;
@@ -267,17 +267,17 @@ BOOST_AUTO_TEST_CASE(AddService)
* if the same service is registered multiple times there really isn't any way for this to fail, besides something
* outside the control of the service locator itself or I suppose if it crashes.
*/
- try
+ try
{
testbed.compareManagement = testbed.management->addService(testbed.compare, "testcompare");
added = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(AddLocatorParamsWithoutCompareService)
{
bool added = false;
- try
+ try
{
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
params->category = "test";
@@ -319,13 +319,13 @@ BOOST_AUTO_TEST_CASE(AddLocatorParamsWithoutCompareService)
testbed.compareManagement->addLocatorParams(params, "");
added = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -359,22 +359,22 @@ BOOST_AUTO_TEST_CASE(UseServiceFoundWithoutCompareService)
{
bool usable = false;
- try
+ try
{
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
params->category = "bob";
- if ((testbed.foundCompare == testbed.compare) && (testbed.foundCompare->isSupported(params) == true))
+ if ((testbed.foundCompare == testbed.compare) && (testbed.foundCompare->isSupported(params) == true))
{
usable = true;
}
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -388,21 +388,21 @@ BOOST_AUTO_TEST_CASE(AddCompare)
{
bool added = false;
- try
+ try
{
testbed.management->addCompare("testcompare", testbed.compare);
added = true;
- }
- catch (const DuplicateCompare&)
+ }
+ catch (const DuplicateCompare&)
{
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -416,21 +416,21 @@ BOOST_AUTO_TEST_CASE(AddDuplicateCompare)
{
bool added = false;
- try
+ try
{
testbed.management->addCompare("testcompare", testbed.compare);
added = true;
- }
- catch (const DuplicateCompare&)
+ }
+ catch (const DuplicateCompare&)
{
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -444,7 +444,7 @@ BOOST_AUTO_TEST_CASE(AddLocatorParamsWithCompareService)
{
bool added = false;
- try
+ try
{
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
params->category = "test2";
@@ -452,13 +452,13 @@ BOOST_AUTO_TEST_CASE(AddLocatorParamsWithCompareService)
testbed.compareManagement->addLocatorParams(params, "testcompare");
added = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -482,22 +482,22 @@ BOOST_AUTO_TEST_CASE(UseServiceFoundWithCompareService)
{
bool usable = false;
- try
+ try
{
ServiceLocatorParamsPtr params = new ServiceLocatorParams;
params->category = "bob";
- if ((testbed.foundCompare == testbed.compare) && (testbed.foundCompare->isSupported(params) == true))
+ if ((testbed.foundCompare == testbed.compare) && (testbed.foundCompare->isSupported(params) == true))
{
usable = true;
}
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -549,17 +549,17 @@ BOOST_AUTO_TEST_CASE(ServiceSuspend)
{
bool suspended = false;
- try
+ try
{
testbed.compareManagement->suspend();
suspended = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -583,17 +583,17 @@ BOOST_AUTO_TEST_CASE(ServiceUnsuspend)
{
bool unsuspended = false;
- try
+ try
{
testbed.compareManagement->unsuspend();
unsuspended = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -617,20 +617,20 @@ BOOST_AUTO_TEST_CASE(RemoveNonexistentCompareService)
{
bool removed = false;
- try
+ try
{
testbed.management->removeCompare("testcompare2");
removed = true;
- }
- catch (const CompareNotFound&)
+ }
+ catch (const CompareNotFound&)
{
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -644,20 +644,20 @@ BOOST_AUTO_TEST_CASE(RemoveCompareService)
{
bool removed = false;
- try
+ try
{
testbed.management->removeCompare("testcompare");
removed = true;
- }
- catch (const CompareNotFound&)
+ }
+ catch (const CompareNotFound&)
{
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -671,20 +671,20 @@ BOOST_AUTO_TEST_CASE(RemoveAlreadyRemovedCompareService)
{
bool removed = false;
- try
+ try
{
testbed.management->removeCompare("testcompare");
removed = true;
- }
- catch (const CompareNotFound&)
+ }
+ catch (const CompareNotFound&)
{
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -708,17 +708,17 @@ BOOST_AUTO_TEST_CASE(ServiceUnregister)
{
bool unregistered = false;
- try
+ try
{
testbed.compareManagement->unregister();
unregistered = true;
- }
- catch (const Ice::Exception &e)
+ }
+ catch (const Ice::Exception &e)
{
BOOST_TEST_MESSAGE(e.ice_name());
BOOST_TEST_MESSAGE(e.what());
- }
- catch (...)
+ }
+ catch (...)
{
}
@@ -736,23 +736,23 @@ BOOST_AUTO_TEST_CASE(FindServiceAfterUnregister)
}
void ServiceLocatorTest::start(std::string const &name,
- Ice::CommunicatorPtr const &communicator,
- Ice::StringSeq const &args)
-{
- std::vector<char const *> argv;
- argv.push_back(name.c_str());
- for (Ice::StringSeq::const_iterator i = args.begin(); i != args.end(); ++i)
- {
- argv.push_back(i->c_str());
- }
- // null terminated list
- argv.push_back(0);
-
- mCachedArgs.argc = argv.size() - 1;
- mCachedArgs.argv = (char**)&argv[0];
-
- int r = ::boost::unit_test::unit_test_main(&init_unit_test, mCachedArgs.argc, mCachedArgs.argv);
- exit(r);
+ Ice::CommunicatorPtr const &communicator,
+ Ice::StringSeq const &args)
+{
+ std::vector<char const *> argv;
+ argv.push_back(name.c_str());
+ for (Ice::StringSeq::const_iterator i = args.begin(); i != args.end(); ++i)
+ {
+ argv.push_back(i->c_str());
+ }
+ // null terminated list
+ argv.push_back(0);
+
+ mCachedArgs.argc = argv.size() - 1;
+ mCachedArgs.argv = (char**)&argv[0];
+
+ int r = ::boost::unit_test::unit_test_main(&init_unit_test, mCachedArgs.argc, mCachedArgs.argv);
+ exit(r);
}
void ServiceLocatorTest::stop()
@@ -761,8 +761,8 @@ void ServiceLocatorTest::stop()
extern "C"
{
- IceBox::Service* create(Ice::CommunicatorPtr communicator)
- {
- return new ServiceLocatorTest;
- }
+IceBox::Service* create(Ice::CommunicatorPtr communicator)
+{
+ return new ServiceLocatorTest;
+}
}
commit 68de66ffb4c487d2e49dbd0ea048f50a4d1b0a08
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 28 09:01:49 2010 -0500
New operations for getting the status of registered services.
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index e057f92..0a3b2c8 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -190,6 +190,35 @@ ServiceManagementPrx ServiceLocatorManagementImpl::addService(const Ice::ObjectP
return new_service->getServiceManagementPrx();
}
+ServiceInfoSeq ServiceLocatorManagementImpl::getServices(const ::Ice::Current&) const
+{
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ ServiceInfoSeq r;
+ for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
+ i != mImpl->mServices.end();
+ ++i)
+ {
+ ServiceInfo v = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
+ r.push_back(v);
+ }
+ return r;
+}
+
+ServiceInfo ServiceLocatorManagementImpl::getService(const std::string &guid, const ::Ice::Current&) const
+{
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ for (std::vector<ServiceManagementImplPtr>::const_iterator i = mImpl->mServices.begin();
+ i != mImpl->mServices.end();
+ ++i)
+ {
+ if (guid == (*i)->getGuid()) {
+ ServiceInfo r = {(*i)->getGuid(), (*i)->getServiceManagementPrx(), (*i)->getStatus(), (*i)->getService()};
+ return r;
+ }
+ }
+ throw ServiceNotFound();
+}
+
/**
* Implementation of the addCompare method as defined in service_locator.ice
*/
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 77ebf17..8b118df 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -43,7 +43,7 @@ class ServiceLocatorManagementImplPriv;
class ServiceLocatorManagementImpl : public AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagement
{
public:
- ServiceLocatorManagementImpl(const Ice::ObjectAdapterPtr& adapter,
+ ServiceLocatorManagementImpl(const Ice::ObjectAdapterPtr& adapter,
const AsteriskSCF::System::Discovery::EventsPrx& serviceDiscoveryTopic);
Ice::ObjectPrx locate(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
Ice::ObjectProxySeq locateAll(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
@@ -52,6 +52,8 @@ public:
// AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagement interface.
//
AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx addService(const Ice::ObjectPrx&, const std::string&, const Ice::Current&);
+ AsteriskSCF::Core::Discovery::V1::ServiceInfoSeq getServices(const ::Ice::Current&) const;
+ AsteriskSCF::Core::Discovery::V1::ServiceInfo getService(const std::string &, const ::Ice::Current&) const;
void addCompare(const std::string&, const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsComparePrx&, const Ice::Current&);
void removeCompare(const std::string&, const Ice::Current&);
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 08bc831..af4c873 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -291,6 +291,19 @@ void ServiceManagementImpl::unsuspend(const Ice::Current&)
}
}
+ServiceStatus ServiceManagementImpl::getStatus() const
+{
+ boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
+ if (mImpl->mSuspended)
+ {
+ return Suspended;
+ }
+ else
+ {
+ return Active;
+ }
+}
+
/**
* Implementation of the unregister method as defined in service_locator.ice
*/
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index 46f2d36..bf4fd5f 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -43,12 +43,13 @@ public:
void suspend(const Ice::Current&);
void unsuspend(const Ice::Current&);
void unregister(const Ice::Current&);
+ AsteriskSCF::Core::Discovery::V1::ServiceStatus getStatus(const Ice::Current&) const { return getStatus(); }
Ice::ObjectPrx getService();
AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx getServiceManagementPrx();
bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr&);
const std::string &getGuid() const;
-
+ AsteriskSCF::Core::Discovery::V1::ServiceStatus getStatus() const;
private:
/**
* Private implementation data for ServiceManagementImpl.
commit 91710e91bb1c7e95c7bf880438cb178728c35893
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 29 10:21:17 2010 -0500
Log messages on ServiceManagement.
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index c9a9914..08bc831 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -24,10 +24,17 @@
#include "ServiceLocatorManagement.h"
#include "ServiceManagement.h"
+#include "logger.h"
using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::ServiceDiscovery;
+using namespace AsteriskSCF::System::Logging;
+
+namespace
+{
+Logger const &lg = getLoggerFactory().getLogger("AsteriskSCF.System.Discovery");
+}
namespace AsteriskSCF
{
@@ -253,7 +260,11 @@ void ServiceManagementImpl::suspend(const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- mImpl->mSuspended = true;
+ if (!mImpl->mSuspended)
+ {
+ lg(Info) << "Suspending " << mImpl->mGuid << " " << mImpl->mService->ice_toString();
+ mImpl->mSuspended = true;
+ }
if (mImpl->mLocatorTopic)
{
@@ -268,7 +279,11 @@ void ServiceManagementImpl::unsuspend(const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- mImpl->mSuspended = false;
+ if (mImpl->mSuspended)
+ {
+ lg(Info) << "Un-suspending " << mImpl->mGuid << " " << mImpl->mService->ice_toString();
+ mImpl->mSuspended = false;
+ }
if (mImpl->mLocatorTopic)
{
@@ -284,6 +299,7 @@ void ServiceManagementImpl::unregister(const Ice::Current&)
/* You'll notice no lock here. That's because we aren't actually modifying any internal state that should
* be protected, and if we did lock here there is a chance for a deadlock which is super sad.
*/
+ lg(Info) << "Un-register " << mImpl->mGuid << " " << mImpl->mService->ice_toString();
mImpl->mAdapter->remove(mImpl->mManagementPrx->ice_getIdentity());
commit 06eb4de0b880b18d06e84d1aa866320e2491fe21
Author: Ken Hunt <ken.hunt at digium.com>
Date: Sun Oct 24 23:37:21 2010 -0500
Updated copyright header to GPL V2.
diff --git a/src/CollocatedIceStorm.cpp b/src/CollocatedIceStorm.cpp
index 5146df8..dbffcf3 100644
--- a/src/CollocatedIceStorm.cpp
+++ b/src/CollocatedIceStorm.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <assert.h>
diff --git a/src/CollocatedIceStorm.h b/src/CollocatedIceStorm.h
index ccd05eb..8e6d32f 100644
--- a/src/CollocatedIceStorm.h
+++ b/src/CollocatedIceStorm.h
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#pragma once
#include <Ice/DynamicLibrary.h>
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 213b649..3e2d884 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index c68224f..e057f92 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 142c2cc..77ebf17 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 7b6c021..c9a9914 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index ee044eb..46f2d36 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index d4ec501..4866df8 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF 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.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#define BOOST_TEST_DYN_LINK
commit 40588bd7911d917de487b06d6e8f12fec5afea1e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Sun Oct 24 21:58:43 2010 -0400
clean up license file
diff --git a/LICENSE.txt b/LICENSE.txt
index 4d5fc3e..ff0499c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,68 +1,71 @@
-Asterisk SCF is distributed by Digium, Inc. (Digium) under the
-GNU General Public License version 2 (GPLv2) and is also available under
-alternative licenses negotiated directly with Digium. If you obtained
-Asterisk SCF under the GPLv2, then those terms apply to all programs
-you distribute that communicate using the Asterisk SCF object interfaces
-(APIs) on objects provided by Asterisk SCF’s components, as defined below.
-A copy of the GPLv2 is included in the Asterisk SCF source tree in the
-file COPYING.txt
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the GNU
+General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object
+interfaces (APIs) on objects provided by Asterisk SCF's components, as
+defined below. A copy of the GPLv2 is included in the Asterisk SCF
+source tree in the file COPYING.txt.
-Asterisk SCF is a collection of programs that communicate with each other
-over defined APIs. This communication can occur within a single process
-(if two programs are loaded into a suitable container), between processes
-on a single machine, between processes on different machines, or some
-combination. In addition, these APIs are usable across a number of
-platforms and also across a variety of programming languages, many of
-which are interpreted (scripting) languages. Because of this flexibility
-and the possible ambiguity in interpretation of the provisions of the
-GPLv2 as they apply to Asterisk SCF, Digium makes the following
-statement:
+Asterisk SCF is a collection of programs that communicate with each
+other over defined APIs. This communication can occur within a single
+process (if two programs are loaded into a suitable container),
+between processes on a single machine, between processes on different
+machines, or some combination. In addition, these APIs are usable
+across a number of platforms and also across a variety of programming
+languages, many of which are interpreted (scripting)
+languages. Because of this flexibility and the possible ambiguity in
+interpretation of the provisions of the GPLv2 as they apply to
+Asterisk SCF, Digium makes the following statement:
- It is Digium’s interpretation that because the Asterisk SCF APIs,
- by definition, expose direct, and indirect, complex remote, and non-remote,
- function calls on objects provided by Asterisk SCF’s programs, that usage
- of these APIs between the program hosting the object(s) and the program
- accessing the object(s) creates a derivative work that must be covered
- wholly by GPLv2, even if the mechanism used to invoke the function calls
- employs a cross-process or network connection. As a result, any program
- that employs the Asterisk SCF APIs to perform its intended functions,
- and would not be able to perform those intended functions without using
- these APIs to communicate with Asterisk SCF programs, or derivatives of
- Asterisk SCF programs, is subject to the terms of the GPLv2 when it is
- distributed, unless the distributor of the program has obtained explicit
- written permission from Digium to distribute it under a different
- license.
+ It is Digium's interpretation that because the Asterisk SCF APIs,
+ by definition, expose direct, and indirect, complex remote, and
+ non-remote, function calls on objects provided by Asterisk SCF's
+ programs, that usage of these APIs between the program hosting the
+ object(s) and the program accessing the object(s) creates a
+ derivative work that must be covered wholly by GPLv2, even if the
+ mechanism used to invoke the function calls employs a
+ cross-process or network connection. As a result, any program that
+ employs the Asterisk SCF APIs to perform its intended functions,
+ and would not be able to perform those intended functions without
+ using these APIs to communicate with Asterisk SCF programs, or
+ derivatives of Asterisk SCF programs, is subject to the terms of
+ the GPLv2 when it is distributed, unless the distributor of the
+ program has obtained explicit written permission from Digium to
+ distribute it under a different license.
-Digium is able to grant, at its sole discretion, permission for companies,
-individuals or organizations to distribute programs that use the
-Asterisk SCF APIs under open source or proprietary terms. Digium is able
-to do this because all components of the Asterisk SCF package are either
-copyrighted by Digium, because Digium has been granted a sufficient license
-by the component’s copyright holder(s), or some combination thereof.
+Digium is able to grant, at its sole discretion, permission for
+companies, individuals or organizations to distribute programs that
+use the Asterisk SCF APIs under open source or proprietary
+terms. Digium is able to do this because all components of the
+Asterisk SCF package are either copyrighted by Digium, because Digium
+has been granted a sufficient license by the component's copyright
+holder(s), or some combination thereof.
-Digium grants specific permission for anyone to distribute programs that
-use the Asterisk SCF APIs and also use the OpenSSL toolkit,
-Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
-(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow
-such distribution. This permission only extends to distributions that
-properly acknowledge and comply with the terms of the licenses on the
-Open Source Exceptions that are used in addition to the terms of
+Digium grants specific permission for anyone to distribute programs
+that use the Asterisk SCF APIs and also use the OpenSSL toolkit, Ice
+(Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+("Open Source Exceptions"), even though the terms of the GPLv2 do not
+allow such distribution. This permission only extends to distributions
+that properly acknowledge and comply with the terms of the licenses on
+the Open Source Exceptions that are used in addition to the terms of
the GPLv2.
-If you wish to use Asterisk SCF code in other GPLv2 programs, there is
-no requirement that you provide the same permissions for these
-Open Source Exceptions to recipients of your programs (although if you
-have written a program for Asterisk SCF, Digium would strongly encourage
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these Open
+Source Exceptions to recipients of your programs (although if you have
+written a program for Asterisk SCF, Digium would strongly encourage
you to grant the same permissions granted by Digium).
-The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+The 'Ice' and 'ZeroC' names are trademarks of ZeroC, Inc.
-The “Asterisk SCF” name and logos are trademarks owned by Digium and use
-of them is subject to Digium’s trademark licensing policies. If you wish
-to use these trademarks for purposes other than unmodified redistribution
-of Asterisk SCF source code obtained from Digium, you should contact
-Digium’s licensing department to determine the necessary steps you must
-take. For more information on this policy, please read:
+The "Asterisk SCF" name and logos are trademarks owned by Digium and
+use of them is subject to Digium's trademark licensing policies. If
+you wish to use these trademarks for purposes other than unmodified
+redistribution of Asterisk SCF source code obtained from Digium, you
+should contact Digium's licensing department to determine the
+necessary steps you must take. For more information on this policy,
+please read:
http://www.digium.com/en/company/profile/trademarkpolicy.php
@@ -72,9 +75,10 @@ If you have any questions regarding our licensing policy, please contact us:
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
IAX2/pbx.digium.com (via IAX2)
+sip:6000 at digium.com (via SIP)
licensing at digium.com (via email)
Digium, Inc.
445 Jan Davis Drive NW
Huntsville, AL 35806
-USA
\ No newline at end of file
+USA
commit a0c6c6be6c6f633937e4c4e4f0236f40fb414e54
Author: Ken Hunt <ken.hunt at digium.com>
Date: Sun Oct 24 19:53:04 2010 -0500
Added COPYING and LICENSE text files.
diff --git a/COPYING.txt b/COPYING.txt
new file mode 100644
index 0000000..cf87abb
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,340 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..4d5fc3e
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,80 @@
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the
+GNU General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object interfaces
+(APIs) on objects provided by Asterisk SCF’s components, as defined below.
+A copy of the GPLv2 is included in the Asterisk SCF source tree in the
+file COPYING.txt
+
+Asterisk SCF is a collection of programs that communicate with each other
+over defined APIs. This communication can occur within a single process
+(if two programs are loaded into a suitable container), between processes
+on a single machine, between processes on different machines, or some
+combination. In addition, these APIs are usable across a number of
+platforms and also across a variety of programming languages, many of
+which are interpreted (scripting) languages. Because of this flexibility
+and the possible ambiguity in interpretation of the provisions of the
+GPLv2 as they apply to Asterisk SCF, Digium makes the following
+statement:
+
+ It is Digium’s interpretation that because the Asterisk SCF APIs,
+ by definition, expose direct, and indirect, complex remote, and non-remote,
+ function calls on objects provided by Asterisk SCF’s programs, that usage
+ of these APIs between the program hosting the object(s) and the program
+ accessing the object(s) creates a derivative work that must be covered
+ wholly by GPLv2, even if the mechanism used to invoke the function calls
+ employs a cross-process or network connection. As a result, any program
+ that employs the Asterisk SCF APIs to perform its intended functions,
+ and would not be able to perform those intended functions without using
+ these APIs to communicate with Asterisk SCF programs, or derivatives of
+ Asterisk SCF programs, is subject to the terms of the GPLv2 when it is
+ distributed, unless the distributor of the program has obtained explicit
+ written permission from Digium to distribute it under a different
+ license.
+
+Digium is able to grant, at its sole discretion, permission for companies,
+individuals or organizations to distribute programs that use the
+Asterisk SCF APIs under open source or proprietary terms. Digium is able
+to do this because all components of the Asterisk SCF package are either
+copyrighted by Digium, because Digium has been granted a sufficient license
+by the component’s copyright holder(s), or some combination thereof.
+
+Digium grants specific permission for anyone to distribute programs that
+use the Asterisk SCF APIs and also use the OpenSSL toolkit,
+Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow
+such distribution. This permission only extends to distributions that
+properly acknowledge and comply with the terms of the licenses on the
+Open Source Exceptions that are used in addition to the terms of
+the GPLv2.
+
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these
+Open Source Exceptions to recipients of your programs (although if you
+have written a program for Asterisk SCF, Digium would strongly encourage
+you to grant the same permissions granted by Digium).
+
+The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+
+The “Asterisk SCF” name and logos are trademarks owned by Digium and use
+of them is subject to Digium’s trademark licensing policies. If you wish
+to use these trademarks for purposes other than unmodified redistribution
... 13798 lines suppressed ...
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list