diff options
30 files changed, 71 insertions, 45 deletions
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 150dcd71491..c5788002ec5 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -54,6 +54,7 @@ #include <Ice/InterfaceByValue.h> #include <Ice/StringConverter.h> #include <Ice/IconvStringConverter.h> +#include <Ice/UUID.h> #include <IceUtil/PopDisableWarnings.h> #endif diff --git a/cpp/include/Ice/UUID.h b/cpp/include/Ice/UUID.h new file mode 100644 index 00000000000..711570a0164 --- /dev/null +++ b/cpp/include/Ice/UUID.h @@ -0,0 +1,23 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_UUID_H +#define ICE_UUID_H + +#include <Ice/Config.h> +#include <IceUtil/UUID.h> + +namespace Ice +{ + +using IceUtil::generateUUID; + +} + +#endif diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index bbdf21dfbff..75d138b2868 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/Options.h> #include <IceUtil/FileUtil.h> #include <Ice/Service.h> diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index f259ea49cde..a63f700e342 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -12,7 +12,7 @@ #include <Glacier2/FilterManager.h> #include <Glacier2/RouterI.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceSSL/IceSSL.h> diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp index e52fc4e029a..2da185394d1 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp @@ -472,7 +472,7 @@ CryptPermissionsVerifierPlugin::initialize() { string name = p->first.substr(prefix.size()); Identity id; - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); id.category = "Glacier2CryptPermissionsVerifier"; ObjectPrx prx = adapter->add(new CryptPermissionsVerifierI(retrievePasswordMap(p->second)), id); _communicator->getProperties()->setProperty(name, _communicator->proxyToString(prx)); diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index c1a531c21b7..359d440e3e7 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <Glacier2/Application.h> +#include <Ice/Ice.h> #include <IceUtil/IceUtil.h> #include <IceUtil/ArgVector.h> @@ -79,7 +80,7 @@ Glacier2::Application::objectAdapter() Ice::ObjectPrxPtr Glacier2::Application::addWithUUID(const Ice::ObjectPtr& servant) { - return objectAdapter()->add(servant, createCallbackIdentity(IceUtil::generateUUID())); + return objectAdapter()->add(servant, createCallbackIdentity(Ice::generateUUID())); } Ice::Identity diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index e4d4803d8e5..75f714a05cb 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -269,7 +269,7 @@ SessionHelperI::addWithUUID(const Ice::ObjectPtr& servant) throw Glacier2::SessionNotExistException(); } Ice::Identity id; - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); id.category = _category; return internalObjectAdapter()->add(servant, id); } diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 3311768e765..8a257ede66b 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -23,7 +23,7 @@ #include <Ice/OutgoingAsync.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> using namespace std; using namespace Ice; @@ -104,7 +104,7 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s string oaName = name; if(oaName.empty()) { - oaName = IceUtil::generateUUID(); + oaName = Ice::generateUUID(); } getProperties()->setProperty(oaName + ".Endpoints", endpoints); @@ -117,7 +117,7 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout string oaName = name; if(oaName.empty()) { - oaName = IceUtil::generateUUID(); + oaName = Ice::generateUUID(); } PropertyDict properties = proxyToProperty(router, oaName + ".Router"); diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index a5062c4e20b..d1d5634b2ca 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -47,7 +47,7 @@ #include <IceUtil/DisableWarnings.h> #include <IceUtil/FileUtil.h> #include <IceUtil/StringUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/Atomic.h> @@ -664,7 +664,7 @@ IceInternal::Instance::getAdmin() adminIdentity.category = _initData.properties->getProperty("Ice.Admin.InstanceName"); if(adminIdentity.category.empty()) { - adminIdentity.category = IceUtil::generateUUID(); + adminIdentity.category = Ice::generateUUID(); } _adminIdentity = adminIdentity; diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 787fe10617e..47398bc8720 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -12,7 +12,7 @@ #include <Ice/Object.h> #include <Ice/LocalException.h> #include <Ice/Functional.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> using namespace std; using namespace Ice; @@ -157,7 +157,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const ObjectAdapterIPtr adapter; if(name.empty()) { - string uuid = IceUtil::generateUUID(); + string uuid = Ice::generateUUID(); adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true); adapter->initialize(ICE_NULLPTR); } diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 93b33150ef3..18cc2dd87f0 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Ice/ObjectAdapterI.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/Instance.h> @@ -449,7 +449,7 @@ ObjectPrxPtr Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& facet) { Identity ident; - ident.name = IceUtil::generateUUID(); + ident.name = Ice::generateUUID(); return addFacet(object, ident, facet); } diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp index 5c0d31cc8ef..332d669cace 100644 --- a/cpp/src/IceBT/EndpointI.cpp +++ b/cpp/src/IceBT/EndpointI.cpp @@ -24,7 +24,7 @@ #include <Ice/Properties.h> #include <IceUtil/Random.h> #include <IceUtil/StringUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> using namespace std; using namespace Ice; @@ -497,7 +497,7 @@ IceBT::EndpointI::initWithOptions(vector<string>& args, bool oaEndpoint) // // Generate a UUID for object adapters that don't specify one. // - const_cast<string&>(_uuid) = IceUtil::generateUUID(); + const_cast<string&>(_uuid) = Ice::generateUUID(); } else { diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp index ff970db0f63..6d7417c14e0 100644 --- a/cpp/src/IceBT/Engine.cpp +++ b/cpp/src/IceBT/Engine.cpp @@ -13,7 +13,7 @@ #include <Ice/LocalException.h> #include <IceUtil/StringUtil.h> #include <IceUtil/Thread.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceXML/Parser.h> #include <stack> diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 975d50976ff..8599ef6df4a 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -99,7 +99,7 @@ PluginI::initialize() } if(properties->getProperty("IceDiscovery.Locator.Endpoints").empty()) { - properties->setProperty("IceDiscovery.Locator.AdapterId", IceUtil::generateUUID()); + properties->setProperty("IceDiscovery.Locator.AdapterId", Ice::generateUUID()); } _multicastAdapter = _communicator->createObjectAdapter("IceDiscovery.Multicast"); diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 0e5f6a1f8be..60af9f7b2df 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Ice/Ice.h> #include <Ice/LoggerUtil.h> @@ -176,7 +176,7 @@ AdminI::addApplication(const ApplicationDescriptor& descriptor, const Current&) info.createUser = info.updateUser = _session->getId(); info.descriptor = descriptor; info.revision = 1; - info.uuid = IceUtil::generateUUID(); + info.uuid = Ice::generateUUID(); _database->addApplication(info, _session.get()); } @@ -254,7 +254,7 @@ AdminI::patchApplication_async(const AMD_Admin_patchApplicationPtr& amdCB, Ice::Identity id; id.category = current.id.category; - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); PatcherFeedbackAggregatorPtr feedback = newPatcherFeedback(amdCB, id, _traceLevels, "application", name, static_cast<int>(nodes.size())); @@ -544,7 +544,7 @@ AdminI::patchServer_async(const AMD_Admin_patchServerPtr& amdCB, const string& i Ice::Identity identity; identity.category = current.id.category; - identity.name = IceUtil::generateUUID(); + identity.name = Ice::generateUUID(); PatcherFeedbackAggregatorPtr feedback = newPatcherFeedback(amdCB, identity, _traceLevels, "server", id, static_cast<int>(nodes.size())); diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 05a6501fe15..7cc46f74757 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceGrid/RegistryI.h> #include <IceGrid/AdminSessionI.h> #include <IceGrid/AdminI.h> @@ -135,7 +135,7 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I if(con) { - category = _database->getInstanceName() + "-" + IceUtil::generateUUID(); + category = _database->getInstanceName() + "-" + Ice::generateUUID(); Ice::Identity templateId; templateId.name = "pick-a-name"; diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 1876182b942..c0c58603453 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -12,7 +12,7 @@ #include <IceUtil/CtrlCHandler.h> #include <IceUtil/Thread.h> #include <IceUtil/StringUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <Ice/Ice.h> diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index bae445fa879..463effd1e98 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/Timer.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index 0842309e546..01bbb7679c0 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Ice/Ice.h> #include <IceGrid/NodeSessionI.h> #include <IceGrid/Database.h> @@ -305,7 +305,7 @@ NodeSessionI::patch(const PatcherFeedbackAggregatorPtr& aggregator, { Ice::Identity id; id.category = _database->getInstanceName(); - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); PatcherFeedbackPtr obj = new PatcherFeedbackI(_info->name, this, id, aggregator); try diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 8ca6830132a..5f3de89880c 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/FileUtil.h> #include <Ice/Ice.h> #include <Ice/Network.h> diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp index 6790b48f22d..5b018a5dfe9 100644 --- a/cpp/src/IceGrid/SessionI.cpp +++ b/cpp/src/IceGrid/SessionI.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceGrid/SessionI.h> #include <IceGrid/QueryI.h> #include <IceGrid/LocatorI.h> diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp index e61a2f4ce08..bc22aff6327 100644 --- a/cpp/src/IceGrid/SessionServantManager.cpp +++ b/cpp/src/IceGrid/SessionServantManager.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Ice/LocalException.h> #include <Ice/ObjectAdapter.h> #include <IceGrid/SessionServantManager.h> @@ -272,7 +272,7 @@ SessionServantManager::addImpl(const Ice::ObjectPtr& servant, const Ice::ObjectP assert(p != _sessions.end()); Ice::Identity id; - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); id.category = _instanceName; // diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 42ecec87026..2ee4a752d09 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -276,7 +276,7 @@ PluginI::initialize() } if(properties->getProperty("IceLocatorDiscovery.Locator.Endpoints").empty()) { - properties->setProperty("IceLocatorDiscovery.Locator.AdapterId", IceUtil::generateUUID()); // Collocated adapter + properties->setProperty("IceLocatorDiscovery.Locator.AdapterId", Ice::generateUUID()); // Collocated adapter } _replyAdapter = _communicator->createObjectAdapter("IceLocatorDiscovery.Reply"); @@ -347,7 +347,7 @@ PluginI::initialize() string instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName"); Ice::Identity id; id.name = "Locator"; - id.category = !instanceName.empty() ? instanceName : IceUtil::generateUUID(); + id.category = !instanceName.empty() ? instanceName : Ice::generateUUID(); LocatorIPtr locator = ICE_MAKE_SHARED(LocatorI, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties, instanceName, voidLocator); _communicator->setDefaultLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, _locatorAdapter->add(locator, id))); diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index de509399d0b..2c3e13db1ae 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -16,7 +16,7 @@ #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> using namespace std; using namespace Ice; diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp index 8d2435b1994..2a4e464bf55 100644 --- a/cpp/src/IceStorm/NodeI.cpp +++ b/cpp/src/IceStorm/NodeI.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <Ice/Ice.h> #include <IceStorm/NodeI.h> #include <IceStorm/Observers.h> #include <IceStorm/TraceLevels.h> @@ -440,7 +441,7 @@ NodeI::merge(const set<int>& coordinatorSet) } ostringstream os; - os << _id << ":" << IceUtil::generateUUID(); + os << _id << ":" << Ice::generateUUID(); _group = os.str(); gp = _group; @@ -1029,7 +1030,7 @@ NodeI::recovery(Ice::Long generation) } ostringstream os; - os << _id << ":" << IceUtil::generateUUID(); + os << _id << ":" << Ice::generateUUID(); _group = os.str(); _generation = -1; diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp index 98f07a1b93a..d7742680a70 100644 --- a/cpp/test/Ice/acm/TestI.cpp +++ b/cpp/test/Ice/acm/TestI.cpp @@ -75,7 +75,7 @@ RemoteCommunicatorI::createObjectAdapter(int timeout, int close, int heartbeat, opts = " -h \"" + properties->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1") + "\""; } - string name = IceUtil::generateUUID(); + string name = generateUUID(); if(timeout >= 0) { properties->setProperty(name + ".ACM.Timeout", toString(timeout)); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index cf48eb18b51..4eae1d66007 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -703,7 +703,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) adapter->setLocator(locator); Ice::Identity id; - id.name = IceUtil::generateUUID(); + id.name = Ice::generateUUID(); registry->addObject(adapter->add(ICE_MAKE_SHARED(HelloI), id)); adapter->activate(); diff --git a/php/src/php5/Util.cpp b/php/src/php5/Util.cpp index 0413faa4eb4..24374f91049 100644 --- a/php/src/php5/Util.cpp +++ b/php/src/php5/Util.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Util.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Slice/PHPUtil.h> #include <algorithm> #include <ctype.h> @@ -924,7 +924,7 @@ ZEND_FUNCTION(Ice_generateUUID) WRONG_PARAM_COUNT; } - string uuid = IceUtil::generateUUID(); + string uuid = Ice::generateUUID(); RETURN_STRINGL(STRCAST(uuid.c_str()), static_cast<int>(uuid.size()), 1); } diff --git a/php/src/php7/Util.cpp b/php/src/php7/Util.cpp index 740efa79e78..0399c940cb1 100644 --- a/php/src/php7/Util.cpp +++ b/php/src/php7/Util.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Util.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Slice/PHPUtil.h> #include <algorithm> #include <ctype.h> @@ -862,7 +862,7 @@ ZEND_FUNCTION(Ice_generateUUID) WRONG_PARAM_COUNT; } - string uuid = IceUtil::generateUUID(); + string uuid = Ice::generateUUID(); RETURN_STRINGL(STRCAST(uuid.c_str()), static_cast<int>(uuid.size())); } diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp index 9044df85b04..b40d9f3dcfb 100644 --- a/python/modules/IcePy/Util.cpp +++ b/python/modules/IcePy/Util.cpp @@ -14,7 +14,7 @@ #include <IceUtil/DisableWarnings.h> #include <Ice/LocalException.h> #include <Ice/Protocol.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <Slice/PythonUtil.h> #include <compile.h> #include <frameobject.h> @@ -1158,6 +1158,6 @@ extern "C" PyObject* IcePy_generateUUID(PyObject* /*self*/) { - string uuid = IceUtil::generateUUID(); + string uuid = Ice::generateUUID(); return IcePy::createString(uuid); } |