diff options
455 files changed, 1065 insertions, 1074 deletions
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp index 1f58da34ffb..4b822469c81 100644 --- a/cpp/src/Glacier2/Blobject.cpp +++ b/cpp/src/Glacier2/Blobject.cpp @@ -261,7 +261,7 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amd } if(_reverseConnection) { - out << "\nidentity = " << _instance->communicator()->identityToString(proxy->ice_getIdentity()); + out << "\nidentity = " << identityToString(proxy->ice_getIdentity()); } else { @@ -310,7 +310,7 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amd out << "routing override"; if(_reverseConnection) { - out << "\nidentity = " << _instance->communicator()->identityToString(proxy->ice_getIdentity()); + out << "\nidentity = " << identityToString(proxy->ice_getIdentity()); } else { diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp index d7aef4ae401..f10c3d614b8 100644 --- a/cpp/src/Glacier2/ClientBlobject.cpp +++ b/cpp/src/Glacier2/ClientBlobject.cpp @@ -120,7 +120,7 @@ Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& { Trace out(_instance->logger(), "Glacier2"); out << "rejecting request: " << rejectedFilters << "\n"; - out << "identity: " << _instance->communicator()->identityToString(current.id); + out << "identity: " << identityToString(current.id); } ObjectNotExistException ex(__FILE__, __LINE__); diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index a384a072a04..95c52f9633a 100644 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -61,7 +61,7 @@ stringToSeq(const CommunicatorPtr& comm, const string& str, vector<Identity>& se // // TODO: should this be an unmatched quote error? // - seq.push_back(comm->stringToIdentity(str.substr(current))); + seq.push_back(stringToIdentity(str.substr(current))); break; } @@ -76,7 +76,7 @@ stringToSeq(const CommunicatorPtr& comm, const string& str, vector<Identity>& se if(markString) { ++current; - seq.push_back(comm->stringToIdentity(str.substr(current, end-current))); + seq.push_back(stringToIdentity(str.substr(current, end-current))); break; } else @@ -95,7 +95,7 @@ stringToSeq(const CommunicatorPtr& comm, const string& str, vector<Identity>& se { end = str.find_first_of(ws, current); string::size_type len = (end == string::npos) ? string::npos : end - current; - seq.push_back(comm->stringToIdentity(str.substr(current, len))); + seq.push_back(stringToIdentity(str.substr(current, len))); break; } } diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp index e6fa92b78e2..c1935786ce0 100644 --- a/cpp/src/Glacier2/RouterI.cpp +++ b/cpp/src/Glacier2/RouterI.cpp @@ -40,7 +40,7 @@ Glacier2::RouterI::RouterI(const InstancePtr& instance, const ConnectionPtr& con if(_instance->properties()->getPropertyAsInt("Glacier2.ReturnClientProxy") > 0) { const_cast<Ice::ObjectPrx&>(_clientProxy) = - _instance->clientObjectAdapter()->createProxy(_instance->communicator()->stringToIdentity("dummy")); + _instance->clientObjectAdapter()->createProxy(stringToIdentity("dummy")); } if(_instance->serverObjectAdapter()) diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index 4d46d210726..f259ea49cde 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -1,4 +1,3 @@ - // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. @@ -1151,7 +1150,7 @@ SessionRouterI::getRouterImpl(const ConnectionPtr& connection, const Ice::Identi { Trace out(_instance->logger(), "Glacier2"); out << "rejecting request. no session is associated with the connection.\n"; - out << "identity: " << _instance->communicator()->identityToString(id); + out << "identity: " << identityToString(id); } connection->close(true); throw ObjectNotExistException(__FILE__, __LINE__); diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp index abc76a3b6e8..31d33ad00a4 100644 --- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp +++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp @@ -111,12 +111,12 @@ Init::checkPermissionVerifier(const string& val) // check if it's actually a stringified identity // (with typically missing " " because the category contains a space) - if(val == _communicator->identityToString(_nullPVId)) + if(val == identityToString(_nullPVId)) { createObjects(); return _adapter->createProxy(_nullPVId)->ice_toString(); // Return valid proxy to rewrite the property } - else if(val == _communicator->identityToString(_nullSSLPVId)) + else if(val == identityToString(_nullSSLPVId)) { createObjects(); return _adapter->createProxy(_nullSSLPVId)->ice_toString(); // Return valid proxy to rewrite the property diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 0f816647a11..64ff4f91e07 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -334,7 +334,7 @@ public: string getIdentity() const { - return _current.adapter->getCommunicator()->identityToString(_current.id); + return identityToString(_current.id); } private: @@ -443,7 +443,7 @@ public: catch(const Exception&) { // Either a fixed proxy or the communicator is destroyed. - os << _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); + os << identityToString(_proxy->ice_getIdentity()); os << " [" << _operation << ']'; } } @@ -474,7 +474,7 @@ public: { if(_proxy) { - return _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); + return identityToString(_proxy->ice_getIdentity()); } else { diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index c7c76bac161..bf7fa5d5a05 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -116,7 +116,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" :" + managerEndpoints; + managerProxy = "\"" + identityToString(managerIdentity) + "\" :" + managerEndpoints; } else { @@ -127,7 +127,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" @" + managerAdapterId; + managerProxy = "\"" + identityToString(managerIdentity) + "\" @" + managerAdapterId; } base = communicator()->stringToProxy(managerProxy); diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 615e0eeec96..975d50976ff 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -154,7 +154,7 @@ PluginI::initialize() // Add lookup and lookup reply Ice objects // _lookup = ICE_MAKE_SHARED(LookupI, locatorRegistry, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties); - _multicastAdapter->add(_lookup, _communicator->stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter->add(_lookup, Ice::stringToIdentity("IceDiscovery/Lookup")); Ice::ObjectPrxPtr lookupReply = _replyAdapter->addWithUUID(ICE_MAKE_SHARED(LookupReplyI, _lookup))->ice_datagram(); _lookup->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, lookupReply)); diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index edfb98f03a7..0e5f6a1f8be 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -688,7 +688,7 @@ AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current&) if(id.category == _database->getInstanceName()) { DeploymentException ex; - ex.reason = "updating object `" + _database->getCommunicator()->identityToString(id) + "' is not allowed:\n"; + ex.reason = "updating object `" + identityToString(id) + "' is not allowed:\n"; ex.reason += "objects with identity category `" + id.category + "' are managed by IceGrid"; throw ex; } @@ -709,7 +709,7 @@ AdminI::addObjectWithType(const Ice::ObjectPrx& proxy, const string& type, const if(id.category == _database->getInstanceName()) { DeploymentException ex; - ex.reason = "adding object `" + _database->getCommunicator()->identityToString(id) + "' is not allowed:\n"; + ex.reason = "adding object `" + identityToString(id) + "' is not allowed:\n"; ex.reason += "objects with identity category `" + id.category + "' are managed by IceGrid"; throw ex; } @@ -727,7 +727,7 @@ AdminI::removeObject(const Ice::Identity& id, const Ice::Current&) if(id.category == _database->getInstanceName()) { DeploymentException ex; - ex.reason = "removing object `" + _database->getCommunicator()->identityToString(id) + "' is not allowed:\n"; + ex.reason = "removing object `" + identityToString(id) + "' is not allowed:\n"; ex.reason += "objects with identity category `" + id.category + "' are managed by IceGrid"; throw ex; } diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp index 3a9799e1eac..ae3294bb51c 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.cpp +++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp @@ -134,7 +134,7 @@ AllocatableObjectCache::add(const ObjectInfo& info, const AllocatablePtr& parent if(getImpl(id)) { Ice::Error out(_communicator->getLogger()); - out << "can't add duplicate allocatable object `" << _communicator->identityToString(id) << "'"; + out << "can't add duplicate allocatable object `" << identityToString(id) << "'"; return; } @@ -151,7 +151,7 @@ AllocatableObjectCache::add(const ObjectInfo& info, const AllocatablePtr& parent if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "added allocatable object `" << _communicator->identityToString(id) << "'"; + out << "added allocatable object `" << identityToString(id) << "'"; } } @@ -177,7 +177,7 @@ AllocatableObjectCache::remove(const Ice::Identity& id) if(!entry) { Ice::Error out(_communicator->getLogger()); - out << "can't remove unknown object `" << _communicator->identityToString(id) << "'"; + out << "can't remove unknown object `" << identityToString(id) << "'"; } removeImpl(id); @@ -191,7 +191,7 @@ AllocatableObjectCache::remove(const Ice::Identity& id) if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "removed allocatable object `" << _communicator->identityToString(id) << "'"; + out << "removed allocatable object `" << identityToString(id) << "'"; } } diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 2087bb3359e..1876182b942 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -449,7 +449,7 @@ Client::run(StringSeq& originalArgs) ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints("FileParser", "tcp -h localhost"); adapter->activate(); - ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser")); + ObjectPrx proxy = adapter->add(new FileParserI, stringToIdentity("FileParser")); cout << proxy << endl; communicator()->waitForShutdown(); diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index b51c056048b..694d59c073d 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1483,7 +1483,7 @@ Database::addObject(const ObjectInfo& info) if(_traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "added object `" << _communicator->identityToString(id) << "' (serial = `" << dbSerial << "')"; + out << "added object `" << identityToString(id) << "' (serial = `" << dbSerial << "')"; } } _objectObserverTopic->waitForSyncedSubscribers(serial); @@ -1539,7 +1539,7 @@ Database::addOrUpdateObject(const ObjectInfo& info, Ice::Long dbSerial) if(_traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << (!update ? "added" : "updated") << " object `" << _communicator->identityToString(id) << "' (serial = `" << dbSerial << "')"; + out << (!update ? "added" : "updated") << " object `" << identityToString(id) << "' (serial = `" << dbSerial << "')"; } } _objectObserverTopic->waitForSyncedSubscribers(serial); @@ -1556,7 +1556,7 @@ Database::removeObject(const Ice::Identity& id, Ice::Long dbSerial) if(_objectCache.has(id)) { DeploymentException ex; - ex.reason = "removing object `" + _communicator->identityToString(id) + "' is not allowed:\n"; + ex.reason = "removing object `" + identityToString(id) + "' is not allowed:\n"; ex.reason += "the object was added with the application descriptor `"; ex.reason += _objectCache.get(id)->getApplication(); ex.reason += "'"; @@ -1590,7 +1590,7 @@ Database::removeObject(const Ice::Identity& id, Ice::Long dbSerial) if(_traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "removed object `" << _communicator->identityToString(id) << "' (serial = `" << dbSerial << "')"; + out << "removed object `" << identityToString(id) << "' (serial = `" << dbSerial << "')"; } } _objectObserverTopic->waitForSyncedSubscribers(serial); @@ -1609,7 +1609,7 @@ Database::updateObject(const Ice::ObjectPrx& proxy) if(_objectCache.has(id)) { DeploymentException ex; - ex.reason = "updating object `" + _communicator->identityToString(id) + "' is not allowed:\n"; + ex.reason = "updating object `" + identityToString(id) + "' is not allowed:\n"; ex.reason += "the object was added with the application descriptor `"; ex.reason += _objectCache.get(id)->getApplication(); ex.reason += "'"; @@ -1644,7 +1644,7 @@ Database::updateObject(const Ice::ObjectPrx& proxy) if(_traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "updated object `" << _communicator->identityToString(id) << "' (serial = `" << dbSerial << "')"; + out << "updated object `" << identityToString(id) << "' (serial = `" << dbSerial << "')"; } } _objectObserverTopic->waitForSyncedSubscribers(serial); @@ -1833,7 +1833,7 @@ Database::getAllObjectInfos(const string& expression) ObjectsMapROCursor cursor(_objects, txn); while(cursor.get(id, info, MDB_NEXT)) { - if(expression.empty() || IceUtilInternal::match(_communicator->identityToString(id), expression, true)) + if(expression.empty() || IceUtilInternal::match(identityToString(id), expression, true)) { infos.push_back(info); } @@ -2089,7 +2089,7 @@ Database::checkObjectForAddition(const Ice::Identity& objectId, if(found) { DeploymentException ex; - ex.reason = "object `" + _communicator->identityToString(objectId) + "' is already registered"; + ex.reason = "object `" + identityToString(objectId) + "' is already registered"; throw ex; } } @@ -2761,7 +2761,7 @@ Database::addObject(const IceDB::ReadWriteTxn& txn, const ObjectInfo& info, bool catch(const IceDB::KeyTooLongException& ex) { throw DeploymentException("object identity `" + - _communicator->identityToString(info.proxy->ice_getIdentity()) + identityToString(info.proxy->ice_getIdentity()) + "' is too long: " + ex.what()); } try diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index ab6def85669..217cba7e7d6 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -10,6 +10,7 @@ #include <Ice/Communicator.h> #include <Ice/LoggerUtil.h> #include <Ice/LocalException.h> +#include <Ice/Initialize.h> #include <IceGrid/DescriptorBuilder.h> #include <IceGrid/Util.h> @@ -318,7 +319,7 @@ ApplicationDescriptorBuilder::addObject(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { @@ -697,7 +698,7 @@ CommunicatorDescriptorBuilder::addObject(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { @@ -711,7 +712,7 @@ CommunicatorDescriptorBuilder::addAllocatable(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index bd0d57cb333..7e1a531dbb5 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -650,11 +650,11 @@ Ice::Identity Resolver::operator()(const Ice::Identity& value, const string& name) const { assert(_communicator); - string str = asId(_communicator->identityToString(value), name, false); - Ice::Identity id = _communicator->stringToIdentity(str); + string str = asId(identityToString(value), name, false); + Ice::Identity id = Ice::stringToIdentity(str); if(id.name.empty()) { - exception("invalid object identity `" + _communicator->identityToString(value) + "': name empty"); + exception("invalid object identity `" + identityToString(value) + "': name empty"); } return id; } @@ -1387,7 +1387,7 @@ CommunicatorHelper::printObjectAdapter(const Ice::CommunicatorPtr& communicator, { out << nl << "well-known object"; out << sb; - out << nl << "identity = `" << communicator->identityToString(p->id) << "' "; + out << nl << "identity = `" << identityToString(p->id) << "' "; if(!p->type.empty()) { out << nl << "type = `" << p->type << "'"; @@ -1402,7 +1402,7 @@ CommunicatorHelper::printObjectAdapter(const Ice::CommunicatorPtr& communicator, { out << nl << "allocatable"; out << sb; - out << nl << "identity = `" << communicator->identityToString(p->id) << "' "; + out << nl << "identity = `" << identityToString(p->id) << "' "; if(!p->type.empty()) { out << nl << "type = `" << p->type << "'"; @@ -2825,7 +2825,7 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator, { if(objectIds.count(*o) > 1) { - resolve.exception("duplicate object `" + _communicator->identityToString(*o) + "'"); + resolve.exception("duplicate object `" + identityToString(*o) + "'"); } } } diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index b835c65be04..63b7a20a755 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -470,7 +470,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) // for the server and server adapter. It also takes care of installing the // evictors and object factories necessary to store these objects. // - Identity id = communicator()->stringToIdentity(instanceName + "/Node-" + name); + Identity id = stringToIdentity(instanceName + "/Node-" + name); NodePrx nodeProxy = NodePrx::uncheckedCast(_adapter->createProxy(id)); _node = new NodeI(_adapter, *_sessions, _activator, _timer, traceLevels, nodeProxy, name, mapper, instanceName); _adapter->add(_node, nodeProxy->ice_getIdentity()); diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index a39b69ae487..1ca7a9645d6 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -198,7 +198,7 @@ public: return; } - _amdCB->ice_response(proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy"))); + _amdCB->ice_response(proxy->ice_identity(Ice::stringToIdentity("dummy"))); } virtual void @@ -390,7 +390,7 @@ public: return; } - _proxies[id] = proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy")); + _proxies[id] = proxy->ice_identity(Ice::stringToIdentity("dummy")); // // If we received all the required proxies, it's time to send the @@ -548,14 +548,14 @@ public: if(_count > 1) { - Ice::ObjectPrx p = proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy")); + Ice::ObjectPrx p = proxy->ice_identity(Ice::stringToIdentity("dummy")); LocatorI::RequestPtr request = new ReplicaGroupRequest(_amdCB, _locator, _id, _encoding, _adapters, _count, p); request->execute(); } else { - _amdCB->ice_response(proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy"))); + _amdCB->ice_response(proxy->ice_identity(Ice::stringToIdentity("dummy"))); } _adapters.clear(); } diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp index 12e210c62ad..9d7138e7050 100644 --- a/cpp/src/IceGrid/ObjectCache.cpp +++ b/cpp/src/IceGrid/ObjectCache.cpp @@ -82,7 +82,7 @@ ObjectCache::add(const ObjectInfo& info, const string& application) if(getImpl(id)) { Ice::Error out(_communicator->getLogger()); - out << "can't add duplicate object `" << _communicator->identityToString(id) << "'"; + out << "can't add duplicate object `" << identityToString(id) << "'"; return; } @@ -99,8 +99,8 @@ ObjectCache::add(const ObjectInfo& info, const string& application) if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "added object `" << _communicator->identityToString(id) << "'"; - } + out << "added object `" << identityToString(id) << "'"; + } } ObjectEntryPtr @@ -123,7 +123,7 @@ ObjectCache::remove(const Ice::Identity& id) if(!entry) { Ice::Error out(_communicator->getLogger()); - out << "can't remove unknown object `" << _communicator->identityToString(id) << "'"; + out << "can't remove unknown object `" << identityToString(id) << "'"; return; } removeImpl(id); @@ -131,15 +131,15 @@ ObjectCache::remove(const Ice::Identity& id) map<string, TypeEntry>::iterator p = _types.find(entry->getType()); assert(p != _types.end()); if(p->second.remove(entry)) - { + { _types.erase(p); } if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "removed object `" << _communicator->identityToString(id) << "'"; - } + out << "removed object `" << identityToString(id) << "'"; + } } Ice::ObjectProxySeq @@ -167,7 +167,7 @@ ObjectCache::getAll(const string& expression) ObjectInfoSeq infos; for(map<Ice::Identity, ObjectEntryPtr>::const_iterator p = _entries.begin(); p != _entries.end(); ++p) { - if(expression.empty() || IceUtilInternal::match(_communicator->identityToString(p->first), expression, true)) + if(expression.empty() || IceUtilInternal::match(identityToString(p->first), expression, true)) { infos.push_back(p->second->getObjectInfo()); } @@ -229,4 +229,3 @@ ObjectEntry::canRemove() { return true; } - diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 01c80978f1c..db58e8f242a 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2100,7 +2100,7 @@ Parser::removeObject(const list<string>& args) try { - _admin->removeObject(_communicator->stringToIdentity((*(args.begin())))); + _admin->removeObject(stringToIdentity((*(args.begin())))); } catch(const Ice::Exception& ex) { @@ -2148,7 +2148,7 @@ Parser::describeObject(const list<string>& args) string arg = *(args.begin()); if(arg.find('*') == string::npos) { - ObjectInfo info = _admin->getObjectInfo(_communicator->stringToIdentity(arg)); + ObjectInfo info = _admin->getObjectInfo(stringToIdentity(arg)); cout << "proxy = `" << _communicator->proxyToString(info.proxy) << "'" << endl; cout << "type = `" << info.type << "'" << endl; return; @@ -2198,7 +2198,7 @@ Parser::listObject(const list<string>& args) for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p) { - cout << _communicator->identityToString(p->proxy->ice_getIdentity()) << endl; + cout << identityToString(p->proxy->ice_getIdentity()) << endl; } } catch(const Ice::Exception& ex) @@ -2957,11 +2957,11 @@ Parser::exception(const Ice::Exception& ex) } catch(const ObjectNotRegisteredException& ex) { - error("couldn't find object `" + _communicator->identityToString(ex.id) + "'"); + error("couldn't find object `" + identityToString(ex.id) + "'"); } catch(const ObjectExistsException& ex) { - error("object `" + _communicator->identityToString(ex.id) + "' already exists"); + error("object `" + identityToString(ex.id) + "' already exists"); } catch(const DeploymentException& ex) { diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index d246b26dd9c..8ca6830132a 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -589,7 +589,7 @@ RegistryI::startImpl() // // Add the locator finder object to the client adapter. // - _clientAdapter->add(new FinderI(_wellKnownObjects), _communicator->stringToIdentity("Ice/LocatorFinder")); + _clientAdapter->add(new FinderI(_wellKnownObjects), stringToIdentity("Ice/LocatorFinder")); // // Setup the discovery object adapter and also add it the lookup @@ -624,7 +624,7 @@ RegistryI::startImpl() try { - Ice::Identity lookupId = _communicator->stringToIdentity("IceLocatorDiscovery/Lookup"); + Ice::Identity lookupId = stringToIdentity("IceLocatorDiscovery/Lookup"); discoveryAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Discovery"); discoveryAdapter->add(new LookupI(_instanceName, _wellKnownObjects), lookupId); } diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp index 96a3fd4261f..77c324aea27 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.cpp +++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp @@ -177,7 +177,7 @@ public: { ostringstream os; os << ex << ":\n"; - os << "id: " << info.proxy->ice_getCommunicator()->identityToString(info.proxy->ice_getIdentity()); + os << "id: " << identityToString(info.proxy->ice_getIdentity()); failure = os.str(); } receivedUpdate(ObjectObserverTopicName, serial, failure); @@ -196,7 +196,7 @@ public: { ostringstream os; os << ex << ":\n"; - os << "id: " << info.proxy->ice_getCommunicator()->identityToString(info.proxy->ice_getIdentity()); + os << "id: " << identityToString(info.proxy->ice_getIdentity()); failure = os.str(); } catch(const DeploymentException& ex) diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp index 1553c8be228..de544ef43b1 100644 --- a/cpp/src/IceGrid/Util.cpp +++ b/cpp/src/IceGrid/Util.cpp @@ -207,7 +207,7 @@ IceGrid::toObjectInfo(const Ice::CommunicatorPtr& communicator, const ObjectDesc ObjectInfo info; info.type = obj.type; ostringstream proxyStr; - proxyStr << "\"" << communicator->identityToString(obj.id) << "\""; + proxyStr << "\"" << identityToString(obj.id) << "\""; if(!obj.proxyOptions.empty()) { proxyStr << ' ' << obj.proxyOptions; @@ -220,7 +220,7 @@ IceGrid::toObjectInfo(const Ice::CommunicatorPtr& communicator, const ObjectDesc catch(const Ice::ProxyParseException&) { ostringstream fallbackProxyStr; - fallbackProxyStr << "\"" << communicator->identityToString(obj.id) << "\"" << " @ " << adapterId; + fallbackProxyStr << "\"" << identityToString(obj.id) << "\"" << " @ " << adapterId; info.proxy = communicator->stringToProxy(fallbackProxyStr.str()); } return info; diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp index b3a927c719e..9a3c81022e3 100644 --- a/cpp/src/IceStorm/IceStormDB.cpp +++ b/cpp/src/IceStorm/IceStormDB.cpp @@ -231,8 +231,8 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " KEY = TOPIC(" << communicator()->identityToString(q->first.topic) - << ") ID(" << communicator()->identityToString(q->first.id) << ")" <<endl; + cout << " KEY = TOPIC(" << identityToString(q->first.topic) + << ") ID(" << identityToString(q->first.id) << ")" <<endl; } subscriberMap.put(txn, q->first, q->second); } @@ -286,8 +286,8 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " KEY = TOPIC(" << communicator()->identityToString(key.topic) - << ") ID(" << communicator()->identityToString(key.id) << ")" <<endl; + cout << " KEY = TOPIC(" << identityToString(key.topic) + << ") ID(" << identityToString(key.id) << ")" <<endl; } data.subscribers.insert(std::make_pair(key, record)); } diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp index 017a5196fd3..ad3495429c9 100644 --- a/cpp/src/IceStorm/InstrumentationI.cpp +++ b/cpp/src/IceStorm/InstrumentationI.cpp @@ -174,7 +174,7 @@ public: } catch(const ::Ice::FixedProxyException&) { - _id = _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); + _id = identityToString(_proxy->ice_getIdentity()); } } return _id; @@ -206,7 +206,7 @@ public: string getIdentity() const { - return _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); + return identityToString(_proxy->ice_getIdentity()); } private: diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index fc00848fe65..6f802b11569 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -364,7 +364,7 @@ Parser::subscribers(const list<string>& args) IdentitySeq subscribers = topic->getSubscribers(); for(IdentitySeq::const_iterator j = subscribers.begin(); j != subscribers.end(); ++j) { - cout << "\t" << _communicator->identityToString(*j) << endl; + cout << "\t" << identityToString(*j) << endl; } } } @@ -379,7 +379,7 @@ Parser::current(const list<string>& args) { if(args.empty()) { - cout << _communicator->identityToString(_defaultManager->ice_getIdentity()) << endl; + cout << identityToString(_defaultManager->ice_getIdentity()) << endl; return; } else if(args.size() > 1) @@ -618,7 +618,7 @@ Parser::parse(const std::string& commands, bool debug) TopicManagerPrx Parser::findManagerById(const string& full, string& arg) const { - Ice::Identity id = _communicator->stringToIdentity(full); + Ice::Identity id = stringToIdentity(full); arg = id.name; if(id.category.empty()) { diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index de1393e554e..9d925c9bff1 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -403,7 +403,7 @@ ServiceI::start( } topicAdapter->add(new FinderI(TopicManagerPrx::uncheckedCast(topicAdapter->createProxy(topicManagerId))), - communicator->stringToIdentity("IceStorm/Finder")); + stringToIdentity("IceStorm/Finder")); topicAdapter->activate(); publishAdapter->activate(); diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index 4b53be621e1..a4b89d09e1b 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -546,7 +546,7 @@ Subscriber::create( Ice::Identity perId; perId.category = instance->instanceName(); perId.name = "topic." + rec.topicName + ".publish." + - instance->communicator()->identityToString(rec.obj->ice_getIdentity()); + identityToString(rec.obj->ice_getIdentity()); Ice::ObjectPrx proxy = instance->publishAdapter()->add(per, perId); TraceLevelsPtr traceLevels = instance->traceLevels(); SubscriberPtr subscriber; @@ -798,7 +798,7 @@ Subscriber::error(bool dec, const Ice::Exception& e) if(_currentRetry == 0) { Ice::Warning warn(traceLevels->logger); - warn << traceLevels->subscriberCat << ":" << _instance->communicator()->identityToString(_rec.id); + warn << traceLevels->subscriberCat << ":" << identityToString(_rec.id); if(traceLevels->subscriber > 1) { warn << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj); @@ -811,7 +811,7 @@ Subscriber::error(bool dec, const Ice::Exception& e) if(traceLevels->subscriber > 0) { Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat); - out << _instance->communicator()->identityToString(_rec.id); + out << identityToString(_rec.id); if(traceLevels->subscriber > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj); @@ -839,7 +839,7 @@ Subscriber::error(bool dec, const Ice::Exception& e) if(traceLevels->subscriber > 0) { Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat); - out << _instance->communicator()->identityToString(_rec.id); + out << identityToString(_rec.id); if(traceLevels->subscriber > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj); diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index acea59e5c15..3a9c3d65a79 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -399,7 +399,7 @@ TopicImpl::TopicImpl( if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << " recreate " << _instance->communicator()->identityToString(id); + out << _name << " recreate " << identityToString(id); if(traceLevels->topic > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj); @@ -418,7 +418,7 @@ TopicImpl::TopicImpl( catch(const Ice::Exception& ex) { Ice::Warning out(traceLevels->logger); - out << _name << " recreate " << _instance->communicator()->identityToString(id); + out << _name << " recreate " << identityToString(id); if(traceLevels->topic > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj); @@ -491,7 +491,7 @@ trace(Ice::Trace& out, const PersistentInstancePtr& instance, const vector<Subsc { out << ","; } - out << instance->communicator()->identityToString((*p)->id()); + out << identityToString((*p)->id()); } out << "]"; } @@ -516,7 +516,7 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": subscribeAndGetPublisher: " << _instance->communicator()->identityToString(id); + out << _name << ": subscribeAndGetPublisher: " << identityToString(id); if(traceLevels->topic > 1) { @@ -600,7 +600,7 @@ TopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": unsubscribe: " << _instance->communicator()->identityToString(id); + out << _name << ": unsubscribe: " << identityToString(id); if(traceLevels->topic > 1) { @@ -637,7 +637,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": link " << _instance->communicator()->identityToString(topic->ice_getIdentity()) + out << _name << ": link " << identityToString(topic->ice_getIdentity()) << " cost " << cost; } @@ -722,7 +722,7 @@ TopicImpl::unlink(const TopicPrx& topic) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << " unlink " << _instance->communicator()->identityToString(id); + out << _name << " unlink " << identityToString(id); } Ice::IdentitySeq ids; @@ -746,7 +746,7 @@ TopicImpl::reap(const Ice::IdentitySeq& ids) { out << ","; } - out << _instance->communicator()->identityToString(*p); + out << identityToString(*p); } } @@ -1045,7 +1045,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": add replica observer: " << _instance->communicator()->identityToString(record.id); + out << _name << ": add replica observer: " << identityToString(record.id); if(traceLevels->topic > 1) { @@ -1072,7 +1072,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _instance->communicator()->identityToString(record.id) << ": already subscribed"; + out << identityToString(record.id) << ": already subscribed"; } return; } @@ -1116,7 +1116,7 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq { out << ","; } - out << _instance->communicator()->identityToString(*id); + out << identityToString(*id); } out << " llu: " << llu.generation << "/" << llu.iteration; } diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 5c4ad1c6cbc..15696d70abc 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -421,14 +421,14 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont out << "init"; for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p) { - out << " topic: " << _instance->communicator()->identityToString(p->id) << " subscribers: "; + out << " topic: " << identityToString(p->id) << " subscribers: "; for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q) { if(q != p->records.begin()) { out << ","; } - out << _instance->communicator()->identityToString(q->id); + out << identityToString(q->id); if(traceLevels->topicMgr > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(q->obj); @@ -803,7 +803,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool if(create) { out << "creating new topic \"" << name << "\". id: " - << _instance->communicator()->identityToString(id) + << identityToString(id) << " subscribers: "; for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q) { @@ -813,7 +813,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool } if(traceLevels->topicMgr > 1) { - out << _instance->communicator()->identityToString(q->id) + out << identityToString(q->id) << " endpoints: " << IceStormInternal::describeEndpoints(q->obj); } } @@ -821,7 +821,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool else { out << "loading topic \"" << name << "\" from database. id: " - << _instance->communicator()->identityToString(id) + << identityToString(id) << " subscribers: "; for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q) { @@ -831,7 +831,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool } if(traceLevels->topicMgr > 1) { - out << _instance->communicator()->identityToString(q->id) + out << identityToString(q->id) << " endpoints: " << IceStormInternal::describeEndpoints(q->obj); } } diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp index 062db7014fb..f11688d1a10 100644 --- a/cpp/src/IceStorm/TransientTopicI.cpp +++ b/cpp/src/IceStorm/TransientTopicI.cpp @@ -178,7 +178,7 @@ TransientTopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj, con if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": subscribe: " << _instance->communicator()->identityToString(id); + out << _name << ": subscribe: " << identityToString(id); if(traceLevels->topic > 1) { @@ -280,7 +280,7 @@ TransientTopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPr if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": subscribeAndGetPublisher: " << _instance->communicator()->identityToString(id); + out << _name << ": subscribeAndGetPublisher: " << identityToString(id); if(traceLevels->topic > 1) { @@ -338,7 +338,7 @@ TransientTopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber, const Ice::Cur if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": unsubscribe: " << _instance->communicator()->identityToString(id); + out << _name << ": unsubscribe: " << identityToString(id); if(traceLevels->topic > 1) { out << " endpoints: " << IceStormInternal::describeEndpoints(subscriber); @@ -374,7 +374,7 @@ TransientTopicImpl::link(const TopicPrx& topic, Ice::Int cost, const Ice::Curren if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << ": link " << _instance->communicator()->identityToString(topic->ice_getIdentity()) + out << _name << ": link " << identityToString(topic->ice_getIdentity()) << " cost " << cost; } @@ -434,7 +434,7 @@ TransientTopicImpl::unlink(const TopicPrx& topic, const Ice::Current&) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << _name << " unlink " << _instance->communicator()->identityToString(id); + out << _name << " unlink " << identityToString(id); } // Remove the subscriber from the subscribers list. Note diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp index 8c45a471f19..5bd8449fd66 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.cpp +++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp @@ -55,7 +55,7 @@ TransientTopicManagerImpl::create(const string& name, const Ice::Current&) { Ice::Trace out(traceLevels->logger, traceLevels->topicMgrCat); out << "creating new topic \"" << name << "\". id: " - << _instance->communicator()->identityToString(id); + << identityToString(id); } // diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp index 8426d773d63..42b61f1ab92 100644 --- a/cpp/src/icegriddb/IceGridDB.cpp +++ b/cpp/src/icegriddb/IceGridDB.cpp @@ -372,7 +372,7 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl; + cout << " NAME = " << identityToString(p->proxy->ice_getIdentity()) << endl; } objs.put(txn, p->proxy->ice_getIdentity(), *p); } @@ -390,7 +390,7 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl; + cout << " NAME = " << identityToString(p->proxy->ice_getIdentity()) << endl; } internalObjs.put(txn, p->proxy->ice_getIdentity(), *p); } @@ -483,7 +483,7 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " IDENTITY = " << communicator()->identityToString(id) << endl; + cout << " IDENTITY = " << identityToString(id) << endl; } data.objects.push_back(object); } @@ -503,7 +503,7 @@ Client::run(int argc, char* argv[]) { if(debug) { - cout << " IDENTITY = " << communicator()->identityToString(id) << endl; + cout << " IDENTITY = " << identityToString(id) << endl; } data.internalObjects.push_back(object); } diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp index a4c45965b22..82fc03b1598 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp @@ -57,7 +57,7 @@ public: _adapter(adapter) { _registryPrx = LocatorRegistryPrx::uncheckedCast(adapter->add(new ServerLocatorRegistry, - _adapter->getCommunicator()->stringToIdentity("registry"))); + Ice::stringToIdentity("registry"))); } virtual void @@ -69,7 +69,7 @@ public: virtual void findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { - cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); + cb->ice_response(_adapter->createDirectProxy(stringToIdentity("dummy"))); } virtual LocatorRegistryPrx @@ -146,12 +146,12 @@ SessionControlServer::run(int, char*[]) communicator()->getProperties()->setProperty("TestControllerAdapter.Endpoints", "tcp -p 12013"); ObjectAdapterPtr controllerAdapter = communicator()->createObjectAdapter("TestControllerAdapter"); TestControllerIPtr controller = new TestControllerI; - controllerAdapter->add(controller, communicator()->stringToIdentity("testController")); + controllerAdapter->add(controller, Ice::stringToIdentity("testController")); controllerAdapter->activate(); communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); - adapter->add(new SessionManagerI(controller), communicator()->stringToIdentity("SessionManager")); + adapter->add(new SessionManagerI(controller), Ice::stringToIdentity("SessionManager")); adapter->activate(); BackendPtr backend = new BackendI; @@ -161,7 +161,7 @@ SessionControlServer::run(int, char*[]) backendAdapter->activate(); Ice::LocatorPtr locator = new ServerLocatorI(backend, backendAdapter); - backendAdapter->add(locator, communicator()->stringToIdentity("locator")); + backendAdapter->add(locator, Ice::stringToIdentity("locator")); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/override/Server.cpp b/cpp/test/Glacier2/override/Server.cpp index 9fe3f80a47b..e7317bf1108 100644 --- a/cpp/test/Glacier2/override/Server.cpp +++ b/cpp/test/Glacier2/override/Server.cpp @@ -44,7 +44,7 @@ CallbackServer::run(int, char**) { communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); - adapter->add(new CallbackI(), communicator()->stringToIdentity("c/callback")); + adapter->add(new CallbackI(), Ice::stringToIdentity("c/callback")); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index 1987e693dbc..937a114e053 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -712,7 +712,7 @@ CallbackClient::run(int argc, char* argv[]) Context context; context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast( - twoway->ice_identity(communicator()->stringToIdentity("c2/callback"))); + twoway->ice_identity(stringToIdentity("c2/callback"))); otherCategoryTwoway->initiateCallback(twowayR, context); callbackReceiverImpl->callbackOK(); cout << "ok" << endl; @@ -725,7 +725,7 @@ CallbackClient::run(int argc, char* argv[]) try { CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast( - twoway->ice_identity(communicator()->stringToIdentity("c3/callback"))); + twoway->ice_identity(stringToIdentity("c3/callback"))); otherCategoryTwoway->initiateCallback(twowayR, context); test(false); } @@ -740,7 +740,7 @@ CallbackClient::run(int argc, char* argv[]) Context context; context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast( - twoway->ice_identity(communicator()->stringToIdentity("_userid/callback"))); + twoway->ice_identity(stringToIdentity("_userid/callback"))); otherCategoryTwoway->initiateCallback(twowayR, context); callbackReceiverImpl->callbackOK(); cout << "ok" << endl; diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index 494c97c14c3..f07ce8fc713 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -43,10 +43,10 @@ CallbackServer::run(int, char**) { communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); - adapter->add(new CallbackI(), communicator()->stringToIdentity("c1/callback")); // The test allows "c1" as category. - adapter->add(new CallbackI(), communicator()->stringToIdentity("c2/callback")); // The test allows "c2" as category. - adapter->add(new CallbackI(), communicator()->stringToIdentity("c3/callback")); // The test rejects "c3" as category. - adapter->add(new CallbackI(), communicator()->stringToIdentity("_userid/callback")); // The test allows the prefixed userid. + adapter->add(new CallbackI(), Ice::stringToIdentity("c1/callback")); // The test allows "c1" as category. + adapter->add(new CallbackI(), Ice::stringToIdentity("c2/callback")); // The test allows "c2" as category. + adapter->add(new CallbackI(), Ice::stringToIdentity("c3/callback")); // The test rejects "c3" as category. + adapter->add(new CallbackI(), Ice::stringToIdentity("_userid/callback")); // The test allows the prefixed userid. adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index cd24c48eb51..cffa77ec01a 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -38,7 +38,7 @@ SessionControlServer::run(int, char**) { communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); - adapter->add(new SessionManagerI, communicator()->stringToIdentity("SessionManager")); + adapter->add(new SessionManagerI, Ice::stringToIdentity("SessionManager")); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp index c5e95356813..f359b5f557d 100644 --- a/cpp/test/Glacier2/sessionHelper/Server.cpp +++ b/cpp/test/Glacier2/sessionHelper/Server.cpp @@ -59,7 +59,7 @@ SessionHelperServer::run(int, char**) communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); - adapter->add(new CallbackI(), communicator()->stringToIdentity("callback")); + adapter->add(new CallbackI(), Ice::stringToIdentity("callback")); adapter->activate(); communicator()->waitForShutdown(); diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index 04f9ed6df9c..fcaf8d411b9 100644 --- a/cpp/test/Glacier2/ssl/Server.cpp +++ b/cpp/test/Glacier2/ssl/Server.cpp @@ -171,10 +171,10 @@ SessionServer::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints( "SessionServer", "tcp -h 127.0.0.1 -p 12350"); - adapter->add(new PermissionsVerifierI, communicator()->stringToIdentity("verifier")); - adapter->add(new SSLPermissionsVerifierI, communicator()->stringToIdentity("sslverifier")); - adapter->add(new SessionManagerI, communicator()->stringToIdentity("sessionmanager")); - adapter->add(new SSLSessionManagerI, communicator()->stringToIdentity("sslsessionmanager")); + adapter->add(new PermissionsVerifierI, Ice::stringToIdentity("verifier")); + adapter->add(new SSLPermissionsVerifierI, Ice::stringToIdentity("sslverifier")); + adapter->add(new SessionManagerI, Ice::stringToIdentity("sessionmanager")); + adapter->add(new SSLSessionManagerI, Ice::stringToIdentity("sslsessionmanager")); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index 66645f61ff8..034676d7b89 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -54,7 +54,7 @@ public: _adapter(adapter), _registryPrx( LocatorRegistryPrx::uncheckedCast( - adapter->add(new ServerLocatorRegistry, _adapter->getCommunicator()->stringToIdentity("registry")))) + adapter->add(new ServerLocatorRegistry, Ice::stringToIdentity("registry")))) { } @@ -67,7 +67,7 @@ public: virtual void findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { - cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); + cb->ice_response(_adapter->createDirectProxy(stringToIdentity("dummy"))); } virtual LocatorRegistryPrx @@ -137,7 +137,7 @@ BackendServer::run(int, char**) ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); BackendPtr backend = new BackendI; Ice::LocatorPtr locator = new ServerLocatorI(backend, adapter); - adapter->add(locator, communicator()->stringToIdentity("locator")); + adapter->add(locator, Ice::stringToIdentity("locator")); adapter->addServantLocator(new ServantLocatorI(backend), ""); adapter->activate(); communicator()->waitForShutdown(); diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp index 4797c8607c2..d2af92e45f8 100644 --- a/cpp/test/Ice/acm/Server.cpp +++ b/cpp/test/Ice/acm/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); communicator->getProperties()->setProperty("TestAdapter.ACM.Timeout", "0"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("communicator"); + Ice::Identity id = Ice::stringToIdentity("communicator"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id); adapter->activate(); diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp index 42e0f119cd1..98f07a1b93a 100644 --- a/cpp/test/Ice/acm/TestI.cpp +++ b/cpp/test/Ice/acm/TestI.cpp @@ -104,7 +104,7 @@ RemoteCommunicatorI::shutdown(const Ice::Current& current) RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter), _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI), - adapter->getCommunicator()->stringToIdentity("test")))) + stringToIdentity("test")))) { _adapter->activate(); } diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index da880fc0ced..bbe87980315 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -225,7 +225,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::CommunicatorPtr com = Ice::initialize(init); test(!com->getAdmin()); - Ice::Identity id = com->stringToIdentity("test-admin"); + Ice::Identity id = stringToIdentity("test-admin"); try { com->createAdmin(0, id); diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index 57157d58363..c18d954e2ef 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("factory"); + Ice::Identity id = Ice::stringToIdentity("factory"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorFactoryI), id); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp index 73396d57834..0f9abd96355 100644 --- a/cpp/test/Ice/ami/Collocated.cpp +++ b/cpp/test/Ice/ami/Collocated.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); //adapter->activate(); // Collocated test doesn't need to activate the OA - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); //adapter2->activate(); // Collocated test doesn't need to activate the OA void allTests(const Ice::CommunicatorPtr&, bool); diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index adf27fd04f2..7c0ebd03b42 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); adapter2->activate(); TEST_READY diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 201b7610d5d..3f13ca8fbb3 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -31,7 +31,7 @@ public: { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response(current.adapter->createDirectProxy(communicator->stringToIdentity("dummy"))); + response(current.adapter->createDirectProxy(Ice::stringToIdentity("dummy"))); } virtual void @@ -51,7 +51,7 @@ public: { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response->ice_response(current.adapter->createDirectProxy(communicator->stringToIdentity("dummy"))); + response->ice_response(current.adapter->createDirectProxy(Ice::stringToIdentity("dummy"))); } virtual void @@ -132,12 +132,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) ConfigurationPtr configuration = plugin->getConfiguration(); BackgroundControllerIPtr backgroundController = ICE_MAKE_SHARED(BackgroundControllerI, adapter, configuration); - adapter->add(ICE_MAKE_SHARED(BackgroundI, backgroundController), communicator->stringToIdentity("background")); - adapter->add(ICE_MAKE_SHARED(LocatorI, backgroundController), communicator->stringToIdentity("locator")); - adapter->add(ICE_MAKE_SHARED(RouterI, backgroundController), communicator->stringToIdentity("router")); + adapter->add(ICE_MAKE_SHARED(BackgroundI, backgroundController), Ice::stringToIdentity("background")); + adapter->add(ICE_MAKE_SHARED(LocatorI, backgroundController), Ice::stringToIdentity("locator")); + adapter->add(ICE_MAKE_SHARED(RouterI, backgroundController), Ice::stringToIdentity("router")); adapter->activate(); - adapter2->add(backgroundController, communicator->stringToIdentity("backgroundController")); + adapter2->add(backgroundController, Ice::stringToIdentity("backgroundController")); adapter2->activate(); communicator->waitForShutdown(); diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index e2f8a0e24a4..7b840621ab2 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -987,7 +987,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Ensure the published endpoints are actually valid. On // Fedora, binding to "localhost" with IPv6 only works but // resolving localhost don't return the IPv6 adress. - Ice::ObjectPrxPtr prx = oa->createProxy(serverCommunicator->stringToIdentity("dummy")); + Ice::ObjectPrxPtr prx = oa->createProxy(Ice::stringToIdentity("dummy")); try { prx->ice_collocationOptimized(false)->ice_ping(); diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 6e182cf26e4..431e7dfe3f2 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("communicator"); + Ice::Identity id = Ice::stringToIdentity("communicator"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id); adapter->activate(); diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 28c29b774c6..2f2904303c7 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -69,7 +69,7 @@ RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) _adapter(adapter), _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI), - adapter->getCommunicator()->stringToIdentity("test")))) + stringToIdentity("test")))) { _adapter->activate(); } diff --git a/cpp/test/Ice/checksum/Server.cpp b/cpp/test/Ice/checksum/Server.cpp index 534567b0a15..42d986b2dbf 100644 --- a/cpp/test/Ice/checksum/Server.cpp +++ b/cpp/test/Ice/checksum/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(ChecksumI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(ChecksumI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index d5e5cd467d0..5f17fb0c7e4 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 51c6b4c4cd5..be7e8adf81b 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index e2b635f2665..954a2035ab2 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index b08e2440643..05592f5a8ed 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -28,10 +28,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); //adapter2->activate(); // Don't activate OA to ensure collocation is used. void allTests(const Ice::CommunicatorPtr&); diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index bdc490dd4eb..08dc9b75e17 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -28,10 +28,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); adapter2->activate(); TEST_READY diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp index e1d56838839..9d80f8833a9 100644 --- a/cpp/test/Ice/echo/Server.cpp +++ b/cpp/test/Ice/echo/Server.cpp @@ -52,7 +52,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); BlobjectIPtr blob = ICE_MAKE_SHARED(BlobjectI); adapter->addDefaultServant(blob, ""); - adapter->add(ICE_MAKE_SHARED(EchoI, blob), communicator->stringToIdentity("__echo")); + adapter->add(ICE_MAKE_SHARED(EchoI, blob), Ice::stringToIdentity("__echo")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index e01c6c9c1eb..45dec2632e4 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 18cd9d7539b..3f047784a12 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -306,7 +306,7 @@ public: } catch(const Ice::ObjectNotExistException& ex) { - Ice::Identity id = _communicator->stringToIdentity("does not exist"); + Ice::Identity id = Ice::stringToIdentity("does not exist"); test(ex.id == id); } catch(...) @@ -563,10 +563,10 @@ allTests(const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter1.Endpoints", localOAEndpoint); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI); - adapter->add(obj, communicator->stringToIdentity("x")); + adapter->add(obj, Ice::stringToIdentity("x")); try { - adapter->add(obj, communicator->stringToIdentity("x")); + adapter->add(obj, Ice::stringToIdentity("x")); test(false); } catch(const Ice::AlreadyRegisteredException& ex) @@ -580,7 +580,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - adapter->add(obj, communicator->stringToIdentity("")); + adapter->add(obj, Ice::stringToIdentity("")); } catch(const Ice::IllegalIdentityException& ex) { @@ -594,7 +594,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - adapter->add(0, communicator->stringToIdentity("x")); + adapter->add(0, Ice::stringToIdentity("x")); } catch(const Ice::IllegalServantException& ex) { @@ -605,10 +605,10 @@ allTests(const Ice::CommunicatorPtr& communicator) } } - adapter->remove(communicator->stringToIdentity("x")); + adapter->remove(Ice::stringToIdentity("x")); try { - adapter->remove(communicator->stringToIdentity("x")); + adapter->remove(Ice::stringToIdentity("x")); test(false); } catch(const Ice::NotRegisteredException& ex) @@ -1010,7 +1010,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching object not exist exception... " << flush; - Ice::Identity id = communicator->stringToIdentity("does not exist"); + Ice::Identity id = Ice::stringToIdentity("does not exist"); try { ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, thrower->ice_identity(id)); @@ -1568,7 +1568,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - id = communicator->stringToIdentity("does not exist"); + id = Ice::stringToIdentity("does not exist"); shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower->ice_identity(id)); auto f = thrower2->throwAasAAsync(1); try @@ -1584,7 +1584,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(false); } #else - id = communicator->stringToIdentity("does not exist"); + id = Ice::stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); CallbackPtr cb = new Callback(communicator); Callback_Thrower_throwAasAPtr callback = diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index e5aa2de376a..063bbd25e1a 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index e0cd7903ed5..2a95948c06a 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -27,9 +27,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); - adapter2->add(object, communicator->stringToIdentity("thrower")); - adapter3->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); + adapter2->add(object, Ice::stringToIdentity("thrower")); + adapter3->add(object, Ice::stringToIdentity("thrower")); adapter->activate(); adapter2->activate(); adapter3->activate(); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 99dee0dec94..528b0e7ee03 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -27,9 +27,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); - adapter2->add(object, communicator->stringToIdentity("thrower")); - adapter3->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); + adapter2->add(object, Ice::stringToIdentity("thrower")); + adapter3->add(object, Ice::stringToIdentity("thrower")); adapter->activate(); adapter2->activate(); adapter3->activate(); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 923bb4e437b..5b542de8a85 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -60,20 +60,20 @@ allTests(const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", localOAEndpoint); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI); - adapter->add(obj, communicator->stringToIdentity("d")); - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(obj, Ice::stringToIdentity("d")); + adapter->addFacet(obj, Ice::stringToIdentity("d"), "facetABCD"); try { - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); + adapter->addFacet(obj, Ice::stringToIdentity("d"), "facetABCD"); test(false); } catch(const Ice::AlreadyRegisteredException&) { } - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); + adapter->removeFacet(Ice::stringToIdentity("d"), "facetABCD"); try { - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); + adapter->removeFacet(Ice::stringToIdentity("d"), "facetABCD"); test(false); } catch(const Ice::NotRegisteredException&) @@ -84,25 +84,25 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing removeAllFacets... " << flush; Ice::ObjectPtr obj1 = ICE_MAKE_SHARED(EmptyI); Ice::ObjectPtr obj2 = ICE_MAKE_SHARED(EmptyI); - adapter->addFacet(obj1, communicator->stringToIdentity("id1"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id1"), "f2"); + adapter->addFacet(obj1, Ice::stringToIdentity("id1"), "f1"); + adapter->addFacet(obj2, Ice::stringToIdentity("id1"), "f2"); Ice::ObjectPtr obj3 = ICE_MAKE_SHARED(EmptyI); - adapter->addFacet(obj1, communicator->stringToIdentity("id2"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id2"), "f2"); - adapter->addFacet(obj3, communicator->stringToIdentity("id2"), ""); - Ice::FacetMap fm = adapter->removeAllFacets(communicator->stringToIdentity("id1")); + adapter->addFacet(obj1, Ice::stringToIdentity("id2"), "f1"); + adapter->addFacet(obj2, Ice::stringToIdentity("id2"), "f2"); + adapter->addFacet(obj3, Ice::stringToIdentity("id2"), ""); + Ice::FacetMap fm = adapter->removeAllFacets(Ice::stringToIdentity("id1")); test(fm.size() == 2); test(fm["f1"] == obj1); test(fm["f2"] == obj2); try { - adapter->removeAllFacets(communicator->stringToIdentity("id1")); + adapter->removeAllFacets(Ice::stringToIdentity("id1")); test(false); } catch(const Ice::NotRegisteredException&) { } - fm = adapter->removeAllFacets(communicator->stringToIdentity("id2")); + fm = adapter->removeAllFacets(Ice::stringToIdentity("id2")); test(fm.size() == 3); test(fm["f1"] == obj1); test(fm["f2"] == obj2); diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 9dbf1bb6b2f..21460a5806c 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = ICE_MAKE_SHARED(DI); - adapter->add(d, communicator->stringToIdentity("d")); - adapter->addFacet(d, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(d, Ice::stringToIdentity("d")); + adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD"); Ice::ObjectPtr f = ICE_MAKE_SHARED(FI); - adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF"); + adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF"); Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator); - adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH"); + adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH"); GPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index b9bff160667..92d0b838bd5 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -21,12 +21,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = ICE_MAKE_SHARED(DI); - adapter->add(d, communicator->stringToIdentity("d")); - adapter->addFacet(d, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(d, Ice::stringToIdentity("d")); + adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD"); Ice::ObjectPtr f = ICE_MAKE_SHARED(FI); - adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF"); + adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF"); Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator); - adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH"); + adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH"); TEST_READY adapter->activate(); communicator->waitForShutdown(); diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index ab727d372de..c731d007786 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -53,7 +53,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpts.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 3d1db1b74a4..261d83d4660 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -26,7 +26,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Serialize", "0"); Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1"); - adapter1->add(ICE_MAKE_SHARED(HoldI, timer, adapter1), communicator->stringToIdentity("hold")); + adapter1->add(ICE_MAKE_SHARED(HoldI, timer, adapter1), Ice::stringToIdentity("hold")); communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(communicator, 1) + ":udp"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); @@ -34,7 +34,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Serialize", "1"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); - adapter2->add(ICE_MAKE_SHARED(HoldI, timer, adapter2), communicator->stringToIdentity("hold")); + adapter2->add(ICE_MAKE_SHARED(HoldI, timer, adapter2), Ice::stringToIdentity("hold")); adapter1->activate(); adapter2->activate(); diff --git a/cpp/test/Ice/impl/Server.cpp b/cpp/test/Ice/impl/Server.cpp index b2f397730e5..91cb3580b0d 100644 --- a/cpp/test/Ice/impl/Server.cpp +++ b/cpp/test/Ice/impl/Server.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/impl/ServerAMD.cpp b/cpp/test/Ice/impl/ServerAMD.cpp index d9488a27456..88a22188406 100644 --- a/cpp/test/Ice/impl/ServerAMD.cpp +++ b/cpp/test/Ice/impl/ServerAMD.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index 5d811ef4609..47c8bbb3332 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index f0ff2a1e25f..0f640de9b8b 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); - adapter->add(object, communicator->stringToIdentity("initial")); + adapter->add(object, Ice::stringToIdentity("initial")); InitialPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index abb805c10ca..8ec0c761076 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); - adapter->add(object, communicator->stringToIdentity("initial")); + adapter->add(object, Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 2a6966a80a6..cf48eb18b51 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -707,7 +707,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) registry->addObject(adapter->add(ICE_MAKE_SHARED(HelloI), id)); adapter->activate(); - HelloPrxPtr helloPrx = ICE_CHECKED_CAST(HelloPrx, communicator->stringToProxy(communicator->identityToString(id))); + HelloPrxPtr helloPrx = ICE_CHECKED_CAST(HelloPrx, communicator->stringToProxy(identityToString(id))); test(!helloPrx->ice_getConnection()); adapter->deactivate(); diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 8bb0485c07f..fb2f29a2226 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -37,16 +37,16 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, // 'servers' created with the server manager interface. // ServerLocatorRegistryPtr registry = ICE_MAKE_SHARED(ServerLocatorRegistry); - registry->addObject(adapter->createProxy(communicator->stringToIdentity("ServerManager"))); + registry->addObject(adapter->createProxy(Ice::stringToIdentity("ServerManager"))); Ice::ObjectPtr object = ICE_MAKE_SHARED(ServerManagerI, registry, initData); - adapter->add(object, communicator->stringToIdentity("ServerManager")); + adapter->add(object, Ice::stringToIdentity("ServerManager")); Ice::LocatorRegistryPrxPtr registryPrx = ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, - adapter->add(registry, communicator->stringToIdentity("registry"))); + adapter->add(registry, Ice::stringToIdentity("registry"))); Ice::LocatorPtr locator = ICE_MAKE_SHARED(ServerLocator, registry, registryPrx); - adapter->add(locator, communicator->stringToIdentity("locator")); + adapter->add(locator, Ice::stringToIdentity("locator")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 833d660a159..80e391b2a8d 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -69,9 +69,9 @@ ServerManagerI::startServer(const Ice::Current&) adapter2->setLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator)); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI, adapter, adapter2, _registry); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test"))); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test2"))); - adapter->add(object, serverCommunicator->stringToIdentity("test3")); + _registry->addObject(adapter->add(object, Ice::stringToIdentity("test"))); + _registry->addObject(adapter->add(object, Ice::stringToIdentity("test2"))); + adapter->add(object, Ice::stringToIdentity("test3")); adapter->activate(); adapter2->activate(); @@ -93,7 +93,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const ServerLocatorRegistryPtr& registry) : _adapter1(adapter), _adapter2(adapter2), _registry(registry) { - _registry->addObject(_adapter1->add(ICE_MAKE_SHARED(HelloI), _adapter1->getCommunicator()->stringToIdentity("hello"))); + _registry->addObject(_adapter1->add(ICE_MAKE_SHARED(HelloI), Ice::stringToIdentity("hello"))); } void @@ -106,19 +106,19 @@ HelloPrxPtr TestI::getHello(const Ice::Current&) { return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createIndirectProxy( - _adapter1->getCommunicator()->stringToIdentity("hello"))); + Ice::stringToIdentity("hello"))); } HelloPrxPtr TestI::getReplicatedHello(const Ice::Current&) { - return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createProxy(_adapter1->getCommunicator()->stringToIdentity("hello"))); + return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createProxy(Ice::stringToIdentity("hello"))); } void TestI::migrateHello(const Ice::Current&) { - const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); + const Ice::Identity id = Ice::stringToIdentity("hello"); try { _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp index 3bfed32f91a..dd314954612 100644 --- a/cpp/test/Ice/metrics/Collocated.cpp +++ b/cpp/test/Ice/metrics/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); //adapter->activate(); // Don't activate OA to ensure collocation is used. communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); //controllerAdapter->activate(); // Don't activate OA to ensure collocation is used. MetricsPrxPtr allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&); diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp index 069f288c645..e5daf413204 100644 --- a/cpp/test/Ice/metrics/Server.cpp +++ b/cpp/test/Ice/metrics/Server.cpp @@ -20,12 +20,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); adapter->activate(); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); controllerAdapter->activate(); TEST_READY diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp index 1d53c859792..40aee438374 100644 --- a/cpp/test/Ice/metrics/ServerAMD.cpp +++ b/cpp/test/Ice/metrics/ServerAMD.cpp @@ -20,12 +20,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); adapter->activate(); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); controllerAdapter->activate(); TEST_READY diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp index d8c103dc721..07dac51360a 100644 --- a/cpp/test/Ice/networkProxy/Server.cpp +++ b/cpp/test/Ice/networkProxy/Server.cpp @@ -37,7 +37,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 9686c6ca559..6443ed13252 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -134,9 +134,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), communicator->stringToIdentity("uoet")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet")); InitialPrxPtr allTests(const Ice::CommunicatorPtr&); InitialPrxPtr initial = allTests(communicator); // We must call shutdown even in the collocated case for cyclic dependency cleanup diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 47ef551c54f..c63b2d7c415 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -68,10 +68,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), communicator->stringToIdentity("uoet")); + adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 58cec8483b4..cfce947446d 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. test(!prx->ice_getConnection()); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index c291f5cb13e..80f89467fe7 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index c52ea694234..f291f11a5a4 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index d7c5ceff2c0..046bd3f6de6 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -210,7 +210,7 @@ MyDerivedClassI::opMyClassAsync(shared_ptr<Test::MyClassPrx> p1, { auto p2 = p1; auto p3 = uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); response(uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(current.id)), p2, p3); } @@ -1126,7 +1126,7 @@ MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb, Test::MyClassPrxPtr p2 = p1; Test::MyClassPrxPtr p3 = ICE_UNCHECKED_CAST( Test::MyClassPrx, current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); cb->ice_response(ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)), p2, p3); } diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 1c091594b36..ddbcffedd7f 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -164,7 +164,7 @@ MyDerivedClassI::opMyClass(ICE_IN(Test::MyClassPrxPtr) p1, p2 = p1; p3 = ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); return ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)); } diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index e0ba66c9c92..a8fbe72f7e9 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -351,9 +351,9 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) test(Ice::proxyIdentityAndFacetEqual(c1, p)); test(!Ice::proxyIdentityAndFacetEqual(c2, p)); test(Ice::proxyIdentityAndFacetEqual(r, p)); - test(c1->ice_getIdentity() == communicator->stringToIdentity("test")); - test(c2->ice_getIdentity() == communicator->stringToIdentity("noSuchIdentity")); - test(r->ice_getIdentity() == communicator->stringToIdentity("test")); + test(c1->ice_getIdentity() == Ice::stringToIdentity("test")); + test(c2->ice_getIdentity() == Ice::stringToIdentity("noSuchIdentity")); + test(r->ice_getIdentity() == Ice::stringToIdentity("test")); r->opVoid(); c1->opVoid(); try diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 1a40355816b..1e96c80cae4 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -170,9 +170,9 @@ public: void opMyClass(const Test::MyClassPrxPtr& r, const Test::MyClassPrxPtr& c1, const Test::MyClassPrxPtr& c2) { - test(c1->ice_getIdentity() == _communicator->stringToIdentity("test")); - test(c2->ice_getIdentity() == _communicator->stringToIdentity("noSuchIdentity")); - test(r->ice_getIdentity() == _communicator->stringToIdentity("test")); + test(c1->ice_getIdentity() == Ice::stringToIdentity("test")); + test(c2->ice_getIdentity() == Ice::stringToIdentity("noSuchIdentity")); + test(r->ice_getIdentity() == Ice::stringToIdentity("test")); // // We can't do the callbacks below in connection serialization mode. diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp index fe22e6abe87..aacddd084ed 100644 --- a/cpp/test/Ice/optional/Server.cpp +++ b/cpp/test/Ice/optional/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI), communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp index 9b4c93e894b..c47b19721b5 100644 --- a/cpp/test/Ice/optional/ServerAMD.cpp +++ b/cpp/test/Ice/optional/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI), communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 0bcaccfff27..bcded5cb5b2 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -258,15 +258,11 @@ allTests(const Ice::CommunicatorPtr& communicator) // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice::Identity id = { "test", ",X2QNUAzSBcJ_e$AV;E\\" }; - Ice::Identity id2 = communicator->stringToIdentity(communicator->identityToString(id)); - test(id == id2); - id2 = Ice::stringToIdentity(Ice::identityToString(id)); + Ice::Identity id2 = Ice::stringToIdentity(Ice::identityToString(id)); test(id == id2); id.name = "test"; id.category = ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"; - id2 = communicator->stringToIdentity(communicator->identityToString(id)); - test(id == id2); id2 = Ice::stringToIdentity(Ice::identityToString(id)); test(id == id2); @@ -448,8 +444,10 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing proxy methods... " << flush; - test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) - == "other"); + +// Deprecated +// test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) +// == "other"); test(Ice::identityToString(base->ice_identity(Ice::stringToIdentity("other"))->ice_getIdentity()) == "other"); test(base->ice_facet("facet")->ice_getFacet() == "facet"); test(base->ice_adapterId("id")->ice_getAdapterId() == "id"); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index aa651a1da15..2c7e91d3106 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index 15c8418a051..c0a9a8761c5 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index 432c34f9b53..db603a4570a 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp index 597fc7a65d7..1c83cb7c996 100644 --- a/cpp/test/Ice/retry/Collocated.cpp +++ b/cpp/test/Ice/retry/Collocated.cpp @@ -22,7 +22,7 @@ void setupObjectAdapter(const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(""); - adapter->add(ICE_MAKE_SHARED(RetryI), communicator->stringToIdentity("retry")); + adapter->add(ICE_MAKE_SHARED(RetryI), Ice::stringToIdentity("retry")); //adapter->activate(); // Don't activate OA to ensure collocation is used. } diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index 8a42f1e389e..a0e37557fbf 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(RetryI), communicator->stringToIdentity("retry")); + adapter->add(ICE_MAKE_SHARED(RetryI), Ice::stringToIdentity("retry")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 13fe3b76e4b..aeb02c0e36d 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -96,8 +96,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); Test::TestIntfPrxPtr allTests(const CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index 6b4a38dc772..c5c78e23881 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -97,8 +97,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); adapter->activate(); TEST_READY adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index b51708b76cb..740d6072b33 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -96,8 +96,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorAMDI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorAMDI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestAMDI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestAMDI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); adapter->activate(); TEST_READY adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 2cd8dba2995..909b87b7fc0 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) properties->setProperty("Ice.Warn.Dispatch", "0"); communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("Test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index 5b67af38a4f..c5534dcc207 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) properties->setProperty("Ice.Warn.Dispatch", "0"); communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("Test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 62221669931..093997a59ef 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -23,7 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("Test")); + adapter->add(object, Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index 293676daa27..28e3b390606 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -23,7 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("Test")); + adapter->add(object, Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index ce592e19ba9..3e3b6e17541 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -45,7 +45,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyObjectI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyObjectI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp index bde7ad25bff..b1957badf2f 100644 --- a/cpp/test/Ice/threadPoolPriority/Server.cpp +++ b/cpp/test/Ice/threadPoolPriority/Server.cpp @@ -49,7 +49,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(PriorityI, adapter); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp index 934ba14b99f..3d67cc16c3f 100644 --- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp +++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp @@ -53,7 +53,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) #endif Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(PriorityI, adapter); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index d31e626034e..f355ce381fa 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TimeoutI); - adapter->add(object, communicator->stringToIdentity("timeout")); + adapter->add(object, Ice::stringToIdentity("timeout")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp index 77abcdf2d03..9574f504ed7 100644 --- a/cpp/test/Ice/udp/Server.cpp +++ b/cpp/test/Ice/udp/Server.cpp @@ -26,14 +26,14 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) os << "tcp -p " << (12010 + num); properties->setProperty("ControlAdapter.Endpoints", os.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ControlAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("control")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("control")); adapter->activate(); if(num == 0) { properties->setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter"); - adapter2->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter2->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter2->activate(); } @@ -52,7 +52,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } properties->setProperty("McastTestAdapter.Endpoints", endpoint); Ice::ObjectAdapterPtr mcastAdapter = communicator->createObjectAdapter("McastTestAdapter"); - mcastAdapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + mcastAdapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); mcastAdapter->activate(); TEST_READY diff --git a/cpp/test/IceBox/configuration/Service.cpp b/cpp/test/IceBox/configuration/Service.cpp index ee1c1389aaf..2d369d3ef2c 100644 --- a/cpp/test/IceBox/configuration/Service.cpp +++ b/cpp/test/IceBox/configuration/Service.cpp @@ -54,7 +54,7 @@ void ServiceI::start(const string& name, const CommunicatorPtr& communicator, const StringSeq& args) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name + "OA"); - adapter->add(ICE_MAKE_SHARED(TestI, args), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestI, args), stringToIdentity("test")); adapter->activate(); } diff --git a/cpp/test/IceDiscovery/simple/Server.cpp b/cpp/test/IceDiscovery/simple/Server.cpp index 5b7660acd67..ef543fa090e 100644 --- a/cpp/test/IceDiscovery/simple/Server.cpp +++ b/cpp/test/IceDiscovery/simple/Server.cpp @@ -37,7 +37,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { ostringstream os; os << "controller" << num; - adapter->add(ICE_MAKE_SHARED(ControllerI), communicator->stringToIdentity(os.str())); + adapter->add(ICE_MAKE_SHARED(ControllerI), Ice::stringToIdentity(os.str())); } adapter->activate(); diff --git a/cpp/test/IceGrid/activation/Server.cpp b/cpp/test/IceGrid/activation/Server.cpp index 54b2aa418c1..e614fdaf02b 100644 --- a/cpp/test/IceGrid/activation/Server.cpp +++ b/cpp/test/IceGrid/activation/Server.cpp @@ -36,7 +36,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); TestI* test = new TestI(); Ice::ObjectPtr obj = test; - adapter->add(test, communicator()->stringToIdentity(properties->getProperty("Ice.Admin.ServerId"))); + adapter->add(test, Ice::stringToIdentity(properties->getProperty("Ice.Admin.ServerId"))); int delay = properties->getPropertyAsInt("ActivationDelay"); if(delay > 0) diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index 12473e73d3b..0a86f1011f3 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -192,7 +192,7 @@ public: os << "stress-" << IceUtilInternal::random(6) + 1; try { - return session->allocateObjectById(_communicator->stringToIdentity(os.str())); + return session->allocateObjectById(Ice::stringToIdentity(os.str())); } catch(const AllocationTimeoutException&) { @@ -227,7 +227,7 @@ public: CallbackPtr asyncCB = new Callback(); IceGrid::Callback_Session_allocateObjectByIdPtr cb = IceGrid::newCallback_Session_allocateObjectById(asyncCB, &Callback::response, &Callback::exception); - session->begin_allocateObjectById(_communicator->stringToIdentity(os.str()), cb); + session->begin_allocateObjectById(Ice::stringToIdentity(os.str()), cb); session->destroy(); } @@ -307,19 +307,19 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing allocate object by identity... " << flush; - Ice::Identity allocatable = communicator->stringToIdentity("allocatable"); - Ice::Identity allocatablebis = communicator->stringToIdentity("allocatablebis"); + Ice::Identity allocatable = Ice::stringToIdentity("allocatable"); + Ice::Identity allocatablebis = Ice::stringToIdentity("allocatablebis"); try { - session1->allocateObjectById(communicator->stringToIdentity("dummy")); + session1->allocateObjectById(Ice::stringToIdentity("dummy")); } catch(const ObjectNotRegisteredException&) { } try { - session1->releaseObject(communicator->stringToIdentity("dummy")); + session1->releaseObject(Ice::stringToIdentity("dummy")); } catch(const ObjectNotRegisteredException&) { @@ -327,7 +327,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - session1->allocateObjectById(communicator->stringToIdentity("nonallocatable")); + session1->allocateObjectById(Ice::stringToIdentity("nonallocatable")); test(false); } catch(const AllocationException&) @@ -340,7 +340,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - session2->allocateObjectById(communicator->stringToIdentity("nonallocatable")); + session2->allocateObjectById(Ice::stringToIdentity("nonallocatable")); test(false); } catch(const AllocationException&) @@ -353,7 +353,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - session1->releaseObject(communicator->stringToIdentity("nonallocatable")); + session1->releaseObject(Ice::stringToIdentity("nonallocatable")); test(false); } catch(const AllocationException&) @@ -366,7 +366,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - session2->releaseObject(communicator->stringToIdentity("nonallocatable")); + session2->releaseObject(Ice::stringToIdentity("nonallocatable")); test(false); } catch(const AllocationException&) @@ -642,8 +642,8 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->setAllocationTimeout(0); session2->setAllocationTimeout(0); - Ice::Identity allocatable3 = communicator->stringToIdentity("allocatable3"); - Ice::Identity allocatable4 = communicator->stringToIdentity("allocatable4"); + Ice::Identity allocatable3 = Ice::stringToIdentity("allocatable3"); + Ice::Identity allocatable4 = Ice::stringToIdentity("allocatable4"); session1->allocateObjectById(allocatable3); try @@ -777,8 +777,8 @@ allTests(const Ice::CommunicatorPtr& communicator) { } test(session1->allocateObjectByType("::TestMultipleByServer")); - session1->releaseObject(communicator->stringToIdentity("allocatable31")); - session1->releaseObject(communicator->stringToIdentity("allocatable41")); + session1->releaseObject(Ice::stringToIdentity("allocatable31")); + session1->releaseObject(Ice::stringToIdentity("allocatable41")); test(session2->allocateObjectByType("::TestMultipleByServer")); try { @@ -789,8 +789,8 @@ allTests(const Ice::CommunicatorPtr& communicator) { } test(session2->allocateObjectByType("::TestMultipleByServer")); - session2->releaseObject(communicator->stringToIdentity("allocatable31")); - session2->releaseObject(communicator->stringToIdentity("allocatable41")); + session2->releaseObject(Ice::stringToIdentity("allocatable31")); + session2->releaseObject(Ice::stringToIdentity("allocatable41")); Ice::ObjectPrx obj1 = session1->allocateObjectByType("::TestMultipleServer"); test(obj1); diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp index d39a9eb1dce..54fe5be7c01 100644 --- a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp +++ b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp @@ -30,7 +30,7 @@ public: virtual int run(int, char*[]) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("PermissionsVerifier"); - adapter->add(new PermissionsVerifierI, communicator()->stringToIdentity("PermissionsVerifier")); + adapter->add(new PermissionsVerifierI, Ice::stringToIdentity("PermissionsVerifier")); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/IceGrid/allocation/Server.cpp b/cpp/test/IceGrid/allocation/Server.cpp index 8e9931a3e91..113ccaa4846 100644 --- a/cpp/test/IceGrid/allocation/Server.cpp +++ b/cpp/test/IceGrid/allocation/Server.cpp @@ -32,16 +32,16 @@ Server::run(int argc, char* argv[]) string name = properties->getProperty("Ice.ProgramName"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("nonallocatable")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable1")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable2")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable3")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable4")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable11")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable21")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable31")); - adapter->add(new TestI(properties), communicator()->stringToIdentity("allocatable41")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable")); + adapter->add(new TestI(properties), Ice::stringToIdentity("nonallocatable")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable1")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable2")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable3")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable4")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable11")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable21")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable31")); + adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable41")); shutdownOnInterrupt(); try diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp index 47d984c302c..301692a25aa 100644 --- a/cpp/test/IceGrid/deployer/AllTests.cpp +++ b/cpp/test/IceGrid/deployer/AllTests.cpp @@ -68,7 +68,7 @@ public: bool operator()(const Ice::ObjectPrx& p1, const string& id) const { - return p1->ice_getIdentity() == _communicator->stringToIdentity(id); + return p1->ice_getIdentity() == Ice::stringToIdentity(id); } private: @@ -429,16 +429,16 @@ allTests(const Ice::CommunicatorPtr& comm) test(find_if(objs.begin(), objs.end(), bind2nd(ProxyIdentityEqual(comm),"ReplicatedObject")) != objs.end()); { - test(comm->identityToString(query->findObjectByType("::TestId1")->ice_getIdentity()) == "cat/name1"); - test(comm->identityToString(query->findObjectByType("::TestId2")->ice_getIdentity()) == "cat1/name1"); - test(comm->identityToString(query->findObjectByType("::TestId3")->ice_getIdentity()) == "cat1/name1-bis"); - test(comm->identityToString(query->findObjectByType("::TestId4")->ice_getIdentity()) == "c2\\/c2/n2\\/n2"); - test(comm->identityToString(query->findObjectByType("::TestId5")->ice_getIdentity()) == "n2\\/n2"); + test(identityToString(query->findObjectByType("::TestId1")->ice_getIdentity()) == "cat/name1"); + test(identityToString(query->findObjectByType("::TestId2")->ice_getIdentity()) == "cat1/name1"); + test(identityToString(query->findObjectByType("::TestId3")->ice_getIdentity()) == "cat1/name1-bis"); + test(identityToString(query->findObjectByType("::TestId4")->ice_getIdentity()) == "c2\\/c2/n2\\/n2"); + test(identityToString(query->findObjectByType("::TestId5")->ice_getIdentity()) == "n2\\/n2"); } { Ice::ObjectPrx obj = query->findObjectByType("::Test"); - string id = comm->identityToString(obj->ice_getIdentity()); + string id = identityToString(obj->ice_getIdentity()); test(id == "Server1" || id == "Server2" || id == "SimpleServer" || id == "IceBox1-Service1" || id == "IceBox1-Service2" || id == "IceBox2-Service1" || id == "IceBox2-Service2" || @@ -447,7 +447,7 @@ allTests(const Ice::CommunicatorPtr& comm) { Ice::ObjectPrx obj = query->findObjectByTypeOnLeastLoadedNode("::Test", LoadSample5); - string id = comm->identityToString(obj->ice_getIdentity()); + string id = identityToString(obj->ice_getIdentity()); test(id == "Server1" || id == "Server2" || id == "SimpleServer" || id == "IceBox1-Service1" || id == "IceBox1-Service2" || id == "IceBox2-Service1" || id == "IceBox2-Service2" || diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp index 42c9ebef1d2..5c5f6f821db 100644 --- a/cpp/test/IceGrid/deployer/Server.cpp +++ b/cpp/test/IceGrid/deployer/Server.cpp @@ -42,7 +42,7 @@ Server::run(int argc, char* argv[]) adapter = communicator()->createObjectAdapter("Server"); Ice::ObjectPtr object = new TestI(properties); - adapter->add(object, communicator()->stringToIdentity(name)); + adapter->add(object, Ice::stringToIdentity(name)); shutdownOnInterrupt(); try { diff --git a/cpp/test/IceGrid/deployer/Service.cpp b/cpp/test/IceGrid/deployer/Service.cpp index b9587ec1889..c5905ea722e 100644 --- a/cpp/test/IceGrid/deployer/Service.cpp +++ b/cpp/test/IceGrid/deployer/Service.cpp @@ -58,7 +58,7 @@ ServiceI::start(const string& name, Ice::PropertiesPtr properties = communicator->getProperties(); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); Ice::ObjectPtr object = new TestI(properties); - adapter->add(object, communicator->stringToIdentity(properties->getProperty(name + ".Identity"))); + adapter->add(object, stringToIdentity(properties->getProperty(name + ".Identity"))); adapter->activate(); } diff --git a/cpp/test/IceGrid/distribution/Server.cpp b/cpp/test/IceGrid/distribution/Server.cpp index 2d7f88df87d..c86e876bbf9 100644 --- a/cpp/test/IceGrid/distribution/Server.cpp +++ b/cpp/test/IceGrid/distribution/Server.cpp @@ -33,7 +33,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); Ice::ObjectPtr object = new TestI(properties); - adapter->add(object, communicator()->stringToIdentity(name)); + adapter->add(object, Ice::stringToIdentity(name)); shutdownOnInterrupt(); try diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp index 95f7ca1a58c..97a85507c05 100644 --- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp @@ -193,7 +193,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = true; addProperty(server, "Server.Endpoints", "default"); ObjectDescriptor object; - object.id = communicator->stringToIdentity("${server}"); + object.id = Ice::stringToIdentity("${server}"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -204,7 +204,7 @@ allTests(const Ice::CommunicatorPtr& communicator) update.nodes[0].servers[0]->id = "Server2"; update.nodes[0].servers[0]->adapters[0].id = "ServerAdapter2"; - update.nodes[0].servers[0]->adapters[0].objects[0].id = communicator->stringToIdentity("test2"); + update.nodes[0].servers[0]->adapters[0].objects[0].id = Ice::stringToIdentity("test2"); try { admin->updateApplicationWithoutRestart(update); @@ -240,7 +240,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = true; addProperty(server, "Server.Endpoints", "default"); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("${server}"); + object.id = Ice::stringToIdentity("${server}"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -456,7 +456,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(info.descriptor); test(info.descriptor->adapters.size() == 1); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("testfoo"); + object.id = Ice::stringToIdentity("testfoo"); info.descriptor->adapters[0].objects.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -478,7 +478,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -536,7 +536,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = false; adapter.serverLifetime = false; addProperty(service, "${service}.Endpoints", "default"); - object.id = communicator->stringToIdentity("${server}.${service}"); + object.id = Ice::stringToIdentity("${server}.${service}"); addProperty(service, "${service}.Identity", "${server}.${service}"); adapter.objects.push_back(object); service->adapters.push_back(adapter); diff --git a/cpp/test/IceGrid/noRestartUpdate/Server.cpp b/cpp/test/IceGrid/noRestartUpdate/Server.cpp index 492fe695d1c..ad1d3fa2ae9 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Server.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Server.cpp @@ -33,7 +33,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); Ice::ObjectPtr object = new TestI(adapter, properties); - adapter->add(object, communicator()->stringToIdentity(name)); + adapter->add(object, Ice::stringToIdentity(name)); shutdownOnInterrupt(); try diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp index b0f86c594e8..a07b62b74db 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp @@ -58,7 +58,7 @@ ServiceI::start(const string& name, Ice::PropertiesPtr properties = communicator->getProperties(); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); Ice::ObjectPtr object = new TestI(adapter, properties); - adapter->add(object, communicator->stringToIdentity(properties->getProperty(name + ".Identity"))); + adapter->add(object, stringToIdentity(properties->getProperty(name + ".Identity"))); adapter->activate(); } diff --git a/cpp/test/IceGrid/replicaGroup/Server.cpp b/cpp/test/IceGrid/replicaGroup/Server.cpp index bc3dcfa1a14..938c6ea3d11 100644 --- a/cpp/test/IceGrid/replicaGroup/Server.cpp +++ b/cpp/test/IceGrid/replicaGroup/Server.cpp @@ -26,8 +26,8 @@ Server::run(int, char**) Ice::ObjectAdapterPtr adpt = communicator()->createObjectAdapter("ReplicatedAdapter"); Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectPtr object = new TestI(properties); - adpt->add(object, communicator()->stringToIdentity(properties->getProperty("Ice.ProgramName"))); - adpt->add(object, communicator()->stringToIdentity(properties->getProperty("Identity"))); + adpt->add(object, Ice::stringToIdentity(properties->getProperty("Ice.ProgramName"))); + adpt->add(object, Ice::stringToIdentity(properties->getProperty("Identity"))); shutdownOnInterrupt(); try { diff --git a/cpp/test/IceGrid/replicaGroup/Service.cpp b/cpp/test/IceGrid/replicaGroup/Service.cpp index 7cf76382e6a..b87ab36faeb 100644 --- a/cpp/test/IceGrid/replicaGroup/Service.cpp +++ b/cpp/test/IceGrid/replicaGroup/Service.cpp @@ -57,8 +57,8 @@ ServiceI::start(const string& name, { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); Ice::ObjectPtr object = new TestI(communicator->getProperties()); - adapter->add(object, communicator->stringToIdentity(name)); - adapter->add(object, communicator->stringToIdentity(communicator->getProperties()->getProperty("Identity"))); + adapter->add(object, stringToIdentity(name)); + adapter->add(object, stringToIdentity(communicator->getProperties()->getProperty("Identity"))); adapter->activate(); } diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 09c197e612e..05a64cf0b27 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -314,17 +314,17 @@ allTests(const Ice::CommunicatorPtr& comm) Ice::EndpointSeq endpoints; ObjectInfo info; - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")); - ObjectInfo info1 = slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")); - test(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")) == info); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")); + ObjectInfo info1 = slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")); + test(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")) == info); test(info.type == Ice::Locator::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 2); test(endpoints[0]->toString().find("-p 12050") != string::npos); test(endpoints[1]->toString().find("-p 12051") != string::npos); - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")); - test(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")) == info); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")); + test(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")) == info); test(info.type == IceGrid::Query::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 2); @@ -334,15 +334,15 @@ allTests(const Ice::CommunicatorPtr& comm) admin->startServer("Slave2"); slave2Admin = createAdminSession(slave2Locator, "Slave2"); - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")); // We eventually need to wait here for the update of the replicated objects to propagate to the replica. int nRetry = 0; - while(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")) != info && nRetry < maxRetry) + while(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")) != info && nRetry < maxRetry) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(sleepTime)); ++nRetry; } - test(slave2Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")) == info); + test(slave2Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")) == info); test(info.type == Ice::Locator::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 3); @@ -350,15 +350,15 @@ allTests(const Ice::CommunicatorPtr& comm) test(endpoints[1]->toString().find("-p 12051") != string::npos); test(endpoints[2]->toString().find("-p 12052") != string::npos); - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")); // We eventually need to wait here for the update of the replicated objects to propagate to the replica. nRetry = 0; - while(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")) != info && nRetry < maxRetry) + while(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")) != info && nRetry < maxRetry) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(sleepTime)); ++nRetry; } - test(slave2Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")) == info); + test(slave2Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")) == info); test(info.type == IceGrid::Query::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 3); @@ -369,29 +369,29 @@ allTests(const Ice::CommunicatorPtr& comm) slave2Admin->shutdown(); waitForServerState(admin, "Slave2", false); - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")); // We eventually need to wait here for the update of the replicated objects to propagate to the replica. nRetry = 0; - while(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")) != info && nRetry < maxRetry) + while(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")) != info && nRetry < maxRetry) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(sleepTime)); ++nRetry; } - test(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Locator")) == info); + test(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Locator")) == info); test(info.type == Ice::Locator::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 2); test(endpoints[0]->toString().find("-p 12050") != string::npos); test(endpoints[1]->toString().find("-p 12051") != string::npos); - info = masterAdmin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")); + info = masterAdmin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")); nRetry = 0; - while(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")) != info && nRetry < maxRetry) + while(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")) != info && nRetry < maxRetry) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(sleepTime)); ++nRetry; } - test(slave1Admin->getObjectInfo(comm->stringToIdentity("RepTestIceGrid/Query")) == info); + test(slave1Admin->getObjectInfo(Ice::stringToIdentity("RepTestIceGrid/Query")) == info); test(info.type == IceGrid::Query::ice_staticId()); endpoints = info.proxy->ice_getEndpoints(); test(endpoints.size() == 2); @@ -948,7 +948,7 @@ allTests(const Ice::CommunicatorPtr& comm) property.value = "test"; server->propertySet.properties.push_back(property); ObjectDescriptor object; - object.id = comm->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -1175,7 +1175,7 @@ allTests(const Ice::CommunicatorPtr& comm) property.value = "test"; server->propertySet.properties.push_back(property); ObjectDescriptor object; - object.id = comm->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -1315,7 +1315,7 @@ allTests(const Ice::CommunicatorPtr& comm) property.value = "test"; server->propertySet.properties.push_back(property); ObjectDescriptor object; - object.id = comm->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); diff --git a/cpp/test/IceGrid/replication/Server.cpp b/cpp/test/IceGrid/replication/Server.cpp index 52126ea2c26..d4ade3c1c73 100644 --- a/cpp/test/IceGrid/replication/Server.cpp +++ b/cpp/test/IceGrid/replication/Server.cpp @@ -25,7 +25,7 @@ Server::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(); - adapter->add(object, communicator()->stringToIdentity(communicator()->getProperties()->getProperty("Identity"))); + adapter->add(object, Ice::stringToIdentity(communicator()->getProperties()->getProperty("Identity"))); shutdownOnInterrupt(); try { diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index bdd080a9ea0..e7f18c31519 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -269,7 +269,7 @@ public: Lock sync(*this); this->objects.erase(id); updated(updateSerial(0, "object removed `" + - current.adapter->getCommunicator()->identityToString(id) + "'")); + identityToString(id) + "'")); } int serial; @@ -1641,20 +1641,20 @@ allTests(const Ice::CommunicatorPtr& communicator) admin->addObjectWithType(obj, "::Dummy"); objectObs1->waitForUpdate(__FILE__, __LINE__); - test(objectObs1->objects.find(communicator->stringToIdentity("dummy")) != objectObs1->objects.end()); - test(objectObs1->objects[communicator->stringToIdentity("dummy")].type == "::Dummy"); - test(objectObs1->objects[communicator->stringToIdentity("dummy")].proxy == obj); + test(objectObs1->objects.find(Ice::stringToIdentity("dummy")) != objectObs1->objects.end()); + test(objectObs1->objects[Ice::stringToIdentity("dummy")].type == "::Dummy"); + test(objectObs1->objects[Ice::stringToIdentity("dummy")].proxy == obj); obj = communicator->stringToProxy("dummy:tcp -p 10000 -h localhost"); admin->updateObject(obj); objectObs1->waitForUpdate(__FILE__, __LINE__); - test(objectObs1->objects.find(communicator->stringToIdentity("dummy")) != objectObs1->objects.end()); - test(objectObs1->objects[communicator->stringToIdentity("dummy")].type == "::Dummy"); - test(objectObs1->objects[communicator->stringToIdentity("dummy")].proxy == obj); + test(objectObs1->objects.find(Ice::stringToIdentity("dummy")) != objectObs1->objects.end()); + test(objectObs1->objects[Ice::stringToIdentity("dummy")].type == "::Dummy"); + test(objectObs1->objects[Ice::stringToIdentity("dummy")].proxy == obj); admin->removeObject(obj->ice_getIdentity()); objectObs1->waitForUpdate(__FILE__, __LINE__); - test(objectObs1->objects.find(communicator->stringToIdentity("dummy")) == objectObs1->objects.end()); + test(objectObs1->objects.find(Ice::stringToIdentity("dummy")) == objectObs1->objects.end()); } catch(const Ice::UserException& ex) { diff --git a/cpp/test/IceGrid/session/PermissionsVerifier.cpp b/cpp/test/IceGrid/session/PermissionsVerifier.cpp index f2971f5309d..ec8444d7f00 100644 --- a/cpp/test/IceGrid/session/PermissionsVerifier.cpp +++ b/cpp/test/IceGrid/session/PermissionsVerifier.cpp @@ -43,7 +43,7 @@ public: { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints( "PermissionsVerifier", "tcp -p 12002"); - adapter->add(new AdminPermissionsVerifierI, communicator()->stringToIdentity("AdminPermissionsVerifier")); + adapter->add(new AdminPermissionsVerifierI, Ice::stringToIdentity("AdminPermissionsVerifier")); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp index 86abe1afd38..e118744af53 100644 --- a/cpp/test/IceGrid/session/Server.cpp +++ b/cpp/test/IceGrid/session/Server.cpp @@ -66,8 +66,8 @@ Server::run(int, char**) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); if(communicator()->getProperties()->getPropertyAsInt("AddPermissionsVerifiers") > 0) { - adapter->add(new ClientPermissionsVerifierI(), communicator()->stringToIdentity("ClientPermissionsVerifier")); - adapter->add(new SSLPermissionsVerifierI(), communicator()->stringToIdentity("SSLPermissionsVerifier")); + adapter->add(new ClientPermissionsVerifierI(), Ice::stringToIdentity("ClientPermissionsVerifier")); + adapter->add(new SSLPermissionsVerifierI(), Ice::stringToIdentity("SSLPermissionsVerifier")); } adapter->activate(); diff --git a/cpp/test/IceGrid/simple/Server.cpp b/cpp/test/IceGrid/simple/Server.cpp index 5bc7aa01d69..1ba08e9b8af 100644 --- a/cpp/test/IceGrid/simple/Server.cpp +++ b/cpp/test/IceGrid/simple/Server.cpp @@ -30,7 +30,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(); string id = communicator()->getProperties()->getPropertyWithDefault("Identity", "test"); - adapter->add(object, communicator()->stringToIdentity(id)); + adapter->add(object, Ice::stringToIdentity(id)); shutdownOnInterrupt(); try diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index 9512d42b4c3..67653d1252c 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -106,7 +106,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; addProperty(server, "Server.Endpoints", "default"); ObjectDescriptor object; - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -145,7 +145,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(false); } - update.nodes[0].servers[0]->adapters[0].objects[0].id = communicator->stringToIdentity("test2"); + update.nodes[0].servers[0]->adapters[0].objects[0].id = Ice::stringToIdentity("test2"); try { admin->updateApplication(update); @@ -173,7 +173,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; addProperty(server, "Server.Endpoints", "default"); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("${server}"); + object.id = Ice::stringToIdentity("${server}"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -400,7 +400,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; adapter.registerProcess = false; object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); adapter.objects.push_back(object); info.descriptor->adapters.push_back(adapter); update = empty; @@ -423,7 +423,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].objects.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -445,7 +445,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test1"); + object.id = Ice::stringToIdentity("test1"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -463,7 +463,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test1"); + object.id = Ice::stringToIdentity("test1"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -485,7 +485,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -503,7 +503,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); diff --git a/cpp/test/IceGrid/update/Server.cpp b/cpp/test/IceGrid/update/Server.cpp index 2d7f88df87d..c86e876bbf9 100644 --- a/cpp/test/IceGrid/update/Server.cpp +++ b/cpp/test/IceGrid/update/Server.cpp @@ -33,7 +33,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); Ice::ObjectPtr object = new TestI(properties); - adapter->add(object, communicator()->stringToIdentity(name)); + adapter->add(object, Ice::stringToIdentity(name)); shutdownOnInterrupt(); try diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index d2006021028..44c76dc5cb5 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("factory"); + Ice::Identity id = Ice::stringToIdentity("factory"); adapter->add(ICE_MAKE_SHARED(ServerFactoryI), id); adapter->activate(); TEST_READY diff --git a/cpp/test/IceStorm/rep1/Sub.cpp b/cpp/test/IceStorm/rep1/Sub.cpp index 30e5cc4a22a..5192f61e548 100644 --- a/cpp/test/IceStorm/rep1/Sub.cpp +++ b/cpp/test/IceStorm/rep1/Sub.cpp @@ -74,7 +74,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) return EXIT_FAILURE; } - Ice::ObjectPrx prx = adapter->add(new SingleI(), communicator->stringToIdentity(opts.optArg("id"))); + Ice::ObjectPrx prx = adapter->add(new SingleI(), stringToIdentity(opts.optArg("id"))); if(opts.isSet("unsub")) { topic->unsubscribe(prx); diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index 0696a6e2edb..87f1556485b 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -172,12 +172,12 @@ run(const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(charI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(charI), Ice::stringToIdentity("test")); adapter->activate(); cout << "Testing operation name... " << flush; _cpp_and::charPrxPtr p = ICE_UNCHECKED_CAST(_cpp_and::charPrx, - adapter->createProxy(communicator->stringToIdentity("test"))); + adapter->createProxy(Ice::stringToIdentity("test"))); p->_cpp_explicit(); cout << "ok" << endl; diff --git a/csharp/src/Ice/CommunicatorI.cs b/csharp/src/Ice/CommunicatorI.cs index e2e1f0015f4..dade480ecc5 100644 --- a/csharp/src/Ice/CommunicatorI.cs +++ b/csharp/src/Ice/CommunicatorI.cs @@ -60,12 +60,12 @@ namespace Ice public Ice.Identity stringToIdentity(string s) { - return instance_.stringToIdentity(s); + return Ice.Util.stringToIdentity(s); } public string identityToString(Ice.Identity ident) { - return instance_.identityToString(ident); + return Ice.Util.identityToString(ident); } public ObjectAdapter createObjectAdapter(string name) diff --git a/csharp/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs index 47d892986af..4fdf734e0b6 100644 --- a/csharp/src/Ice/Incoming.cs +++ b/csharp/src/Ice/Incoming.cs @@ -222,7 +222,7 @@ namespace IceInternal IceUtilInternal.OutputBase output = new IceUtilInternal.OutputBase(sw); output.setUseTab(false); output.print("dispatch exception:"); - output.print("\nidentity: " + instance_.identityToString(current_.id)); + output.print("\nidentity: " + Ice.Util.identityToString(current_.id)); output.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(current_.facet, "")); output.print("\noperation: " + current_.operation); if(current_.con != null) diff --git a/csharp/src/Ice/Instance.cs b/csharp/src/Ice/Instance.cs index 09d3a9a83b1..2f910483385 100644 --- a/csharp/src/Ice/Instance.cs +++ b/csharp/src/Ice/Instance.cs @@ -359,17 +359,6 @@ namespace IceInternal return _implicitContext; } - public Ice.Identity stringToIdentity(string s) - { - return Ice.Util.stringToIdentity(s); - } - - public string identityToString(Ice.Identity ident) - { - return Ice.Util.identityToString(ident); - } - - public Ice.ObjectPrx createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity) { diff --git a/csharp/src/Ice/InstrumentationI.cs b/csharp/src/Ice/InstrumentationI.cs index 3eca65b7ed6..a6d733af7fe 100644 --- a/csharp/src/Ice/InstrumentationI.cs +++ b/csharp/src/Ice/InstrumentationI.cs @@ -395,7 +395,7 @@ namespace IceInternal public string getIdentity() { - return _current.adapter.getCommunicator().identityToString(_current.id); + return Ice.Util.identityToString(_current.id); } readonly private Ice.Current _current; @@ -500,7 +500,7 @@ namespace IceInternal catch(Ice.Exception) { // Either a fixed proxy or the communicator is destroyed. - os.Append(_proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity())); + os.Append(Ice.Util.identityToString(_proxy.ice_getIdentity())); os.Append(" [").Append(_operation).Append(']'); } _id = os.ToString(); @@ -532,7 +532,7 @@ namespace IceInternal { if(_proxy != null) { - return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity()); + return Ice.Util.identityToString(_proxy.ice_getIdentity()); } else { diff --git a/csharp/src/Ice/LocatorInfo.cs b/csharp/src/Ice/LocatorInfo.cs index 92497315fa1..01c064b9f4e 100644 --- a/csharp/src/Ice/LocatorInfo.cs +++ b/csharp/src/Ice/LocatorInfo.cs @@ -523,7 +523,7 @@ namespace IceInternal } else { - s.Append("object = " + r.getInstance().identityToString(r.getIdentity()) + "\n"); + s.Append("object = " + Ice.Util.identityToString(r.getIdentity()) + "\n"); } s.Append("endpoints = "); @@ -569,13 +569,13 @@ namespace IceInternal { System.Text.StringBuilder s = new System.Text.StringBuilder(); s.Append("object not found\n"); - s.Append("object = " + instance.identityToString(@ref.getIdentity())); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } Ice.NotRegisteredException e = new Ice.NotRegisteredException(ex); e.kindOfObject = "object"; - e.id = instance.identityToString(@ref.getIdentity()); + e.id = Ice.Util.identityToString(@ref.getIdentity()); throw e; } catch(Ice.NotRegisteredException) @@ -595,7 +595,7 @@ namespace IceInternal } else { - s.Append("object = " + instance.identityToString(@ref.getIdentity()) + "\n"); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity()) + "\n"); } s.Append("reason = " + ex); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); @@ -634,7 +634,7 @@ namespace IceInternal else { s.Append("object\n"); - s.Append("object = " + instance.identityToString(@ref.getIdentity())); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity())); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } @@ -674,7 +674,7 @@ namespace IceInternal Instance instance = @ref.getInstance(); System.Text.StringBuilder s = new System.Text.StringBuilder(); s.Append("searching for object by id\nobject = "); - s.Append(instance.identityToString(@ref.getIdentity())); + s.Append(Ice.Util.identityToString(@ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs index 50bdc56ad33..03c3ff6333e 100644 --- a/csharp/src/Ice/ObjectAdapterI.cs +++ b/csharp/src/Ice/ObjectAdapterI.cs @@ -926,7 +926,7 @@ namespace Ice { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); ex.kindOfObject = "object adapter with router"; - ex.id = instance_.identityToString(router.ice_getIdentity()); + ex.id = Ice.Util.identityToString(router.ice_getIdentity()); throw ex; } diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs index 5b827fc0935..37644c85a6e 100644 --- a/csharp/src/Ice/Reference.cs +++ b/csharp/src/Ice/Reference.cs @@ -295,7 +295,7 @@ namespace IceInternal // the reference parser uses as separators, then we enclose // the identity string in quotes. // - string id = instance_.identityToString(identity_); + string id = Ice.Util.identityToString(identity_); if(IceUtilInternal.StringUtil.findFirstOf(id, " :@") != -1) { s.Append('"'); diff --git a/csharp/src/Ice/ReferenceFactory.cs b/csharp/src/Ice/ReferenceFactory.cs index 0bbdbc5a23c..1e106659258 100644 --- a/csharp/src/Ice/ReferenceFactory.cs +++ b/csharp/src/Ice/ReferenceFactory.cs @@ -134,7 +134,7 @@ namespace IceInternal // // Parsing the identity may raise IdentityParseException. // - Ice.Identity ident = instance_.stringToIdentity(idstr); + Ice.Identity ident = Ice.Util.stringToIdentity(idstr); if(ident.name.Length == 0) { diff --git a/csharp/src/Ice/ServantManager.cs b/csharp/src/Ice/ServantManager.cs index d1f5353d54c..a369af5ef1d 100644 --- a/csharp/src/Ice/ServantManager.cs +++ b/csharp/src/Ice/ServantManager.cs @@ -37,7 +37,7 @@ public sealed class ServantManager if(m.ContainsKey(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = instance_.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.Length > 0) { diff --git a/csharp/src/Ice/TraceUtil.cs b/csharp/src/Ice/TraceUtil.cs index e191dfe7e05..f815b712473 100644 --- a/csharp/src/Ice/TraceUtil.cs +++ b/csharp/src/Ice/TraceUtil.cs @@ -177,7 +177,7 @@ namespace IceInternal { Ice.Identity identity = new Ice.Identity(); identity.read__(str); - s.Write("\nidentity = " + str.instance().identityToString(identity)); + s.Write("\nidentity = " + Ice.Util.identityToString(identity)); string[] facet = str.readStringSeq(); s.Write("\nfacet = "); diff --git a/csharp/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs index 2ec46a07d96..740256af9fd 100644 --- a/csharp/src/IceDiscovery/PluginI.cs +++ b/csharp/src/IceDiscovery/PluginI.cs @@ -115,7 +115,7 @@ namespace IceDiscovery // Add lookup and lookup reply Ice objects // LookupI lookup = new LookupI(locatorRegistry, LookupPrxHelper.uncheckedCast(lookupPrx), properties); - _multicastAdapter.add(lookup, _communicator.stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter.add(lookup, Ice.Util.stringToIdentity("IceDiscovery/Lookup")); Ice.ObjectPrx lookupReply = _replyAdapter.addWithUUID(new LookupReplyI(lookup)).ice_datagram(); lookup.setLookupReply(LookupReplyPrxHelper.uncheckedCast(lookupReply)); diff --git a/csharp/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs index 064fcdccfb8..a767709c22c 100644 --- a/csharp/test/Glacier2/router/Client.cs +++ b/csharp/test/Glacier2/router/Client.cs @@ -284,7 +284,7 @@ public class Client Dictionary<string, string> context = new Dictionary<string, string>(); context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c2/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); Console.Out.WriteLine("ok"); @@ -298,7 +298,7 @@ public class Client try { CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c3/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); test(false); } @@ -314,7 +314,7 @@ public class Client Dictionary<string, string> context = new Dictionary<string, string>(); context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("_userid/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); Console.Out.WriteLine("ok"); diff --git a/csharp/test/Glacier2/router/Server.cs b/csharp/test/Glacier2/router/Server.cs index 78312e1fbcf..4f8ae5a9e1c 100644 --- a/csharp/test/Glacier2/router/Server.cs +++ b/csharp/test/Glacier2/router/Server.cs @@ -26,13 +26,13 @@ public class Server communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), - communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. + Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c2/callback")); // The test allows "c2" as category. + Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c3/callback")); // The test rejects "c3" as category. + Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("_userid/callback")); // The test allows the prefixed userid. + Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid. adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/csharp/test/Glacier2/sessionHelper/Server.cs b/csharp/test/Glacier2/sessionHelper/Server.cs index c35bd550b28..0b518572cbf 100644 --- a/csharp/test/Glacier2/sessionHelper/Server.cs +++ b/csharp/test/Glacier2/sessionHelper/Server.cs @@ -27,7 +27,7 @@ public class Server communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); - adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); + adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/csharp/test/Ice/acm/Server.cs b/csharp/test/Ice/acm/Server.cs index b833ebccce9..1482464c5cb 100644 --- a/csharp/test/Ice/acm/Server.cs +++ b/csharp/test/Ice/acm/Server.cs @@ -24,7 +24,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/csharp/test/Ice/acm/TestI.cs b/csharp/test/Ice/acm/TestI.cs index f44180bbf82..0dd3455daf7 100644 --- a/csharp/test/Ice/acm/TestI.cs +++ b/csharp/test/Ice/acm/TestI.cs @@ -50,7 +50,7 @@ public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_ { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/csharp/test/Ice/admin/AllTests.cs b/csharp/test/Ice/admin/AllTests.cs index 6e1efb732eb..198232d96ec 100644 --- a/csharp/test/Ice/admin/AllTests.cs +++ b/csharp/test/Ice/admin/AllTests.cs @@ -138,7 +138,7 @@ public class AllTests : TestCommon.TestApp init.properties.setProperty("Ice.Admin.Enabled", "1"); Ice.Communicator com = Ice.Util.initialize(init); test(com.getAdmin() == null); - Ice.Identity id = com.stringToIdentity("test-admin"); + Ice.Identity id = Ice.Util.stringToIdentity("test-admin"); try { com.createAdmin(null, id); diff --git a/csharp/test/Ice/admin/Server.cs b/csharp/test/Ice/admin/Server.cs index 43680df866e..048d076412c 100644 --- a/csharp/test/Ice/admin/Server.cs +++ b/csharp/test/Ice/admin/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new RemoteCommunicatorFactoryI(), id); adapter.activate(); diff --git a/csharp/test/Ice/ami/Collocated.cs b/csharp/test/Ice/ami/Collocated.cs index 580ed4c1c09..0627679d450 100644 --- a/csharp/test/Ice/ami/Collocated.cs +++ b/csharp/test/Ice/ami/Collocated.cs @@ -27,9 +27,9 @@ public class Collocated Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Collocated test doesn't need to activate the OA - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Collocated test doesn't need to activate the OA AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/ami/Server.cs b/csharp/test/Ice/ami/Server.cs index 7c29d688946..db75ec934e8 100644 --- a/csharp/test/Ice/ami/Server.cs +++ b/csharp/test/Ice/ami/Server.cs @@ -27,9 +27,9 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/background/Server.cs b/csharp/test/Ice/background/Server.cs index fa302ba146d..0ced20a0176 100644 --- a/csharp/test/Ice/background/Server.cs +++ b/csharp/test/Ice/background/Server.cs @@ -27,7 +27,7 @@ public class Server { _controller.checkCallPause(current); Ice.Communicator communicator = current.adapter.getCommunicator(); - response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); + response(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy"))); } public override void @@ -100,12 +100,12 @@ public class Server BackgroundControllerI backgroundController = new BackgroundControllerI(adapter); - adapter.add(new BackgroundI(backgroundController), communicator.stringToIdentity("background")); - adapter.add(new LocatorI(backgroundController), communicator.stringToIdentity("locator")); - adapter.add(new RouterI(backgroundController), communicator.stringToIdentity("router")); + adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background")); + adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator")); + adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router")); adapter.activate(); - adapter2.add(backgroundController, communicator.stringToIdentity("backgroundController")); + adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/binding/AllTests.cs b/csharp/test/Ice/binding/AllTests.cs index e064321f7cb..5ccfa828986 100644 --- a/csharp/test/Ice/binding/AllTests.cs +++ b/csharp/test/Ice/binding/AllTests.cs @@ -893,7 +893,7 @@ public class AllTests : TestCommon.TestApp continue; // IP version not supported. } - Ice.ObjectPrx prx = oa.createProxy(serverCommunicator.stringToIdentity("dummy")); + Ice.ObjectPrx prx = oa.createProxy(Ice.Util.stringToIdentity("dummy")); try { prx.ice_collocationOptimized(false).ice_ping(); diff --git a/csharp/test/Ice/binding/RemoteObjectAdapterI.cs b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs index 3b7b500422d..f4b054f0f9a 100644 --- a/csharp/test/Ice/binding/RemoteObjectAdapterI.cs +++ b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs @@ -15,7 +15,7 @@ public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_ { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/csharp/test/Ice/binding/Server.cs b/csharp/test/Ice/binding/Server.cs index d1d5df94367..f427698fbd3 100644 --- a/csharp/test/Ice/binding/Server.cs +++ b/csharp/test/Ice/binding/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/csharp/test/Ice/checksum/server/Server.cs b/csharp/test/Ice/checksum/server/Server.cs index a06e801cb97..50cde4c714f 100644 --- a/csharp/test/Ice/checksum/server/Server.cs +++ b/csharp/test/Ice/checksum/server/Server.cs @@ -16,7 +16,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new Test.ChecksumI(); - adapter.add(@object, communicator.stringToIdentity("test")); + adapter.add(@object, Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/dictMapping/Collocated.cs b/csharp/test/Ice/dictMapping/Collocated.cs index a6b640699b3..d2edaf61525 100644 --- a/csharp/test/Ice/dictMapping/Collocated.cs +++ b/csharp/test/Ice/dictMapping/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/dictMapping/Server.cs b/csharp/test/Ice/dictMapping/Server.cs index c43e83854d8..e1485f81a45 100644 --- a/csharp/test/Ice/dictMapping/Server.cs +++ b/csharp/test/Ice/dictMapping/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/dispatcher/Collocated.cs b/csharp/test/Ice/dispatcher/Collocated.cs index 583795d3367..ae25fc29faf 100644 --- a/csharp/test/Ice/dispatcher/Collocated.cs +++ b/csharp/test/Ice/dispatcher/Collocated.cs @@ -27,9 +27,9 @@ public class Collocated Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator); diff --git a/csharp/test/Ice/dispatcher/Server.cs b/csharp/test/Ice/dispatcher/Server.cs index 82ceaa711c6..f0f87059499 100644 --- a/csharp/test/Ice/dispatcher/Server.cs +++ b/csharp/test/Ice/dispatcher/Server.cs @@ -27,9 +27,9 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/echo/Server.cs b/csharp/test/Ice/echo/Server.cs index 3d717db85b9..28cd7d37aaa 100644 --- a/csharp/test/Ice/echo/Server.cs +++ b/csharp/test/Ice/echo/Server.cs @@ -49,7 +49,7 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); BlobjectI blob = new BlobjectI(); adapter.addDefaultServant(blob, ""); - adapter.add(new EchoI(blob), communicator.stringToIdentity("__echo")); + adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/enums/Server.cs b/csharp/test/Ice/enums/Server.cs index 1612c8c6814..8a34cfd5a48 100644 --- a/csharp/test/Ice/enums/Server.cs +++ b/csharp/test/Ice/enums/Server.cs @@ -25,7 +25,7 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/exceptions/AllTests.cs b/csharp/test/Ice/exceptions/AllTests.cs index b1a1a14a922..ab9b1a9ee6f 100644 --- a/csharp/test/Ice/exceptions/AllTests.cs +++ b/csharp/test/Ice/exceptions/AllTests.cs @@ -98,10 +98,10 @@ public class AllTests : TestCommon.TestApp communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); try { - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.AlreadyRegisteredException) @@ -110,7 +110,7 @@ public class AllTests : TestCommon.TestApp try { - adapter.add(obj, communicator.stringToIdentity("")); + adapter.add(obj, Ice.Util.stringToIdentity("")); test(false); } catch(Ice.IllegalIdentityException e) @@ -120,17 +120,17 @@ public class AllTests : TestCommon.TestApp try { - adapter.add(null, communicator.stringToIdentity("x")); + adapter.add(null, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.IllegalServantException) { } - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); try { - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.NotRegisteredException) @@ -456,7 +456,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); try { ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); @@ -908,7 +908,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback cb = new Callback(); thrower2.begin_throwAasA(1).whenCompleted( @@ -1179,7 +1179,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback cb = new Callback(); thrower2.begin_throwAasA(1).whenCompleted( diff --git a/csharp/test/Ice/exceptions/Collocated.cs b/csharp/test/Ice/exceptions/Collocated.cs index 9a391f35513..f5b4787dc7a 100644 --- a/csharp/test/Ice/exceptions/Collocated.cs +++ b/csharp/test/Ice/exceptions/Collocated.cs @@ -23,7 +23,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new ThrowerI(); - adapter.add(obj, communicator.stringToIdentity("thrower")); + adapter.add(obj, Ice.Util.stringToIdentity("thrower")); AllTests.allTests(communicator); return 0; } diff --git a/csharp/test/Ice/exceptions/Server.cs b/csharp/test/Ice/exceptions/Server.cs index 0b8885256a4..a8af5586552 100644 --- a/csharp/test/Ice/exceptions/Server.cs +++ b/csharp/test/Ice/exceptions/Server.cs @@ -53,9 +53,9 @@ public class Server Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object obj = new ThrowerI(); - adapter.add(obj, communicator.stringToIdentity("thrower")); - adapter2.add(obj, communicator.stringToIdentity("thrower")); - adapter3.add(obj, communicator.stringToIdentity("thrower")); + adapter.add(obj, Ice.Util.stringToIdentity("thrower")); + adapter2.add(obj, Ice.Util.stringToIdentity("thrower")); + adapter3.add(obj, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/csharp/test/Ice/facets/AllTests.cs b/csharp/test/Ice/facets/AllTests.cs index d32bd75bd47..d0f94544531 100644 --- a/csharp/test/Ice/facets/AllTests.cs +++ b/csharp/test/Ice/facets/AllTests.cs @@ -42,20 +42,20 @@ public class AllTests : TestCommon.TestApp communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("d")); - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(obj, Ice.Util.stringToIdentity("d")); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.AlreadyRegisteredException) { } - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.NotRegisteredException) @@ -66,26 +66,26 @@ public class AllTests : TestCommon.TestApp Write("testing removeAllFacets... "); Ice.Object obj1 = new EmptyI(); Ice.Object obj2 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2"); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2"); Ice.Object obj3 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2"); - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), ""); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2"); + adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), ""); Dictionary<string, Ice.Object> fm - = adapter.removeAllFacets(communicator.stringToIdentity("id1")); + = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(fm.Count == 2); test(fm["f1"] == obj1); test(fm["f2"] == obj2); try { - adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(false); } catch(Ice.NotRegisteredException) { } - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")); + fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2")); test(fm.Count == 3); test(fm["f1"] == obj1); test(fm["f2"] == obj2); diff --git a/csharp/test/Ice/facets/Collocated.cs b/csharp/test/Ice/facets/Collocated.cs index 8cdd1772075..5d8c3f63257 100644 --- a/csharp/test/Ice/facets/Collocated.cs +++ b/csharp/test/Ice/facets/Collocated.cs @@ -23,12 +23,12 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); AllTests.allTests(communicator); diff --git a/csharp/test/Ice/facets/Server.cs b/csharp/test/Ice/facets/Server.cs index 74fe1ad5ece..63d297d9e8b 100644 --- a/csharp/test/Ice/facets/Server.cs +++ b/csharp/test/Ice/facets/Server.cs @@ -23,12 +23,12 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/faultTolerance/Server.cs b/csharp/test/Ice/faultTolerance/Server.cs index 97f0e735174..57101bf3edf 100644 --- a/csharp/test/Ice/faultTolerance/Server.cs +++ b/csharp/test/Ice/faultTolerance/Server.cs @@ -64,7 +64,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("test")); + adapter.add(obj, Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/hold/Server.cs b/csharp/test/Ice/hold/Server.cs index 495ad52658a..1b3ad90b04b 100644 --- a/csharp/test/Ice/hold/Server.cs +++ b/csharp/test/Ice/hold/Server.cs @@ -28,7 +28,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0"); Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1"); - adapter1.add(new HoldI(timer, adapter1), communicator.stringToIdentity("hold")); + adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold")); communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5"); @@ -36,7 +36,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); - adapter2.add(new HoldI(timer, adapter2), communicator.stringToIdentity("hold")); + adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold")); adapter1.activate(); adapter2.activate(); diff --git a/csharp/test/Ice/info/Server.cs b/csharp/test/Ice/info/Server.cs index fc3fb6f7116..82b0a7d08ef 100644 --- a/csharp/test/Ice/info/Server.cs +++ b/csharp/test/Ice/info/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs index 779da94a22d..ab0cfc4951f 100644 --- a/csharp/test/Ice/inheritance/Collocated.cs +++ b/csharp/test/Ice/inheritance/Collocated.cs @@ -24,7 +24,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); - adapter.add(obj, communicator.stringToIdentity("initial")); + adapter.add(obj, Ice.Util.stringToIdentity("initial")); AllTests.allTests(communicator); return 0; } diff --git a/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs index 17129734766..d4988c372b9 100644 --- a/csharp/test/Ice/inheritance/Server.cs +++ b/csharp/test/Ice/inheritance/Server.cs @@ -23,7 +23,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); - adapter.add(@object, communicator.stringToIdentity("initial")); + adapter.add(@object, Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/location/AllTests.cs b/csharp/test/Ice/location/AllTests.cs index 129737c3073..707520b4e36 100644 --- a/csharp/test/Ice/location/AllTests.cs +++ b/csharp/test/Ice/location/AllTests.cs @@ -603,7 +603,7 @@ public class AllTests : TestCommon.TestApp adapter.activate(); HelloPrx helloPrx = HelloPrxHelper.checkedCast( - communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); + communicator.stringToProxy("\"" + Ice.Util.identityToString(id) + "\"")); test(helloPrx.ice_getConnection() == null); adapter.deactivate(); diff --git a/csharp/test/Ice/location/Server.cs b/csharp/test/Ice/location/Server.cs index 279acfb5192..902f536f7f5 100644 --- a/csharp/test/Ice/location/Server.cs +++ b/csharp/test/Ice/location/Server.cs @@ -39,13 +39,13 @@ public class Server // ServerLocatorRegistry registry = new ServerLocatorRegistry(); Ice.Object @object = new ServerManagerI(registry, initData); - adapter.add(@object, communicator.stringToIdentity("ServerManager")); - registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager"))); + adapter.add(@object, Ice.Util.stringToIdentity("ServerManager")); + registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager"))); Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast( - adapter.add(registry, communicator.stringToIdentity("registry"))); + adapter.add(registry, Ice.Util.stringToIdentity("registry"))); ServerLocator locator = new ServerLocator(registry, registryPrx); - adapter.add(locator, communicator.stringToIdentity("locator")); + adapter.add(locator, Ice.Util.stringToIdentity("locator")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/location/ServerManagerI.cs b/csharp/test/Ice/location/ServerManagerI.cs index 27d82f0d55f..3e5458e43ac 100644 --- a/csharp/test/Ice/location/ServerManagerI.cs +++ b/csharp/test/Ice/location/ServerManagerI.cs @@ -58,9 +58,9 @@ public class ServerManagerI : ServerManagerDisp_ adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); Ice.Object @object = new TestI(adapter, adapter2, _registry); - _registry.addObject(adapter.add(@object, serverCommunicator.stringToIdentity("test"))); - _registry.addObject(adapter.add(@object, serverCommunicator.stringToIdentity("test2"))); - adapter.add(@object, serverCommunicator.stringToIdentity("test3")); + _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test"))); + _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test2"))); + adapter.add(@object, Ice.Util.stringToIdentity("test3")); adapter.activate(); adapter2.activate(); diff --git a/csharp/test/Ice/location/TestI.cs b/csharp/test/Ice/location/TestI.cs index 665afb4bcc8..685fb0347fe 100644 --- a/csharp/test/Ice/location/TestI.cs +++ b/csharp/test/Ice/location/TestI.cs @@ -17,7 +17,7 @@ public class TestI : TestIntfDisp_ _adapter2 = adapter2; _registry = registry; - _registry.addObject(_adapter1.add(new HelloI(), adapter1.getCommunicator().stringToIdentity("hello"))); + _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello"))); } public override void shutdown(Ice.Current current) @@ -28,18 +28,18 @@ public class TestI : TestIntfDisp_ public override HelloPrx getHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } public override HelloPrx getReplicatedHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } public override void migrateHello(Ice.Current current) { - Ice.Identity id = _adapter1.getCommunicator().stringToIdentity("hello"); + Ice.Identity id = Ice.Util.stringToIdentity("hello"); try { _registry.addObject(_adapter2.add(_adapter1.remove(id), id)); diff --git a/csharp/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs index a89d462bf07..4d7c5ed6a6e 100644 --- a/csharp/test/Ice/metrics/Collocated.cs +++ b/csharp/test/Ice/metrics/Collocated.cs @@ -22,12 +22,12 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); //adapter.activate(); // Don't activate OA to ensure collocation is used. communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used. Test.MetricsPrx metrics = AllTests.allTests(communicator, _observer); diff --git a/csharp/test/Ice/metrics/Server.cs b/csharp/test/Ice/metrics/Server.cs index e969f4b8cfa..d76fbd4c8cf 100644 --- a/csharp/test/Ice/metrics/Server.cs +++ b/csharp/test/Ice/metrics/Server.cs @@ -22,12 +22,12 @@ public class Server public static int run(string[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/networkProxy/Server.cs b/csharp/test/Ice/networkProxy/Server.cs index ca2511d8e43..59d35c7831a 100644 --- a/csharp/test/Ice/networkProxy/Server.cs +++ b/csharp/test/Ice/networkProxy/Server.cs @@ -30,7 +30,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/objects/Collocated.cs b/csharp/test/Ice/objects/Collocated.cs index d401a85e47f..a18cbdba27f 100644 --- a/csharp/test/Ice/objects/Collocated.cs +++ b/csharp/test/Ice/objects/Collocated.cs @@ -24,9 +24,9 @@ public class Client communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); - adapter.add(initial, communicator.stringToIdentity("initial")); + adapter.add(initial, Ice.Util.stringToIdentity("initial")); UnexpectedObjectExceptionTestI uet = new UnexpectedObjectExceptionTestI(); - adapter.add(uet, communicator.stringToIdentity("uoet")); + adapter.add(uet, Ice.Util.stringToIdentity("uoet")); AllTests.allTests(communicator); // We must call shutdown even in the collocated case for cyclic dependency cleanup initial.shutdown(); diff --git a/csharp/test/Ice/objects/Server.cs b/csharp/test/Ice/objects/Server.cs index 494f9c300d1..58a5a7962b5 100644 --- a/csharp/test/Ice/objects/Server.cs +++ b/csharp/test/Ice/objects/Server.cs @@ -46,9 +46,9 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); - adapter.add(@object, communicator.stringToIdentity("initial")); + adapter.add(@object, Ice.Util.stringToIdentity("initial")); @object = new UnexpectedObjectExceptionTestI(); - adapter.add(@object, communicator.stringToIdentity("uoet")); + adapter.add(@object, Ice.Util.stringToIdentity("uoet")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/operations/Collocated.cs b/csharp/test/Ice/operations/Collocated.cs index d4c195517b4..91a9f66514e 100644 --- a/csharp/test/Ice/operations/Collocated.cs +++ b/csharp/test/Ice/operations/Collocated.cs @@ -23,7 +23,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.AdapterId", "test"); communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. if(prx.ice_getConnection() != null) diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs index 2b3ff2af6b8..cbaee32685b 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs @@ -314,7 +314,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { var p2 = p1; var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); response(new MyClass_OpMyClassResult( MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs index 3a7655e5878..bdba0cd1a3f 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs @@ -265,7 +265,7 @@ public sealed class MyDerivedClassTieI : MyDerivedClassOperations_ { var p2 = p1; var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); response(new MyClass_OpMyClassResult( MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassI.cs b/csharp/test/Ice/operations/MyDerivedClassI.cs index 9832f3ba57e..0ee8d245cb3 100644 --- a/csharp/test/Ice/operations/MyDerivedClassI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassI.cs @@ -223,7 +223,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { p2 = p1; p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassTieI.cs b/csharp/test/Ice/operations/MyDerivedClassTieI.cs index 4ad9d672d48..9d349e125f8 100644 --- a/csharp/test/Ice/operations/MyDerivedClassTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassTieI.cs @@ -199,7 +199,7 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ { p2 = p1; p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/csharp/test/Ice/operations/Server.cs b/csharp/test/Ice/operations/Server.cs index b59c2a4f9e2..75f43e12218 100644 --- a/csharp/test/Ice/operations/Server.cs +++ b/csharp/test/Ice/operations/Server.cs @@ -27,7 +27,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/operations/Twoways.cs b/csharp/test/Ice/operations/Twoways.cs index 968fc07a835..62052f924d5 100644 --- a/csharp/test/Ice/operations/Twoways.cs +++ b/csharp/test/Ice/operations/Twoways.cs @@ -248,9 +248,9 @@ class Twoways test(Ice.Util.proxyIdentityAndFacetCompare(c1, p) == 0); test(Ice.Util.proxyIdentityAndFacetCompare(c2, p) != 0); test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0); - test(c1.ice_getIdentity().Equals(communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().Equals(communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().Equals(communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); r.opVoid(); c1.opVoid(); try diff --git a/csharp/test/Ice/operations/TwowaysAMI.cs b/csharp/test/Ice/operations/TwowaysAMI.cs index bc7402a8745..73689588663 100644 --- a/csharp/test/Ice/operations/TwowaysAMI.cs +++ b/csharp/test/Ice/operations/TwowaysAMI.cs @@ -190,9 +190,9 @@ public class TwowaysAMI public void opMyClass(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2) { - test(c1.ice_getIdentity().Equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().Equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().Equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); // // We can't do the callbacks below in connection serialization mode. diff --git a/csharp/test/Ice/optional/Server.cs b/csharp/test/Ice/optional/Server.cs index b4900b7e07a..dee39c8c23c 100644 --- a/csharp/test/Ice/optional/Server.cs +++ b/csharp/test/Ice/optional/Server.cs @@ -23,7 +23,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/optional/ServerAMD.cs b/csharp/test/Ice/optional/ServerAMD.cs index d23b4060462..814404845b2 100644 --- a/csharp/test/Ice/optional/ServerAMD.cs +++ b/csharp/test/Ice/optional/ServerAMD.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs index 0c4764650bd..c210c86cd57 100644 --- a/csharp/test/Ice/proxy/AllTests.cs +++ b/csharp/test/Ice/proxy/AllTests.cs @@ -254,11 +254,11 @@ public class AllTests : TestCommon.TestApp // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice.Identity id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\"); - Ice.Identity id2 = communicator.stringToIdentity(communicator.identityToString(id)); + Ice.Identity id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.Equals(id2)); id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"); - id2 = communicator.stringToIdentity(communicator.identityToString(id)); + id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.Equals(id2)); WriteLine("ok"); @@ -450,8 +450,14 @@ public class AllTests : TestCommon.TestApp WriteLine("ok"); Write("testing proxy methods... "); + +// Disable Obsolete warning/error +#pragma warning disable 612, 618 test(communicator.identityToString( baseProxy.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).Equals("other")); +#pragma warning restore 612, 618 + test(Ice.Util.identityToString( + baseProxy.ice_identity(Ice.Util.stringToIdentity("other")).ice_getIdentity()).Equals("other")); test(baseProxy.ice_facet("facet").ice_getFacet().Equals("facet")); test(baseProxy.ice_adapterId("id").ice_getAdapterId().Equals("id")); test(baseProxy.ice_twoway().ice_isTwoway()); diff --git a/csharp/test/Ice/proxy/Collocated.cs b/csharp/test/Ice/proxy/Collocated.cs index c161aa41a24..b13cb01b8ba 100644 --- a/csharp/test/Ice/proxy/Collocated.cs +++ b/csharp/test/Ice/proxy/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator); diff --git a/csharp/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs index 7015c9de392..4c30820cbb7 100644 --- a/csharp/test/Ice/proxy/Server.cs +++ b/csharp/test/Ice/proxy/Server.cs @@ -28,7 +28,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/retry/Collocated.cs b/csharp/test/Ice/retry/Collocated.cs index 6791089ceef..2fd9b6b8e8a 100644 --- a/csharp/test/Ice/retry/Collocated.cs +++ b/csharp/test/Ice/retry/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated private static void setupObjectAdapter(Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(""); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); } public static int run(string[] args, Ice.Communicator communicator, Ice.Communicator communicator2) diff --git a/csharp/test/Ice/retry/Server.cs b/csharp/test/Ice/retry/Server.cs index 5e2ef77792f..f0796f26ca9 100644 --- a/csharp/test/Ice/retry/Server.cs +++ b/csharp/test/Ice/retry/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/seqMapping/Collocated.cs b/csharp/test/Ice/seqMapping/Collocated.cs index 383d149ece2..4662e271666 100644 --- a/csharp/test/Ice/seqMapping/Collocated.cs +++ b/csharp/test/Ice/seqMapping/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/seqMapping/Server.cs b/csharp/test/Ice/seqMapping/Server.cs index cae559bf0c9..8e19d27c13f 100644 --- a/csharp/test/Ice/seqMapping/Server.cs +++ b/csharp/test/Ice/seqMapping/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/seqMapping/ServerAMD.cs b/csharp/test/Ice/seqMapping/ServerAMD.cs index cae559bf0c9..8e19d27c13f 100644 --- a/csharp/test/Ice/seqMapping/ServerAMD.cs +++ b/csharp/test/Ice/seqMapping/ServerAMD.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/servantLocator/Collocated.cs b/csharp/test/Ice/servantLocator/Collocated.cs index 66e39874c4a..b3acd7dfb99 100644 --- a/csharp/test/Ice/servantLocator/Collocated.cs +++ b/csharp/test/Ice/servantLocator/Collocated.cs @@ -28,8 +28,8 @@ public class Collocated Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); AllTests.allTests(communicator()); diff --git a/csharp/test/Ice/servantLocator/Server.cs b/csharp/test/Ice/servantLocator/Server.cs index 6c5d86bfc60..59d8df36ccd 100644 --- a/csharp/test/Ice/servantLocator/Server.cs +++ b/csharp/test/Ice/servantLocator/Server.cs @@ -28,8 +28,8 @@ public class Server Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); adapter.waitForDeactivate(); return 0; diff --git a/csharp/test/Ice/slicing/exceptions/Server.cs b/csharp/test/Ice/slicing/exceptions/Server.cs index bdd28e784e0..56bf9f925fb 100644 --- a/csharp/test/Ice/slicing/exceptions/Server.cs +++ b/csharp/test/Ice/slicing/exceptions/Server.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(); - adapter.add(@object, communicator.stringToIdentity("Test")); + adapter.add(@object, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/exceptions/ServerAMD.cs b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs index bdd28e784e0..56bf9f925fb 100644 --- a/csharp/test/Ice/slicing/exceptions/ServerAMD.cs +++ b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(); - adapter.add(@object, communicator.stringToIdentity("Test")); + adapter.add(@object, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/objects/Server.cs b/csharp/test/Ice/slicing/objects/Server.cs index 54109e72e98..89cca96fb72 100644 --- a/csharp/test/Ice/slicing/objects/Server.cs +++ b/csharp/test/Ice/slicing/objects/Server.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("Test")); + adapter.add(obj, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/objects/ServerAMD.cs b/csharp/test/Ice/slicing/objects/ServerAMD.cs index 54109e72e98..89cca96fb72 100644 --- a/csharp/test/Ice/slicing/objects/ServerAMD.cs +++ b/csharp/test/Ice/slicing/objects/ServerAMD.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("Test")); + adapter.add(obj, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/threadPoolPriority/Server.cs b/csharp/test/Ice/threadPoolPriority/Server.cs index 01b0638f3c7..fd2118c8587 100644 --- a/csharp/test/Ice/threadPoolPriority/Server.cs +++ b/csharp/test/Ice/threadPoolPriority/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new PriorityI(), communicator.stringToIdentity("test")); + adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs index 31e15a6e868..1acfd29bd16 100644 --- a/csharp/test/Ice/timeout/Server.cs +++ b/csharp/test/Ice/timeout/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); + adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/udp/Server.cs b/csharp/test/Ice/udp/Server.cs index 49886019a36..e43620fcaee 100644 --- a/csharp/test/Ice/udp/Server.cs +++ b/csharp/test/Ice/udp/Server.cs @@ -32,14 +32,14 @@ public class Server } properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter"); - adapter.add(new TestIntfI(), communicator.stringToIdentity("control")); + adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control")); adapter.activate(); if(port == 12010) { properties.setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter"); - adapter2.add(new TestIntfI(), communicator.stringToIdentity("test")); + adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); adapter2.activate(); } @@ -61,7 +61,7 @@ public class Server } properties.setProperty("McastTestAdapter.Endpoints", endpoint); Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter"); - mcastAdapter.add(new TestIntfI(), communicator.stringToIdentity("test")); + mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); mcastAdapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/IceBox/configuration/TestServiceI.cs b/csharp/test/IceBox/configuration/TestServiceI.cs index e4cda36804e..ae0754be56d 100644 --- a/csharp/test/IceBox/configuration/TestServiceI.cs +++ b/csharp/test/IceBox/configuration/TestServiceI.cs @@ -15,7 +15,7 @@ class TestServiceI : IceBox.Service start(string name, Ice.Communicator communicator, string[] args) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name + "OA"); - adapter.add(new TestI(args), communicator.stringToIdentity("test")); + adapter.add(new TestI(args), Ice.Util.stringToIdentity("test")); adapter.activate(); } diff --git a/csharp/test/IceDiscovery/simple/Server.cs b/csharp/test/IceDiscovery/simple/Server.cs index 998df8ca95d..4f423af28e8 100644 --- a/csharp/test/IceDiscovery/simple/Server.cs +++ b/csharp/test/IceDiscovery/simple/Server.cs @@ -36,7 +36,7 @@ public class Server properties.setProperty("ControlAdapter.ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter"); - adapter.add(new ControllerI(), communicator.stringToIdentity("controller" + num)); + adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num)); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/IceGrid/simple/Server.cs b/csharp/test/IceGrid/simple/Server.cs index 34713234936..e5318a46cc1 100644 --- a/csharp/test/IceGrid/simple/Server.cs +++ b/csharp/test/IceGrid/simple/Server.cs @@ -25,7 +25,7 @@ public class Server args = communicator().getProperties().parseCommandLineOptions("TestAdapter", args); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); string id = communicator().getProperties().getPropertyWithDefault("Identity", "test"); - adapter.add(new TestI(), communicator().stringToIdentity(id)); + adapter.add(new TestI(), Ice.Util.stringToIdentity(id)); shutdownOnInterrupt(); try { diff --git a/csharp/test/IceSSL/configuration/Server.cs b/csharp/test/IceSSL/configuration/Server.cs index d0aed55ac65..636c41a8188 100644 --- a/csharp/test/IceSSL/configuration/Server.cs +++ b/csharp/test/IceSSL/configuration/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new ServerFactoryI(), id); adapter.activate(); diff --git a/csharp/test/Slice/keyword/Client.cs b/csharp/test/Slice/keyword/Client.cs index 2d0728a94ee..686c7c3d6c4 100644 --- a/csharp/test/Slice/keyword/Client.cs +++ b/csharp/test/Slice/keyword/Client.cs @@ -145,26 +145,26 @@ public class Client { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new decimalI(), communicator.stringToIdentity("test")); - adapter.add(new Test1I(), communicator.stringToIdentity("test1")); - adapter.add(new Test2I(), communicator.stringToIdentity("test2")); + adapter.add(new decimalI(), Ice.Util.stringToIdentity("test")); + adapter.add(new Test1I(), Ice.Util.stringToIdentity("test1")); + adapter.add(new Test2I(), Ice.Util.stringToIdentity("test2")); adapter.activate(); Console.Out.Write("testing operation name... "); Console.Out.Flush(); @abstract.@decimalPrx p = @abstract.@decimalPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test"))); + adapter.createProxy(Ice.Util.stringToIdentity("test"))); p.@default(); Console.Out.WriteLine("ok"); Console.Out.Write("testing System as module name... "); Console.Out.Flush(); @abstract.System.TestPrx t1 = @abstract.System.TestPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test1"))); + adapter.createProxy(Ice.Util.stringToIdentity("test1"))); t1.op(); System.TestPrx t2 = System.TestPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test2"))); + adapter.createProxy(Ice.Util.stringToIdentity("test2"))); t2.op(); Console.Out.WriteLine("ok"); diff --git a/java/src/Ice/src/main/java/Ice/CommunicatorI.java b/java/src/Ice/src/main/java/Ice/CommunicatorI.java index 371a3a39aaf..1713b0dc05e 100644 --- a/java/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -71,14 +71,14 @@ public final class CommunicatorI implements Communicator public Ice.Identity stringToIdentity(String s) { - return _instance.stringToIdentity(s); + return Ice.Util.stringToIdentity(s); } @Override public String identityToString(Ice.Identity ident) { - return _instance.identityToString(ident); + return Ice.Util.identityToString(ident); } @Override diff --git a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java index f645c6c5ccd..1aeef2206fa 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -980,7 +980,7 @@ public final class ObjectAdapterI implements ObjectAdapter if(_routerInfo.getAdapter() != null) { throw new AlreadyRegisteredException("object adapter with router", - _instance.identityToString(router.ice_getIdentity())); + Ice.Util.identityToString(router.ice_getIdentity())); } // diff --git a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java index 5b9f377d807..095948736e3 100644 --- a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java @@ -319,7 +319,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb public String getIdentity() { - return _current.adapter.getCommunicator().identityToString(_current.id); + return Ice.Util.identityToString(_current.id); } final private Ice.Current _current; @@ -428,7 +428,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb catch(Exception ex) { // Either a fixed proxy or the communicator is destroyed. - os.append(_proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity())); + os.append(Ice.Util.identityToString(_proxy.ice_getIdentity())); os.append(" [").append(_operation).append(']'); } _id = os.toString(); @@ -458,7 +458,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb { if(_proxy != null) { - return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity()); + return Ice.Util.identityToString(_proxy.ice_getIdentity()); } else { diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java index c57bc1ad407..ebbf963aba9 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java @@ -59,4 +59,4 @@ public class ConnectionObserverI private int _sentBytes; private int _receivedBytes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java index 151343941af..93c853c9853 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -235,7 +235,7 @@ class IncomingBase IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("dispatch exception:"); - out.print("\nidentity: " + _instance.identityToString(_current.id)); + out.print("\nidentity: " + Ice.Util.identityToString(_current.id)); out.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(_current.facet, "")); out.print("\noperation: " + _current.operation); if(_current.con != null) diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 1f019001136..1543bc1ebf1 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -420,18 +420,6 @@ public final class Instance implements Ice.ClassResolver return _implicitContext; } - public Ice.Identity - stringToIdentity(String s) - { - return Ice.Util.stringToIdentity(s); - } - - public String - identityToString(Ice.Identity ident) - { - return Ice.Util.identityToString(ident); - } - public synchronized Ice.ObjectPrx createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity) { diff --git a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java index 87afdb394b7..82c4dea0e25 100644 --- a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java @@ -466,7 +466,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(ref.getInstance().identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } @@ -518,13 +518,13 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("object not found\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } Ice.NotRegisteredException e = new Ice.NotRegisteredException(); e.kindOfObject = "object"; - e.id = instance.identityToString(ref.getIdentity()); + e.id = Ice.Util.identityToString(ref.getIdentity()); throw e; } catch(Ice.NotRegisteredException ex) @@ -547,7 +547,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } s.append("reason = " + ex); @@ -591,7 +591,7 @@ public final class LocatorInfo { s.append("object\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); @@ -630,7 +630,7 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("searching for object by id\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } diff --git a/java/src/Ice/src/main/java/IceInternal/Reference.java b/java/src/Ice/src/main/java/IceInternal/Reference.java index e765cec180c..b7ea1dd2f32 100644 --- a/java/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/IceInternal/Reference.java @@ -311,7 +311,7 @@ public abstract class Reference implements Cloneable // the reference parser uses as separators, then we enclose // the identity string in quotes. // - String id = _instance.identityToString(_identity); + String id = Ice.Util.identityToString(_identity); if(IceUtilInternal.StringUtil.findFirstOf(id, " :@") != -1) { s.append('"'); diff --git a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index 874f977c471..ed36537017e 100644 --- a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java @@ -127,7 +127,7 @@ public final class ReferenceFactory // // Parsing the identity may raise IdentityParseException. // - Ice.Identity ident = _instance.stringToIdentity(idstr); + Ice.Identity ident = Ice.Util.stringToIdentity(idstr); if(ident.name.length() == 0) { diff --git a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java index 12af3e0b1c4..f7c35f706eb 100644 --- a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java @@ -31,4 +31,4 @@ public class RemoteObserverI _delegate.reply(size); } } -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/ServantManager.java b/java/src/Ice/src/main/java/IceInternal/ServantManager.java index 4382a3044eb..2789304f276 100644 --- a/java/src/Ice/src/main/java/IceInternal/ServantManager.java +++ b/java/src/Ice/src/main/java/IceInternal/ServantManager.java @@ -32,7 +32,7 @@ public final class ServantManager if(m.containsKey(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -77,7 +77,7 @@ public final class ServantManager if(m == null || (obj = m.remove(facet)) == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -120,7 +120,7 @@ public final class ServantManager if(m == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; throw ex; } diff --git a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java index 2dc06f8b1c2..553e46840bf 100644 --- a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java @@ -65,4 +65,4 @@ public class ThreadObserverI private Ice.Instrumentation.ThreadState _oldState; private Ice.Instrumentation.ThreadState _newState; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java index ec6d9ff910c..2ff165c475d 100644 --- a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -168,7 +168,7 @@ public final class TraceUtil { Ice.Identity identity = new Ice.Identity(); identity.__read(stream); - out.write("\nidentity = " + stream.instance().identityToString(identity)); + out.write("\nidentity = " + Ice.Util.identityToString(identity)); String[] facet = stream.readStringSeq(); out.write("\nfacet = "); diff --git a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java index 8d5aac39062..84dfc57d19f 100644 --- a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java +++ b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java @@ -185,4 +185,4 @@ public class MetricsHelper<T> } private AttributeResolver _attributes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java index a629ee38b7e..ca06b0a8c00 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java @@ -139,4 +139,4 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>> private java.util.List<MetricsMap<T>> _maps = new java.util.ArrayList<MetricsMap<T>>(); private volatile boolean _enabled; private Runnable _updater; -}
\ No newline at end of file +} diff --git a/java/src/IceBox/src/main/java/IceBox/Admin.java b/java/src/IceBox/src/main/java/IceBox/Admin.java index 0b363f83c6a..52e39ee771e 100644 --- a/java/src/IceBox/src/main/java/IceBox/Admin.java +++ b/java/src/IceBox/src/main/java/IceBox/Admin.java @@ -84,7 +84,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" :" + managerEndpoints; } else { @@ -95,7 +95,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" @" + managerAdapterId; } base = communicator().stringToProxy(managerProxy); diff --git a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java index 3b586d4ccf7..4f45834c7ea 100644 --- a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java @@ -106,7 +106,7 @@ public class PluginI implements Ice.Plugin // Add lookup and lookup reply Ice objects // LookupI lookup = new LookupI(locatorRegistry, LookupPrxHelper.uncheckedCast(lookupPrx), properties); - _multicastAdapter.add(lookup, _communicator.stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter.add(lookup, Ice.Util.stringToIdentity("IceDiscovery/Lookup")); Ice.ObjectPrx lookupReply = _replyAdapter.addWithUUID(new LookupReplyI(lookup)).ice_datagram(); lookup.setLookupReply(LookupReplyPrxHelper.uncheckedCast(lookupReply)); diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index 30d5e204a2d..a06e8617f97 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java @@ -2079,7 +2079,7 @@ public class Coordinator cb.setRegistry(RegistryPrxHelper. uncheckedCast(_communicator.stringToProxy( - "\"" + _communicator.identityToString(masterRegistryId) + "\""))); + "\"" + Ice.Util.identityToString(masterRegistryId) + "\""))); } // diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java index 0c63f23da50..4c21bee85bd 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java @@ -75,4 +75,4 @@ public class Fallback extends javax.swing.JApplet System.exit(1); } } -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java index ed358694cee..4e6ad314dce 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java @@ -93,4 +93,4 @@ public class MainProxy } private static String[] _args = new String[]{}; -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java index 64a0718824d..fa178e40271 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java @@ -1184,7 +1184,7 @@ public class SessionKeeper { Ice.LocatorPrx prx = Ice.LocatorPrxHelper.uncheckedCast( communicator.stringToProxy( - communicator.identityToString(locator.ice_getIdentity()) + + Ice.Util.identityToString(locator.ice_getIdentity()) + ":" + e.toString())); if(_directDiscoveryEndpointModel.indexOf(prx) == -1) @@ -2288,7 +2288,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -2345,7 +2345,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -3189,7 +3189,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3207,7 +3207,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3399,7 +3399,7 @@ public class SessionKeeper id.name = inf.getDirect() ? "Locator" : "router"; id.category = inf.getInstanceName(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(inf.getEndpoint()); ssl = containsSecureEndpoints(endpoint.toString()); diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java index 866a3c29354..c90efc8e272 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -274,7 +274,7 @@ public class ControllerServer extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new ControllerI(args), communicator().stringToIdentity("controller")); + adapter.add(new ControllerI(args), Ice.Util.stringToIdentity("controller")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java index 76c9e3d979f..b5314502149 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java @@ -65,4 +65,4 @@ public class Client extends Ice.Application int status = app.main("Client", args, initData); System.exit(status); } -};
\ No newline at end of file +}; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java index d75c06f8c59..04cc84e9dbd 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java @@ -23,7 +23,7 @@ public class DatabaseServer extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10001"); - adapter.add(new DatabaseI(), communicator().stringToIdentity("db")); + adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java index 09ab74f754f..eb0fa9a3a01 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java index f4ac4c7c5e7..9abfe9a5e99 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java @@ -65,4 +65,4 @@ public class Client extends Ice.Application int status = app.main("Client", args, initData); System.exit(status); } -};
\ No newline at end of file +}; diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java index 6cd91dd3d11..f7ad76bd657 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java @@ -23,7 +23,7 @@ public class DatabaseServer extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10002"); - adapter.add(new DatabaseI(), communicator().stringToIdentity("db")); + adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java index 277f121cc79..236add0a74f 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java/test/src/main/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java index a142a4bebf5..5bec46a2cec 100644 --- a/java/test/src/main/java/test/Glacier2/router/Client.java +++ b/java/test/src/main/java/test/Glacier2/router/Client.java @@ -305,7 +305,7 @@ public class Client extends test.Util.Application java.util.Map<String, String> context = new java.util.HashMap<String, String>(); context.put("_fwd", "t"); CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c2/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); out.println("ok"); @@ -319,7 +319,7 @@ public class Client extends test.Util.Application try { CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c3/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); test(false); } @@ -335,7 +335,7 @@ public class Client extends test.Util.Application java.util.Map<String, String> context = new java.util.HashMap<String, String>(); context.put("_fwd", "t"); CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("_userid/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); out.println("ok"); diff --git a/java/test/src/main/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java index a8e74bbe63c..562b8647b4e 100644 --- a/java/test/src/main/java/test/Glacier2/router/Server.java +++ b/java/test/src/main/java/test/Glacier2/router/Server.java @@ -17,13 +17,13 @@ public class Server extends test.Util.Application communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), - communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. + Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c2/callback")); // The test allows "c2" as category. + Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c3/callback")); // The test rejects "c3" as category. + Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("_userid/callback")); // The test allows the prefixed userid. + Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid. adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java index 770120f1aea..5e2108c78e0 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java @@ -19,7 +19,7 @@ public class Server extends test.Util.Application communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); - adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); + adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java index 7dac87f5eba..f31b0030fbf 100644 --- a/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java @@ -19,7 +19,7 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/java/test/src/main/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java index 81c4069f43c..8df16e0f21a 100644 --- a/java/test/src/main/java/test/Ice/acm/Server.java +++ b/java/test/src/main/java/test/Ice/acm/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java index 5e59a55782c..b1e622947c8 100644 --- a/java/test/src/main/java/test/Ice/admin/AllTests.java +++ b/java/test/src/main/java/test/Ice/admin/AllTests.java @@ -147,7 +147,7 @@ public class AllTests Ice.Communicator com = Ice.Util.initialize(init); test(com.getAdmin() == null); - Ice.Identity id = com.stringToIdentity("test-admin"); + Ice.Identity id = Ice.Util.stringToIdentity("test-admin"); try { com.createAdmin(null, id); diff --git a/java/test/src/main/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java index 49c11f870ea..f9ca817d7c0 100644 --- a/java/test/src/main/java/test/Ice/admin/Server.java +++ b/java/test/src/main/java/test/Ice/admin/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RemoteCommunicatorFactoryI(), communicator.stringToIdentity("factory")); + adapter.add(new RemoteCommunicatorFactoryI(), Ice.Util.stringToIdentity("factory")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java index dda3d917716..429d4ed2dfd 100644 --- a/java/test/src/main/java/test/Ice/ami/Collocated.java +++ b/java/test/src/main/java/test/Ice/ami/Collocated.java @@ -17,9 +17,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator().stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Collocated test doesn't need to activate the OA - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Collocated test doesn't need to activate the OA AllTests.allTests(this, true); diff --git a/java/test/src/main/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java index 1f88cc0e66b..92c745419dd 100644 --- a/java/test/src/main/java/test/Ice/ami/Server.java +++ b/java/test/src/main/java/test/Ice/ami/Server.java @@ -18,9 +18,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator().stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java index 04036eb76f6..d0e0d298506 100644 --- a/java/test/src/main/java/test/Ice/background/Server.java +++ b/java/test/src/main/java/test/Ice/background/Server.java @@ -21,7 +21,7 @@ public class Server extends test.Util.Application { _controller.checkCallPause(current); Ice.Communicator communicator = current.adapter.getCommunicator(); - response.ice_response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); + response.ice_response(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy"))); } @Override @@ -95,12 +95,12 @@ public class Server extends test.Util.Application BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter); - adapter.add(new BackgroundI(backgroundController), communicator().stringToIdentity("background")); - adapter.add(new LocatorI(backgroundController), communicator().stringToIdentity("locator")); - adapter.add(new RouterI(backgroundController), communicator().stringToIdentity("router")); + adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background")); + adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator")); + adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router")); adapter.activate(); - adapter2.add(backgroundController, communicator().stringToIdentity("backgroundController")); + adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index 29268f11727..3c8a85c58bb 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -933,7 +933,7 @@ public class AllTests continue; // IP version not supported. } - String strPrx = oa.createProxy(serverCommunicator.stringToIdentity("dummy")).toString(); + String strPrx = oa.createProxy(Ice.Util.stringToIdentity("dummy")).toString(); for(Ice.Properties q : clientProps) { Ice.InitializationData clientInitData = app.createInitializationData(); diff --git a/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java index d3871e1602b..51aa5b24c84 100644 --- a/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java @@ -20,7 +20,7 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/java/test/src/main/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java index 51a4ce4f6c5..104b7e1eb03 100644 --- a/java/test/src/main/java/test/Ice/binding/Server.java +++ b/java/test/src/main/java/test/Ice/binding/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java index 0e9c69df45c..dffecaff213 100644 --- a/java/test/src/main/java/test/Ice/checksum/Server.java +++ b/java/test/src/main/java/test/Ice/checksum/Server.java @@ -19,7 +19,7 @@ public class Server extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ChecksumI(); - adapter.add(object, communicator.stringToIdentity("test")); + adapter.add(object, Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java index 6a8a658fc15..aef65c14aa3 100644 --- a/java/test/src/main/java/test/Ice/classLoader/Server.java +++ b/java/test/src/main/java/test/Ice/classLoader/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java index a2eaa077ac2..2c1e7b251f1 100644 --- a/java/test/src/main/java/test/Ice/custom/Collocated.java +++ b/java/test/src/main/java/test/Ice/custom/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java index 0779a84b5e1..8a4da565414 100644 --- a/java/test/src/main/java/test/Ice/custom/Server.java +++ b/java/test/src/main/java/test/Ice/custom/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java index 37f1f2e4ab5..230321ada51 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java @@ -18,9 +18,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); assert(_dispatcher != null); - adapter.add(new TestI(_dispatcher), communicator().stringToIdentity("test")); + adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator(), getWriter(), _dispatcher); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java index 166f6e8ff0c..d962bbe1e28 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Server.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); assert(_dispatcher != null); - adapter.add(new TestI(_dispatcher), communicator().stringToIdentity("test")); + adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java index 804813ffa55..07648551d38 100644 --- a/java/test/src/main/java/test/Ice/echo/Server.java +++ b/java/test/src/main/java/test/Ice/echo/Server.java @@ -46,7 +46,7 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); BlobjectI blob = new BlobjectI(); adapter.addDefaultServant(blob, ""); - adapter.add(new EchoI(blob), communicator().stringToIdentity("__echo")); + adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java index bf3e966421a..69c4bf6459e 100644 --- a/java/test/src/main/java/test/Ice/enums/Server.java +++ b/java/test/src/main/java/test/Ice/enums/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestIntfI(); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java index 32d5ba99ca8..e7d8f9b0d1e 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java @@ -19,9 +19,9 @@ public class AMDServer extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); - adapter2.add(object, communicator.stringToIdentity("thrower")); - adapter3.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); + adapter2.add(object, Ice.Util.stringToIdentity("thrower")); + adapter3.add(object, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/java/test/src/main/java/test/Ice/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/exceptions/AllTests.java index 4864434ca89..b417b1a427d 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AllTests.java +++ b/java/test/src/main/java/test/Ice/exceptions/AllTests.java @@ -142,7 +142,7 @@ public class AllTests } catch(Ice.ObjectNotExistException ex) { - Ice.Identity id = _communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); test(ex.id.equals(id)); } catch(Throwable ex) @@ -765,10 +765,10 @@ public class AllTests communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); try { - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -777,7 +777,7 @@ public class AllTests try { - adapter.add(obj, communicator.stringToIdentity("")); + adapter.add(obj, Ice.Util.stringToIdentity("")); test(false); } catch(Ice.IllegalIdentityException ex) @@ -786,17 +786,17 @@ public class AllTests } try { - adapter.add(null, communicator.stringToIdentity("x")); + adapter.add(null, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.IllegalServantException ex) { } - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); try { - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.NotRegisteredException ex) @@ -1166,7 +1166,7 @@ public class AllTests out.flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); try { ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); @@ -1423,7 +1423,7 @@ public class AllTests out.flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback_Thrower_throwAasAObjectNotExistI cb = new Callback_Thrower_throwAasAObjectNotExistI(communicator); thrower2.begin_throwAasA(1, cb); diff --git a/java/test/src/main/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java index 668d2e60039..87f9e730a2d 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Collocated.java +++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java @@ -18,7 +18,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java index 0d797044138..d510ac1216f 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/exceptions/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); - adapter2.add(object, communicator.stringToIdentity("thrower")); - adapter3.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); + adapter2.add(object, Ice.Util.stringToIdentity("thrower")); + adapter3.add(object, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/java/test/src/main/java/test/Ice/facets/AllTests.java b/java/test/src/main/java/test/Ice/facets/AllTests.java index 60e641e959f..799a54f4ccf 100644 --- a/java/test/src/main/java/test/Ice/facets/AllTests.java +++ b/java/test/src/main/java/test/Ice/facets/AllTests.java @@ -59,20 +59,20 @@ public class AllTests communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("d")); - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(obj, Ice.Util.stringToIdentity("d")); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.AlreadyRegisteredException ex) { } - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.NotRegisteredException ex) @@ -83,25 +83,25 @@ public class AllTests out.print("testing removeAllFacets... "); Ice.Object obj1 = new EmptyI(); Ice.Object obj2 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2"); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2"); Ice.Object obj3 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2"); - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), ""); - java.util.Map<String, Ice.Object> fm = adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2"); + adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), ""); + java.util.Map<String, Ice.Object> fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(fm.size() == 2); test(fm.get("f1") == obj1); test(fm.get("f2") == obj2); try { - adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(false); } catch(Ice.NotRegisteredException ex) { } - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")); + fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2")); test(fm.size() == 3); test(fm.get("f1") == obj1); test(fm.get("f2") == obj2); diff --git a/java/test/src/main/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java index b74f02d5e45..4d72172d030 100644 --- a/java/test/src/main/java/test/Ice/facets/Collocated.java +++ b/java/test/src/main/java/test/Ice/facets/Collocated.java @@ -18,12 +18,12 @@ public class Collocated extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java index 486723faad7..533db9e28e3 100644 --- a/java/test/src/main/java/test/Ice/facets/Server.java +++ b/java/test/src/main/java/test/Ice/facets/Server.java @@ -17,12 +17,12 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java index 2d26de237f0..56e4041a168 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Server.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java @@ -65,7 +65,7 @@ public class Server extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(port); - adapter.add(object, communicator.stringToIdentity("test")); + adapter.add(object, Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java index 84becc3d3dd..2d3a1cf9652 100644 --- a/java/test/src/main/java/test/Ice/hold/Server.java +++ b/java/test/src/main/java/test/Ice/hold/Server.java @@ -18,10 +18,10 @@ public class Server extends test.Util.Application java.util.Timer timer = new java.util.Timer(); Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1"); - adapter1.add(new HoldI(timer, adapter1), communicator.stringToIdentity("hold")); + adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold")); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); - adapter2.add(new HoldI(timer, adapter2), communicator.stringToIdentity("hold")); + adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold")); adapter1.activate(); adapter2.activate(); diff --git a/java/test/src/main/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java index df136602465..455e21046d0 100644 --- a/java/test/src/main/java/test/Ice/info/Server.java +++ b/java/test/src/main/java/test/Ice/info/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java index 369d56a699d..ac600d8f32c 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Collocated.java +++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java index dcfa8e06af4..a826ae1ec2f 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Server.java +++ b/java/test/src/main/java/test/Ice/inheritance/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java index f94be8d3b21..61d24074a80 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Collocated.java +++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java @@ -17,9 +17,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); TestControllerI controller = new TestControllerI(adapter); - adapter.add(new TestI(controller), communicator().stringToIdentity("test")); + adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(controller, communicator().stringToIdentity("testController")); + adapter2.add(controller, Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. try diff --git a/java/test/src/main/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java index 12b670cafa6..0ab16417b99 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Server.java +++ b/java/test/src/main/java/test/Ice/interrupt/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); TestControllerI controller = new TestControllerI(adapter); - adapter.add(new TestI(controller), communicator().stringToIdentity("test")); + adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(controller, communicator().stringToIdentity("testController")); + adapter2.add(controller, Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java index 06eae325c60..33bada684a8 100644 --- a/java/test/src/main/java/test/Ice/location/AllTests.java +++ b/java/test/src/main/java/test/Ice/location/AllTests.java @@ -682,7 +682,7 @@ public class AllTests // Note the quotes are necessary here due to ":" in the // java generated UUID. HelloPrx helloPrx = HelloPrxHelper.checkedCast( - communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); + communicator.stringToProxy("\"" + Ice.Util.identityToString(id) + "\"")); test(helloPrx.ice_getConnection() == null); adapter.deactivate(); diff --git a/java/test/src/main/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java index cf66d91c99e..1a3a98351be 100644 --- a/java/test/src/main/java/test/Ice/location/Server.java +++ b/java/test/src/main/java/test/Ice/location/Server.java @@ -31,15 +31,15 @@ public class Server extends test.Util.Application // 'servers' created with the server manager interface. // ServerLocatorRegistry registry = new ServerLocatorRegistry(); - registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager"))); + registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager"))); Ice.Object object = new ServerManagerI(registry, _initData, this); - adapter.add(object, communicator.stringToIdentity("ServerManager")); + adapter.add(object, Ice.Util.stringToIdentity("ServerManager")); Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry, - communicator.stringToIdentity("registry"))); + Ice.Util.stringToIdentity("registry"))); ServerLocator locator = new ServerLocator(registry, registryPrx); - adapter.add(locator, communicator.stringToIdentity("locator")); + adapter.add(locator, Ice.Util.stringToIdentity("locator")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/location/ServerManagerI.java b/java/test/src/main/java/test/Ice/location/ServerManagerI.java index 1939375c795..293b9dcfb97 100644 --- a/java/test/src/main/java/test/Ice/location/ServerManagerI.java +++ b/java/test/src/main/java/test/Ice/location/ServerManagerI.java @@ -65,9 +65,9 @@ public class ServerManagerI extends _ServerManagerDisp adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); Ice.Object object = new TestI(adapter, adapter2, _registry); - _registry.addObject(adapter.add(object, serverCommunicator.stringToIdentity("test"))); - _registry.addObject(adapter.add(object, serverCommunicator.stringToIdentity("test2"))); - adapter.add(object, serverCommunicator.stringToIdentity("test3")); + _registry.addObject(adapter.add(object, Ice.Util.stringToIdentity("test"))); + _registry.addObject(adapter.add(object, Ice.Util.stringToIdentity("test2"))); + adapter.add(object, Ice.Util.stringToIdentity("test3")); adapter.activate(); adapter2.activate(); diff --git a/java/test/src/main/java/test/Ice/location/TestI.java b/java/test/src/main/java/test/Ice/location/TestI.java index 761e8be8fce..8f6e9eb6490 100644 --- a/java/test/src/main/java/test/Ice/location/TestI.java +++ b/java/test/src/main/java/test/Ice/location/TestI.java @@ -22,7 +22,7 @@ public class TestI extends _TestIntfDisp _adapter2 = adapter2; _registry = registry; - _registry.addObject(_adapter1.add(new HelloI(), _adapter1.getCommunicator().stringToIdentity("hello"))); + _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello"))); } @Override @@ -37,21 +37,21 @@ public class TestI extends _TestIntfDisp getHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } @Override public HelloPrx getReplicatedHello(Ice.Current current) { - return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(_adapter1.getCommunicator().stringToIdentity("hello"))); + return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(Ice.Util.stringToIdentity("hello"))); } @Override public void migrateHello(Ice.Current current) { - final Ice.Identity id = _adapter1.getCommunicator().stringToIdentity("hello"); + final Ice.Identity id = Ice.Util.stringToIdentity("hello"); try { _registry.addObject(_adapter2.add(_adapter1.remove(id), id)); diff --git a/java/test/src/main/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java index a3d062eb09d..c936ca8d989 100644 --- a/java/test/src/main/java/test/Ice/metrics/AMDServer.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java @@ -16,12 +16,12 @@ public class AMDServer extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new AMDMetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new AMDMetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java index 84740d7fc33..98320001330 100644 --- a/java/test/src/main/java/test/Ice/metrics/Collocated.java +++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java @@ -19,12 +19,12 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); //adapter.activate(); // Don't activate OA to ensure collocation is used. communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used. try diff --git a/java/test/src/main/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java index b2ec289b110..b4512bfdc4b 100644 --- a/java/test/src/main/java/test/Ice/metrics/Server.java +++ b/java/test/src/main/java/test/Ice/metrics/Server.java @@ -16,12 +16,12 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java index 65e1623d374..1c0838f37a3 100644 --- a/java/test/src/main/java/test/Ice/networkProxy/Server.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java index fd46f269d0d..3540ad70b0a 100644 --- a/java/test/src/main/java/test/Ice/objects/Collocated.java +++ b/java/test/src/main/java/test/Ice/objects/Collocated.java @@ -90,9 +90,9 @@ public class Collocated extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); - adapter.add(initial, communicator.stringToIdentity("initial")); + adapter.add(initial, Ice.Util.stringToIdentity("initial")); UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI(); - adapter.add(object, communicator.stringToIdentity("uoet")); + adapter.add(object, Ice.Util.stringToIdentity("uoet")); AllTests.allTests(communicator, getWriter()); // We must call shutdown even in the collocated case for cyclic // dependency cleanup diff --git a/java/test/src/main/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java index e513c71773a..49a7c0fa174 100644 --- a/java/test/src/main/java/test/Ice/objects/Server.java +++ b/java/test/src/main/java/test/Ice/objects/Server.java @@ -45,9 +45,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); object = new UnexpectedObjectExceptionTestI(); - adapter.add(object, communicator.stringToIdentity("uoet")); + adapter.add(object, Ice.Util.stringToIdentity("uoet")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index 7a9a61530b7..4beb59f070a 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -308,7 +308,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass { MyClassPrx p2 = p1; MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } diff --git a/java/test/src/main/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java index e8e92a095a3..25437cbe39b 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyDerivedClassI(), communicator().stringToIdentity("test")); + adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java index 8b78ab51efd..ed2c9c3f618 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java @@ -272,7 +272,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations { MyClassPrx p2 = p1; MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java index 99a9378f7a6..1e18aa3fa0d 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java @@ -18,7 +18,7 @@ public class AMDTieServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), communicator().stringToIdentity("test")); + adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java index 0d2dc641986..b10f13a54e0 100644 --- a/java/test/src/main/java/test/Ice/operations/Collocated.java +++ b/java/test/src/main/java/test/Ice/operations/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); java.io.PrintWriter out = getWriter(); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), communicator().stringToIdentity("test")); + Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. if(prx.ice_getConnection() != null) diff --git a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index a0b09d438d3..2e55b054b6f 100644 --- a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java @@ -262,7 +262,7 @@ public final class MyDerivedClassI extends MyDerivedClass { p2.value = p1; p3.value = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/java/test/src/main/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java index 0ba1baaa161..ae7d1de57bd 100644 --- a/java/test/src/main/java/test/Ice/operations/Server.java +++ b/java/test/src/main/java/test/Ice/operations/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java index 34c55945ed3..e18d6b4f058 100644 --- a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java @@ -226,7 +226,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations { p2.value = p1; p3.value = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/java/test/src/main/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java index 5f6d757635a..189fe433be7 100644 --- a/java/test/src/main/java/test/Ice/operations/TieServer.java +++ b/java/test/src/main/java/test/Ice/operations/TieServer.java @@ -18,7 +18,7 @@ public class TieServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), communicator().stringToIdentity("test")); + adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java index 0a8d61f6397..cea51fc11c9 100644 --- a/java/test/src/main/java/test/Ice/operations/Twoways.java +++ b/java/test/src/main/java/test/Ice/operations/Twoways.java @@ -258,9 +258,9 @@ class Twoways test(Util.proxyIdentityAndFacetCompare(c1.value, p) == 0); test(Util.proxyIdentityAndFacetCompare(c2.value, p) != 0); test(Util.proxyIdentityAndFacetCompare(r, p) == 0); - test(c1.value.ice_getIdentity().equals(communicator.stringToIdentity("test"))); - test(c2.value.ice_getIdentity().equals(communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(communicator.stringToIdentity("test"))); + test(c1.value.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.value.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); r.opVoid(); c1.value.opVoid(); try diff --git a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java index 4bb600ab39c..bd9701c27c5 100644 --- a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java @@ -426,9 +426,9 @@ class TwowaysAMI @Override public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { - test(c1.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); // We can't do the callbacks below in connection serialization mode. if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0) { diff --git a/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java index 056b66f8b12..204790269c7 100644 --- a/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java +++ b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java @@ -257,9 +257,9 @@ public class TwowaysLambdaAMI public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { - test(c1.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); // We can't do the callbacks below in connection serialization mode. if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0) { diff --git a/java/test/src/main/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java index 0cb4d4644b8..99cab219be1 100644 --- a/java/test/src/main/java/test/Ice/optional/AMDServer.java +++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDInitialI(), communicator().stringToIdentity("initial")); + adapter.add(new AMDInitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java index 51da67cbdc2..d4429d5a94d 100644 --- a/java/test/src/main/java/test/Ice/optional/Server.java +++ b/java/test/src/main/java/test/Ice/optional/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator().stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java index 9cd17d0755a..2f7abf04cf4 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Server.java +++ b/java/test/src/main/java/test/Ice/packagemd/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java index 1bf3e6461c0..82defd2909a 100644 --- a/java/test/src/main/java/test/Ice/proxy/AMDServer.java +++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java index 6d0ffdee136..d5471d4510a 100644 --- a/java/test/src/main/java/test/Ice/proxy/AllTests.java +++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java @@ -270,11 +270,11 @@ public class AllTests // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice.Identity id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\"); - Ice.Identity id2 = communicator.stringToIdentity(communicator.identityToString(id)); + Ice.Identity id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.equals(id2)); id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"); - id2 = communicator.stringToIdentity(communicator.identityToString(id)); + id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.equals(id2)); out.println("ok"); @@ -463,6 +463,8 @@ public class AllTests out.flush(); test(communicator.identityToString( base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).equals("other")); + test(Ice.Util.identityToString( + base.ice_identity(Ice.Util.stringToIdentity("other")).ice_getIdentity()).equals("other")); test(base.ice_facet("facet").ice_getFacet().equals("facet")); test(base.ice_adapterId("id").ice_getAdapterId().equals("id")); test(base.ice_twoway().ice_isTwoway()); diff --git a/java/test/src/main/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java index ed82d121277..5823e8d25c5 100644 --- a/java/test/src/main/java/test/Ice/proxy/Collocated.java +++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java index cd77788ef97..fd6252a37d1 100644 --- a/java/test/src/main/java/test/Ice/proxy/Server.java +++ b/java/test/src/main/java/test/Ice/proxy/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java index 996c78c25d1..1faf02f0889 100644 --- a/java/test/src/main/java/test/Ice/retry/Collocated.java +++ b/java/test/src/main/java/test/Ice/retry/Collocated.java @@ -19,7 +19,7 @@ public class Collocated extends test.Util.Application setupObjectAdapter(Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(""); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); //adapter.activate(); // Don't activate OA to ensure collocation is used. } diff --git a/java/test/src/main/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java index d639187ad1b..8d4a4f6209e 100644 --- a/java/test/src/main/java/test/Ice/retry/Server.java +++ b/java/test/src/main/java/test/Ice/retry/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java index ac608d9e0ea..e19857ff333 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyClassI(), communicator().stringToIdentity("test")); + adapter.add(new AMDMyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java index 52069bbeca1..755e0248197 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application { java.io.PrintWriter out = getWriter(); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator(), true, out); diff --git a/java/test/src/main/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java index 548d3086217..21eff24ab1c 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Server.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java index 70219d964fa..a0658f19668 100644 --- a/java/test/src/main/java/test/Ice/serialize/Server.java +++ b/java/test/src/main/java/test/Ice/serialize/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - Ice.Identity ident = communicator().stringToIdentity("initial"); + Ice.Identity ident = Ice.Util.stringToIdentity("initial"); Ice.Object object = new InitialI(adapter, ident); adapter.add(object, ident); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java index 6e6ffc665f9..77f66d39142 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java @@ -18,8 +18,8 @@ public class AMDServer extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new AMDServantLocatorI("category"), "category"); adapter.addServantLocator(new AMDServantLocatorI(""), ""); - adapter.add(new AMDTestI(), communicator().stringToIdentity("asm")); - adapter.add(new AMDTestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new AMDTestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new AMDTestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java index a77705f8145..6e4fbf4e820 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java @@ -17,8 +17,8 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); AllTests.allTests(communicator(), getWriter()); return 0; diff --git a/java/test/src/main/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java index 2704cf9e434..9559c24a7a4 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Server.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java @@ -17,8 +17,8 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java index a0e2bf24649..220b71f7e03 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object object = new AMDTestI(); - adapter.add(object, communicator().stringToIdentity("Test")); + adapter.add(object, Ice.Util.stringToIdentity("Test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java index f56e422e8d0..529194081fe 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java @@ -17,7 +17,7 @@ public class AMDServer extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new AMDTestI(); - adapter.add(object, communicator.stringToIdentity("Test")); + adapter.add(object, Ice.Util.stringToIdentity("Test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java index 6af09354e47..68ae4707319 100644 --- a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new PriorityI(), communicator().stringToIdentity("test")); + adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java index 9313d235b79..fb81f2fc963 100644 --- a/java/test/src/main/java/test/Ice/throughput/Server.java +++ b/java/test/src/main/java/test/Ice/throughput/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Throughput"); - adapter.add(new ThroughputI(), communicator().stringToIdentity("throughput")); + adapter.add(new ThroughputI(), Ice.Util.stringToIdentity("throughput")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java index 17e75826a1e..3d4982f6305 100644 --- a/java/test/src/main/java/test/Ice/timeout/Server.java +++ b/java/test/src/main/java/test/Ice/timeout/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); + adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java index 1cca643df30..02b6fca4ab1 100644 --- a/java/test/src/main/java/test/Ice/udp/Server.java +++ b/java/test/src/main/java/test/Ice/udp/Server.java @@ -26,21 +26,21 @@ public class Server extends test.Util.Application } properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter"); - adapter.add(new TestIntfI(), communicator().stringToIdentity("control")); + adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control")); adapter.activate(); if(port == 12010) { properties.setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter"); - adapter2.add(new TestIntfI(), communicator().stringToIdentity("test")); + adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); adapter2.activate(); } if(!isAndroid()) { Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter"); - mcastAdapter.add(new TestIntfI(), communicator().stringToIdentity("test")); + mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); mcastAdapter.activate(); } diff --git a/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java index 1f6b33c47e7..d12a648b819 100644 --- a/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java +++ b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java @@ -18,7 +18,7 @@ public class TestServiceI implements IceBox.Service communicator.getProperties().setProperty("Ice.Package.Test", "test.IceBox.configuration"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name + "OA"); - adapter.add(new TestI(args), communicator.stringToIdentity("test")); + adapter.add(new TestI(args), Ice.Util.stringToIdentity("test")); adapter.activate(); } diff --git a/java/test/src/main/java/test/IceDiscovery/simple/Server.java b/java/test/src/main/java/test/IceDiscovery/simple/Server.java index 71fdd790be4..28db45ec264 100644 --- a/java/test/src/main/java/test/IceDiscovery/simple/Server.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/Server.java @@ -30,7 +30,7 @@ public class Server extends test.Util.Application properties.setProperty("ControlAdapter.ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter"); - adapter.add(new ControllerI(), communicator().stringToIdentity("controller" + num)); + adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num)); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java index 408ab6a1488..e1ea3916029 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Server.java +++ b/java/test/src/main/java/test/IceGrid/simple/Server.java @@ -21,7 +21,7 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(); String id = communicator().getProperties().getPropertyWithDefault("Identity", "test"); - adapter.add(object, communicator().stringToIdentity(id)); + adapter.add(object, Ice.Util.stringToIdentity(id)); //shutdownOnInterrupt(); try { diff --git a/java/test/src/main/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java index 22e1187bbb3..54aeb9a9f0f 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Server.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java @@ -18,7 +18,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new ServerFactoryI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Slice/keyword/Client.java b/java/test/src/main/java/test/Slice/keyword/Client.java index e619268afa6..c972b6320f1 100644 --- a/java/test/src/main/java/test/Slice/keyword/Client.java +++ b/java/test/src/main/java/test/Slice/keyword/Client.java @@ -161,13 +161,13 @@ public class Client run(String[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new defaultI(), communicator.stringToIdentity("test")); + adapter.add(new defaultI(), Ice.Util.stringToIdentity("test")); adapter.activate(); System.out.print("Testing operation name... "); System.out.flush(); defaultPrx p = defaultPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test"))); + adapter.createProxy(Ice.Util.stringToIdentity("test"))); p._do(); System.out.println("ok"); diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/Communicator.js index f80d3e56576..9d1d7ed3102 100644 --- a/js/src/Ice/Communicator.js +++ b/js/src/Ice/Communicator.js @@ -70,11 +70,11 @@ var Communicator = Ice.Class({ }, stringToIdentity: function(s) { - return this._instance.stringToIdentity(s); + return Ice.stringToIdentity(s); }, identityToString: function(ident) { - return this._instance.identityToString(ident); + return Ice.identityToString(ident); }, createObjectAdapter: function(name) { diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js index a788fccd4f4..619ffd70892 100644 --- a/js/src/Ice/IncomingAsync.js +++ b/js/src/Ice/IncomingAsync.js @@ -136,7 +136,7 @@ var IncomingAsync = Ice.Class({ var s = []; s.push("dispatch exception:"); - s.push("\nidentity: " + this._instance.identityToString(this._current.id)); + s.push("\nidentity: " + Ice.identityToString(this._current.id)); s.push("\nfacet: " + StringUtil.escapeString(this._current.facet, "")); s.push("\noperation: " + this._current.operation); if(this._connection !== null) diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js index fa09b168058..c094704f27f 100644 --- a/js/src/Ice/Instance.js +++ b/js/src/Ice/Instance.js @@ -237,15 +237,6 @@ var Instance = Ice.Class({ { return this._implicitContext; }, - stringToIdentity: function(s) - { - return Ice.stringToIdentity(s); - }, - identityToString: function(ident) - { - return Ice.identityToString(ident); - }, - setDefaultLocator: function(locator) { if(this._state == StateDestroyed) diff --git a/js/src/Ice/LocatorInfo.js b/js/src/Ice/LocatorInfo.js index 97cfb1bb649..1624727fca9 100644 --- a/js/src/Ice/LocatorInfo.js +++ b/js/src/Ice/LocatorInfo.js @@ -194,7 +194,7 @@ var LocatorInfo = Class({ else { s.push("object = "); - s.push(ref.getInstance().identityToString(ref.getIdentity())); + s.push(Ice.identityToString(ref.getIdentity())); s.push("\n"); } @@ -245,13 +245,13 @@ var LocatorInfo = Class({ s = []; s.push("object not found\n"); s.push("object = "); - s.push(instance.identityToString(ref.getIdentity())); + s.push(Ice.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join("")); } e = new Ice.NotRegisteredException(); e.kindOfObject = "object"; - e.id = instance.identityToString(ref.getIdentity()); + e.id = Ice.identityToString(ref.getIdentity()); throw e; } else if(ex instanceof Ice.NotRegisteredException) @@ -273,7 +273,7 @@ var LocatorInfo = Class({ else { s.push("object = "); - s.push(instance.identityToString(ref.getIdentity())); + s.push(Ice.identityToString(ref.getIdentity())); s.push("\n"); } s.push("reason = " + ex.toString()); @@ -316,7 +316,7 @@ var LocatorInfo = Class({ { s.push("object\n"); s.push("object = "); - s.push(instance.identityToString(ref.getIdentity())); + s.push(Ice.identityToString(ref.getIdentity())); s.push("\n"); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join("")); @@ -351,7 +351,7 @@ var LocatorInfo = Class({ var s = []; s.push("searching for object by id\n"); s.push("object = "); - s.push(instance.identityToString(ref.getIdentity())); + s.push(Ice.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join("")); } diff --git a/js/src/Ice/ObjectAdapterI.js b/js/src/Ice/ObjectAdapterI.js index c711441c3d1..3d556a51235 100644 --- a/js/src/Ice/ObjectAdapterI.js +++ b/js/src/Ice/ObjectAdapterI.js @@ -184,7 +184,7 @@ var ObjectAdapterI = Ice.Class({ { throw new Ice.AlreadyRegisteredException( "object adapter with router", - this._instance.identityToString(router.ice_getIdentity())); + Ice.identityToString(router.ice_getIdentity())); } // diff --git a/js/src/Ice/Operation.js b/js/src/Ice/Operation.js index b32cac1f168..bc115ba8c0e 100644 --- a/js/src/Ice/Operation.js +++ b/js/src/Ice/Operation.js @@ -374,7 +374,7 @@ var __dispatchImpl = function(servant, op, incomingAsync, current) if(method === undefined || typeof(method) !== "function") { var comm = current.adapter.getCommunicator(); - var msg = "servant for identity " + comm.identityToString(current.id) + + var msg = "servant for identity " + Ice.identityToString(current.id) + " does not define operation `" + op.servantMethod + "'"; throw new Ice.UnknownException(msg); } diff --git a/js/src/Ice/Reference.js b/js/src/Ice/Reference.js index e548b6c4117..1234387099d 100644 --- a/js/src/Ice/Reference.js +++ b/js/src/Ice/Reference.js @@ -178,7 +178,7 @@ var ReferenceFactory = Class({ // // Parsing the identity may raise IdentityParseException. // - var ident = this._instance.stringToIdentity(idstr); + var ident = Ice.stringToIdentity(idstr); if(ident.name.length === 0) { @@ -1239,7 +1239,7 @@ var Reference = Class({ // the reference parser uses as separators, then we enclose // the identity string in quotes. // - var id = this._instance.identityToString(this._identity); + var id = Ice.identityToString(this._identity); if(id.search(/[ :@]/) != -1) { s.push('"'); diff --git a/js/src/Ice/ServantManager.js b/js/src/Ice/ServantManager.js index 02877feedfa..ef71975cbb2 100644 --- a/js/src/Ice/ServantManager.js +++ b/js/src/Ice/ServantManager.js @@ -53,7 +53,7 @@ var ServantManager = Ice.Class({ if(m.has(facet)) { var ex = new Ice.AlreadyRegisteredException(); - ex.id = this._instance.identityToString(ident); + ex.id = Ice.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length > 0) { @@ -93,7 +93,7 @@ var ServantManager = Ice.Class({ if(m === undefined || !m.has(facet)) { var ex = new Ice.NotRegisteredException(); - ex.id = this._instance.identityToString(ident); + ex.id = Ice.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length > 0) { @@ -136,7 +136,7 @@ var ServantManager = Ice.Class({ if(m === undefined) { var ex = new Ice.NotRegisteredException(); - ex.id = this._instance.identityToString(ident); + ex.id = Ice.identityToString(ident); ex.kindOfObject = "servant"; throw ex; } diff --git a/js/src/Ice/TraceUtil.js b/js/src/Ice/TraceUtil.js index a6b50d234cc..f341bb20232 100644 --- a/js/src/Ice/TraceUtil.js +++ b/js/src/Ice/TraceUtil.js @@ -184,7 +184,7 @@ function printIdentityFacetOperation(s, stream) { var identity = new Identity(); identity.__read(stream); - s.push("\nidentity = " + stream.instance.identityToString(identity)); + s.push("\nidentity = " + Ice.identityToString(identity)); var facet = Ice.StringSeqHelper.read(stream); s.push("\nfacet = "); diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index a7808d8b81c..384d108ff95 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -274,7 +274,7 @@ var context = new Ice.Context(); context.set("_fwd", "t"); var otherCategoryTwoway = CallbackPrx.uncheckedCast( - twoway.ice_identity(communicator.stringToIdentity("c2/callback"))); + twoway.ice_identity(Ice.stringToIdentity("c2/callback"))); return otherCategoryTwoway.initiateCallback(twowayR, context); } ).then( @@ -290,7 +290,7 @@ var context = new Ice.Context(); context.set("_fwd", "t"); var otherCategoryTwoway = CallbackPrx.uncheckedCast( - twoway.ice_identity(communicator.stringToIdentity("c3/callback"))); + twoway.ice_identity(Ice.stringToIdentity("c3/callback"))); return otherCategoryTwoway.initiateCallback(twowayR, context); } ).then( @@ -303,7 +303,7 @@ var context = new Ice.Context(); context.set("_fwd", "t"); var otherCategoryTwoway = CallbackPrx.uncheckedCast( - twoway.ice_identity(communicator.stringToIdentity("_userid/callback"))); + twoway.ice_identity(Ice.stringToIdentity("_userid/callback"))); return otherCategoryTwoway.initiateCallback(twowayR, context); } ).then( diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js index 50921c50d0f..7c54701e5b0 100644 --- a/js/test/Ice/exceptions/Client.js +++ b/js/test/Ice/exceptions/Client.js @@ -158,10 +158,10 @@ function(adapter) { var obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.stringToIdentity("x")); try { - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.stringToIdentity("x")); test(false); } catch(ex) @@ -170,7 +170,7 @@ } try { - adapter.add(obj, communicator.stringToIdentity("")); + adapter.add(obj, Ice.stringToIdentity("")); test(false); } catch(ex) @@ -180,7 +180,7 @@ } try { - adapter.add(null, communicator.stringToIdentity("x")); + adapter.add(null, Ice.stringToIdentity("x")); test(false); } catch(ex) @@ -188,10 +188,10 @@ test(ex instanceof Ice.IllegalServantException); } - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.stringToIdentity("x")); try { - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.stringToIdentity("x")); test(false); } catch(ex) @@ -385,7 +385,7 @@ function() { out.write("catching object not exist exception... "); - var id = communicator.stringToIdentity("does not exist"); + var id = Ice.stringToIdentity("does not exist"); var thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id)); return thrower2.ice_ping(); } @@ -394,7 +394,7 @@ function(ex) { test(ex instanceof Ice.ObjectNotExistException); - test(ex.id.equals(communicator.stringToIdentity("does not exist"))); + test(ex.id.equals(Ice.stringToIdentity("does not exist"))); out.writeLine("ok"); out.write("catching facet not exist exception... "); var thrower2 = Test.ThrowerPrx.uncheckedCast(thrower, "no such facet"); diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js index 6196368f20e..a7482dd22a1 100644 --- a/js/test/Ice/exceptionsBidir/Client.js +++ b/js/test/Ice/exceptionsBidir/Client.js @@ -30,11 +30,11 @@ { if(amd) { - adapter.add(new AMDThrowerI(), communicator.stringToIdentity("thrower")); + adapter.add(new AMDThrowerI(), Ice.stringToIdentity("thrower")); } else { - adapter.add(new ThrowerI(), communicator.stringToIdentity("thrower")); + adapter.add(new ThrowerI(), Ice.stringToIdentity("thrower")); } var base = communicator.stringToProxy("thrower:default -p 12010"); return base.ice_getConnection().then( diff --git a/js/test/Ice/facetsBidir/Client.js b/js/test/Ice/facetsBidir/Client.js index c8aa72d2a85..cadc1356968 100644 --- a/js/test/Ice/facetsBidir/Client.js +++ b/js/test/Ice/facetsBidir/Client.js @@ -50,21 +50,21 @@ function(adapter) { var obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("d")); - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(obj, Ice.stringToIdentity("d")); + adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD"); try { - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD"); test(false); } catch(ex) { test(ex instanceof Ice.AlreadyRegisteredException); } - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD"); try { - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD"); test(false); } catch(ex) @@ -76,26 +76,26 @@ out.write("testing removeAllFacets... "); var obj1 = new EmptyI(); var obj2 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2"); + adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1"); + adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2"); var obj3 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2"); - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), ""); - var fm = adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1"); + adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2"); + adapter.addFacet(obj3, Ice.stringToIdentity("id2"), ""); + var fm = adapter.removeAllFacets(Ice.stringToIdentity("id1")); test(fm.size === 2); test(fm.get("f1") === obj1); test(fm.get("f2") === obj2); try { - adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.removeAllFacets(Ice.stringToIdentity("id1")); test(false); } catch(ex) { test(ex instanceof Ice.NotRegisteredException); } - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")); + fm = adapter.removeAllFacets(Ice.stringToIdentity("id2")); test(fm.size == 3); test(fm.get("f1") === obj1); test(fm.get("f2") === obj2); @@ -113,12 +113,12 @@ function(adapter) { var di = new DI(); - adapter.add(di, communicator.stringToIdentity("d")); - adapter.addFacet(di, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(di, Ice.stringToIdentity("d")); + adapter.addFacet(di, Ice.stringToIdentity("d"), "facetABCD"); var fi = new FI(); - adapter.addFacet(fi, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(fi, Ice.stringToIdentity("d"), "facetEF"); var hi = new HI(); - adapter.addFacet(hi, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(hi, Ice.stringToIdentity("d"), "facetGH"); var prx = Ice.ObjectPrx.uncheckedCast(communicator.stringToProxy("d:default -p 12010")); return prx.ice_getConnection().then( diff --git a/js/test/Ice/inheritanceBidir/Client.js b/js/test/Ice/inheritanceBidir/Client.js index 934c335929c..1b39fb22b1b 100644 --- a/js/test/Ice/inheritanceBidir/Client.js +++ b/js/test/Ice/inheritanceBidir/Client.js @@ -25,7 +25,7 @@ function(adapter) { var base = communicator.stringToProxy("initial:default -p 12010"); - adapter.add(new InitialI(adapter, base), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(adapter, base), Ice.stringToIdentity("initial")); return base.ice_getConnection().then( function(conn) { diff --git a/js/test/Ice/operations/BatchOneways.js b/js/test/Ice/operations/BatchOneways.js index c660fb0e1a1..5c4b62164b4 100644 --- a/js/test/Ice/operations/BatchOneways.js +++ b/js/test/Ice/operations/BatchOneways.js @@ -124,7 +124,7 @@ ).then( function() { - var identity = communicator.stringToIdentity("invalid"); + var identity = Ice.stringToIdentity("invalid"); batch3 = batch.ice_identity(identity); return batch3.ice_ping(); } diff --git a/js/test/Ice/operations/Twoways.js b/js/test/Ice/operations/Twoways.js index 4d238a5a0d5..8a098a5eb69 100644 --- a/js/test/Ice/operations/Twoways.js +++ b/js/test/Ice/operations/Twoways.js @@ -309,9 +309,9 @@ ).then( function(retval, p2, p3) { - test(p2.ice_getIdentity().equals(communicator.stringToIdentity("test"))); - test(p3.ice_getIdentity().equals(communicator.stringToIdentity("noSuchIdentity"))); - test(retval.ice_getIdentity().equals(communicator.stringToIdentity("test"))); + test(p2.ice_getIdentity().equals(Ice.stringToIdentity("test"))); + test(p3.ice_getIdentity().equals(Ice.stringToIdentity("noSuchIdentity"))); + test(retval.ice_getIdentity().equals(Ice.stringToIdentity("test"))); si1 = new Test.Structure(); si1.p = prx; diff --git a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js index 4b8321be069..89b164f9388 100644 --- a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js +++ b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js @@ -143,7 +143,7 @@ { var p2 = p1; var p3 = TestAMD.MyClassPrx.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity"))); var r = TestAMD.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)); cb.ice_response(r, p2, p3); }, diff --git a/js/test/Ice/operationsBidir/Client.js b/js/test/Ice/operationsBidir/Client.js index 82d0add0ffe..1db516e498e 100644 --- a/js/test/Ice/operationsBidir/Client.js +++ b/js/test/Ice/operationsBidir/Client.js @@ -25,11 +25,11 @@ { if(amd) { - adapter.add(new AMDMyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new AMDMyDerivedClassI(), Ice.stringToIdentity("test")); } else { - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.stringToIdentity("test")); } var base = communicator.stringToProxy("test:default -p 12010"); return base.ice_getConnection().then( diff --git a/js/test/Ice/operationsBidir/MyDerivedClassI.js b/js/test/Ice/operationsBidir/MyDerivedClassI.js index cdfb00eb2ff..930345c9b85 100644 --- a/js/test/Ice/operationsBidir/MyDerivedClassI.js +++ b/js/test/Ice/operationsBidir/MyDerivedClassI.js @@ -141,7 +141,7 @@ { var p2 = p1; var p3 = Test.MyClassPrx.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity"))); var r = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)); return [r, p2, p3]; }, diff --git a/js/test/Ice/optionalBidir/Client.js b/js/test/Ice/optionalBidir/Client.js index 5365fe678d5..0e8a55de779 100644 --- a/js/test/Ice/optionalBidir/Client.js +++ b/js/test/Ice/optionalBidir/Client.js @@ -33,11 +33,11 @@ { if(amd) { - adapter.add(new AMDInitialI(), communicator.stringToIdentity("initial")); + adapter.add(new AMDInitialI(), Ice.stringToIdentity("initial")); } else { - adapter.add(new InitialI(), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.stringToIdentity("initial")); } return base.ice_getConnection().then( function(conn) diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index b3fcee3ff5d..9faca3b4160 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -326,11 +326,11 @@ // Test for bug ICE-5543: escaped escapes in stringToIdentity // var id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\"); - var id2 = communicator.stringToIdentity(communicator.identityToString(id)); + var id2 = Ice.stringToIdentity(Ice.identityToString(id)); test(id.equals(id2)); id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"); - id2 = communicator.stringToIdentity(communicator.identityToString(id)); + id2 = Ice.stringToIdentity(Ice.identityToString(id)); test(id.equals(id2)); out.writeLine("ok"); @@ -488,7 +488,9 @@ out.write("testing proxy methods... "); test(communicator.identityToString( - base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()) === "other"); + base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other"); + test(Ice.identityToString( + base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other"); test(base.ice_facet("facet").ice_getFacet() === "facet"); test(base.ice_adapterId("id").ice_getAdapterId() === "id"); test(base.ice_twoway().ice_isTwoway()); diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h index 14603c81959..5dcaa28eb79 100644 --- a/objective-c/include/objc/Ice/Initialize.h +++ b/objective-c/include/objc/Ice/Initialize.h @@ -76,6 +76,8 @@ ICE_API @interface ICEUtil : NSObject +(NSString*) generateUUID; +(NSArray*)argsToStringSeq:(int)argc argv:(char*[])argv; +(void)stringSeqToArgs:(NSArray*)args argc:(int*)argc argv:(char*[])argv; ++(ICEIdentity*) stringToIdentity:(NSString*)str; ++(NSMutableString*) identityToString:(ICEIdentity*)ident; @end @interface ICEEncodingVersion(StringConv) diff --git a/objective-c/src/Ice/CommunicatorI.mm b/objective-c/src/Ice/CommunicatorI.mm index 94b9314e58e..3110c72e47d 100644 --- a/objective-c/src/Ice/CommunicatorI.mm +++ b/objective-c/src/Ice/CommunicatorI.mm @@ -237,32 +237,12 @@ -(ICEIdentity*) stringToIdentity:(NSString*)str { - NSException* nsex = nil; - try - { - return [ICEIdentity identityWithIdentity:COMMUNICATOR->stringToIdentity(fromNSString(str))]; - } - catch(const std::exception& ex) - { - nsex = toObjCException(ex); - } - @throw nsex; - return nil; // Keep the compiler happy. + return [ICEUtil stringToIdentity:str]; } -(NSMutableString*) identityToString:(ICEIdentity*)ident { - NSException* nsex = nil; - try - { - return [toNSMutableString(COMMUNICATOR->identityToString([ident identity])) autorelease]; - } - catch(const std::exception& ex) - { - nsex = toObjCException(ex); - } - @throw nsex; - return nil; // Keep the compiler happy. + return [ICEUtil identityToString:ident]; } -(id<ICEObjectAdapter>) createObjectAdapter:(NSString*)name; diff --git a/objective-c/src/Ice/Initialize.mm b/objective-c/src/Ice/Initialize.mm index b1ea0d6dd38..0e23324738f 100644 --- a/objective-c/src/Ice/Initialize.mm +++ b/objective-c/src/Ice/Initialize.mm @@ -12,6 +12,7 @@ #import <CommunicatorI.h> #import <StreamI.h> #import <LoggerI.h> +#import <IdentityI.h> #import <DispatcherI.h> #import <BatchRequestInterceptorI.h> #import <Util.h> @@ -492,7 +493,7 @@ private: return [[ns copy] autorelease]; } -+(void)stringSeqToArgs:(NSArray*)args argc:(int*)argc argv:(char*[])argv; ++(void)stringSeqToArgs:(NSArray*)args argc:(int*)argc argv:(char*[])argv { // // Shift all elements in argv which are present in args to the @@ -537,6 +538,36 @@ private: argv[*argc] = 0; } } + ++(ICEIdentity*) stringToIdentity:(NSString*)str +{ + NSException* nsex = nil; + try + { + return [ICEIdentity identityWithIdentity:Ice::stringToIdentity(fromNSString(str))]; + } + catch(const std::exception& ex) + { + nsex = toObjCException(ex); + } + @throw nsex; + return nil; // Keep the compiler happy. +} + ++(NSMutableString*) identityToString:(ICEIdentity*)ident +{ + NSException* nsex = nil; + try + { + return [toNSMutableString(Ice::identityToString([ident identity])) autorelease]; + } + catch(const std::exception& ex) + { + nsex = toObjCException(ex); + } + @throw nsex; + return nil; // Keep the compiler happy. +} @end @implementation ICEEncodingVersion(StringConv) diff --git a/objective-c/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m index 0ad0740a725..aef70f88ee1 100644 --- a/objective-c/test/Ice/acm/Server.m +++ b/objective-c/test/Ice/acm/Server.m @@ -18,7 +18,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.ACM.Timeout" value:@"0"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; [adapter add:[RemoteCommunicatorI remoteCommunicator] - identity:[communicator stringToIdentity:@"communicator"]]; + identity:[ICEUtil stringToIdentity:@"communicator"]]; [adapter activate]; // Disable ready print for further adapters. diff --git a/objective-c/test/Ice/acm/TestI.m b/objective-c/test/Ice/acm/TestI.m index 719812690b7..9de5e23b4f2 100644 --- a/objective-c/test/Ice/acm/TestI.m +++ b/objective-c/test/Ice/acm/TestI.m @@ -104,7 +104,7 @@ } _adapter = ICE_RETAIN(adapter); _testIntf = ICE_RETAIN([TestACMTestIntfPrx uncheckedCast:[_adapter add:[TestACMTestIntfI testIntf] - identity:[[_adapter getCommunicator] stringToIdentity:@"test"]]]); + identity:[ICEUtil stringToIdentity:@"test"]]]); [_adapter activate]; return self; diff --git a/objective-c/test/Ice/adapterDeactivation/Collocated.m b/objective-c/test/Ice/adapterDeactivation/Collocated.m index 159430fc682..cad82e310a7 100644 --- a/objective-c/test/Ice/adapterDeactivation/Collocated.m +++ b/objective-c/test/Ice/adapterDeactivation/Collocated.m @@ -16,7 +16,7 @@ run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; - [adapter add:[TestAdapterDeactivationI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestAdapterDeactivationI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; id<TestAdapterDeactivationTestIntfPrx> adapterDeactivationAllTests(id<ICECommunicator>); adapterDeactivationAllTests(communicator); diff --git a/objective-c/test/Ice/adapterDeactivation/Server.m b/objective-c/test/Ice/adapterDeactivation/Server.m index bc55c8015c1..9220a3e4a5e 100644 --- a/objective-c/test/Ice/adapterDeactivation/Server.m +++ b/objective-c/test/Ice/adapterDeactivation/Server.m @@ -16,7 +16,7 @@ run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; - [adapter add:[TestAdapterDeactivationI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestAdapterDeactivationI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/admin/AllTests.m b/objective-c/test/Ice/admin/AllTests.m index f0d1dfca0ef..99af8b05cfe 100644 --- a/objective-c/test/Ice/admin/AllTests.m +++ b/objective-c/test/Ice/admin/AllTests.m @@ -254,7 +254,7 @@ adminAllTests(id<ICECommunicator> communicator) id<ICECommunicator> com = [ICEUtil createCommunicator:init]; test([com getAdmin] == nil); - ICEIdentity* ident = [com stringToIdentity:@"test-admin"]; + ICEIdentity* ident = [ICEUtil stringToIdentity:@"test-admin"]; @try { [com createAdmin:nil adminId:ident]; diff --git a/objective-c/test/Ice/admin/Server.m b/objective-c/test/Ice/admin/Server.m index feb14756b80..486394d0601 100644 --- a/objective-c/test/Ice/admin/Server.m +++ b/objective-c/test/Ice/admin/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010 -t 10000"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; [adapter add:[TestAdminRemoteCommunicatorFactoryI remoteCommunicatorFactory] - identity:[communicator stringToIdentity:@"factory"]]; + identity:[ICEUtil stringToIdentity:@"factory"]]; [adapter activate]; // Disable ready print for further adapters. diff --git a/objective-c/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m index 8e22c8dfd79..e9496af9fe4 100644 --- a/objective-c/test/Ice/ami/Collocated.m +++ b/objective-c/test/Ice/ami/Collocated.m @@ -24,10 +24,10 @@ run(id<ICECommunicator> communicator) TestAMITestIntfControllerI* testController = ICE_AUTORELEASE([[TestAMITestIntfControllerI alloc] initWithAdapter:adapter]); - [adapter add:[TestAMITestIntfI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestAMITestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; //[adapter activate]; // Collocated test doesn't need to activate the OA - [adapter2 add:testController identity:[communicator stringToIdentity:@"testController"]]; + [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]]; //[adapter2 activate]; // Collocated test doesn't need to activate the OA void amiAllTests(id<ICECommunicator>, BOOL); diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m index 7478d93d4e9..98ccd7b9cce 100644 --- a/objective-c/test/Ice/ami/Server.m +++ b/objective-c/test/Ice/ami/Server.m @@ -24,10 +24,10 @@ run(id<ICECommunicator> communicator) TestAMITestIntfControllerI* testController = ICE_AUTORELEASE([[TestAMITestIntfControllerI alloc] initWithAdapter:adapter]); - [adapter add:[TestAMITestIntfI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestAMITestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; - [adapter2 add:testController identity:[communicator stringToIdentity:@"testController"]]; + [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]]; [adapter2 activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/binding/AllTests.m b/objective-c/test/Ice/binding/AllTests.m index 287bab80c5b..e2fc2ecd0ca 100644 --- a/objective-c/test/Ice/binding/AllTests.m +++ b/objective-c/test/Ice/binding/AllTests.m @@ -137,7 +137,7 @@ createTestIntfPrx(NSArray* adapters) test = [a getTestIntf]; [endpoints addObjectsFromArray:getEndpoints(test)]; } - NSString* proxy = [[test ice_getCommunicator] identityToString:[test ice_getIdentity]]; + NSString* proxy = [ICEUtil identityToString:[test ice_getIdentity]]; for(NSString* e in endpoints) { proxy = [proxy stringByAppendingString:@":"]; diff --git a/objective-c/test/Ice/binding/Server.m b/objective-c/test/Ice/binding/Server.m index 268196f5b6b..c7f0bcd1c42 100644 --- a/objective-c/test/Ice/binding/Server.m +++ b/objective-c/test/Ice/binding/Server.m @@ -16,7 +16,7 @@ run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; - [adapter add:[RemoteCommunicatorI remoteCommunicator] identity:[communicator stringToIdentity:@"communicator"]]; + [adapter add:[RemoteCommunicatorI remoteCommunicator] identity:[ICEUtil stringToIdentity:@"communicator"]]; [adapter activate]; // Disable ready print for further adapters. diff --git a/objective-c/test/Ice/binding/TestI.m b/objective-c/test/Ice/binding/TestI.m index 006f979d634..d739a6b2543 100644 --- a/objective-c/test/Ice/binding/TestI.m +++ b/objective-c/test/Ice/binding/TestI.m @@ -55,7 +55,7 @@ adapter_ = ICE_RETAIN(adapter); testIntf_ = ICE_RETAIN([TestBindingTestIntfPrx uncheckedCast:[ adapter_ add:[TestBindingI testIntf] - identity:[[adapter_ getCommunicator] stringToIdentity:@"test"]]]); + identity:[ICEUtil stringToIdentity:@"test"]]]); [adapter_ activate]; return self; } diff --git a/objective-c/test/Ice/dispatcher/Collocated.m b/objective-c/test/Ice/dispatcher/Collocated.m index 94d547bfa4b..2836b039160 100644 --- a/objective-c/test/Ice/dispatcher/Collocated.m +++ b/objective-c/test/Ice/dispatcher/Collocated.m @@ -27,10 +27,10 @@ run(id<ICECommunicator> communicator) ICEObject* object = [TestDispatcherTestIntfI testIntf]; - [adapter add:object identity:[communicator stringToIdentity:@"test"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"test"]]; //[adapter activate]; // Don't activate OA to ensure collocation is used. - [adapter2 add:testController identity:[communicator stringToIdentity:@"testController"]]; + [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]]; //[adapter2 activate]; // Don't activate OA to ensure collocation is used. TestDispatcherTestIntfPrx* dispatcherAllTests(id<ICECommunicator>); diff --git a/objective-c/test/Ice/dispatcher/Server.m b/objective-c/test/Ice/dispatcher/Server.m index 0513b436a7f..f02504b0612 100644 --- a/objective-c/test/Ice/dispatcher/Server.m +++ b/objective-c/test/Ice/dispatcher/Server.m @@ -27,10 +27,10 @@ run(id<ICECommunicator> communicator) ICEObject* object = [TestDispatcherTestIntfI testIntf]; - [adapter add:object identity:[communicator stringToIdentity:@"test"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; - [adapter2 add:testController identity:[communicator stringToIdentity:@"testController"]]; + [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]]; [adapter2 activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/enums/Server.m b/objective-c/test/Ice/enums/Server.m index b3489bb3c21..7b88065e3da 100644 --- a/objective-c/test/Ice/enums/Server.m +++ b/objective-c/test/Ice/enums/Server.m @@ -16,7 +16,7 @@ run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; - [adapter add:[TestEnumTestIntfI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestEnumTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/exceptions/AllTests.m b/objective-c/test/Ice/exceptions/AllTests.m index d701479ed9b..ce4c5aa5640 100644 --- a/objective-c/test/Ice/exceptions/AllTests.m +++ b/objective-c/test/Ice/exceptions/AllTests.m @@ -66,20 +66,20 @@ exceptionsAllTests(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter1.Endpoints" value:@"default"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter1"]; ICEObject* obj = [ExceptionsEmptyI empty]; - [adapter add:obj identity:[communicator stringToIdentity:@"x"]]; + [adapter add:obj identity:[ICEUtil stringToIdentity:@"x"]]; @try { - [adapter add:obj identity:[communicator stringToIdentity:@"x"]]; + [adapter add:obj identity:[ICEUtil stringToIdentity:@"x"]]; test(false); } @catch(ICEAlreadyRegisteredException *ex) { } - [adapter remove:[communicator stringToIdentity:@"x"]]; + [adapter remove:[ICEUtil stringToIdentity:@"x"]]; @try { - [adapter remove:[communicator stringToIdentity:@"x"]]; + [adapter remove:[ICEUtil stringToIdentity:@"x"]]; test(false); } @catch(ICENotRegisteredException *ex) @@ -405,7 +405,7 @@ exceptionsAllTests(id<ICECommunicator> communicator) tprintf("catching object not exist exception... "); - ICEIdentity *id_ = [communicator stringToIdentity:@"does not exist"]; + ICEIdentity *id_ = [ICEUtil stringToIdentity:@"does not exist"]; @try { id<TestExceptionsThrowerPrx> thrower2 = [TestExceptionsThrowerPrx uncheckedCast:[thrower ice_identity:id_]]; diff --git a/objective-c/test/Ice/exceptions/Collocated.m b/objective-c/test/Ice/exceptions/Collocated.m index c86e8085226..624d8a4e91d 100644 --- a/objective-c/test/Ice/exceptions/Collocated.m +++ b/objective-c/test/Ice/exceptions/Collocated.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [ThrowerI thrower]; - [adapter add:object identity:[communicator stringToIdentity:@"thrower"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"thrower"]]; TestExceptionsThrowerPrx* exceptionsAllTests(id<ICECommunicator>); exceptionsAllTests(communicator); diff --git a/objective-c/test/Ice/exceptions/Server.m b/objective-c/test/Ice/exceptions/Server.m index 259d547a884..9f0963a7b4f 100644 --- a/objective-c/test/Ice/exceptions/Server.m +++ b/objective-c/test/Ice/exceptions/Server.m @@ -24,9 +24,9 @@ run(id<ICECommunicator> communicator) id<ICEObjectAdapter> adapter2 = [communicator createObjectAdapter:@"TestAdapter2"]; id<ICEObjectAdapter> adapter3 = [communicator createObjectAdapter:@"TestAdapter3"]; ICEObject* object = [ThrowerI thrower]; - [adapter add:object identity:[communicator stringToIdentity:@"thrower"]]; - [adapter2 add:object identity:[communicator stringToIdentity:@"thrower"]]; - [adapter3 add:object identity:[communicator stringToIdentity:@"thrower"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"thrower"]]; + [adapter2 add:object identity:[ICEUtil stringToIdentity:@"thrower"]]; + [adapter3 add:object identity:[ICEUtil stringToIdentity:@"thrower"]]; [adapter activate]; [adapter2 activate]; [adapter3 activate]; diff --git a/objective-c/test/Ice/facets/AllTests.m b/objective-c/test/Ice/facets/AllTests.m index b20960e9273..7cf76ee0aff 100644 --- a/objective-c/test/Ice/facets/AllTests.m +++ b/objective-c/test/Ice/facets/AllTests.m @@ -45,20 +45,20 @@ facetsAllTests(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"FacetExceptionTestAdapter.Endpoints" value:@"default"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"FacetExceptionTestAdapter"]; ICEObject* obj = [FacetsEmptyI empty]; - [adapter add:obj identity:[communicator stringToIdentity:@"d"]]; - [adapter addFacet:obj identity:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter add:obj identity:[ICEUtil stringToIdentity:@"d"]]; + [adapter addFacet:obj identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; @try { - [adapter addFacet:obj identity:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter addFacet:obj identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; test(NO); } @catch(ICEAlreadyRegisteredException*) { } - [adapter removeFacet:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter removeFacet:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; @try { - [adapter removeFacet:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter removeFacet:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; test(NO); } @catch(ICENotRegisteredException*) @@ -70,27 +70,27 @@ facetsAllTests(id<ICECommunicator> communicator) ICEObject* obj1 = [FacetsEmptyI empty]; ICEObject* obj2 = [FacetsEmptyI empty]; - [adapter addFacet:obj1 identity:[communicator stringToIdentity:@"id1"] facet:@"f1"]; - [adapter addFacet:obj2 identity:[communicator stringToIdentity:@"id1"] facet:@"f2"]; + [adapter addFacet:obj1 identity:[ICEUtil stringToIdentity:@"id1"] facet:@"f1"]; + [adapter addFacet:obj2 identity:[ICEUtil stringToIdentity:@"id1"] facet:@"f2"]; ICEObject* obj3 = [FacetsEmptyI empty]; - [adapter addFacet:obj1 identity:[communicator stringToIdentity:@"id2"] facet:@"f1"]; - [adapter addFacet:obj2 identity:[communicator stringToIdentity:@"id2"] facet:@"f2"]; - [adapter addFacet:obj3 identity:[communicator stringToIdentity:@"id2"] facet:@""]; - NSDictionary* fm = [adapter removeAllFacets:[communicator stringToIdentity:@"id1"]]; + [adapter addFacet:obj1 identity:[ICEUtil stringToIdentity:@"id2"] facet:@"f1"]; + [adapter addFacet:obj2 identity:[ICEUtil stringToIdentity:@"id2"] facet:@"f2"]; + [adapter addFacet:obj3 identity:[ICEUtil stringToIdentity:@"id2"] facet:@""]; + NSDictionary* fm = [adapter removeAllFacets:[ICEUtil stringToIdentity:@"id1"]]; test([fm count] == 2); test([fm objectForKey:@"f1"] == obj1); test([fm objectForKey:@"f2"] == obj2); @try { - [adapter removeAllFacets:[communicator stringToIdentity:@"id1"]]; + [adapter removeAllFacets:[ICEUtil stringToIdentity:@"id1"]]; test(NO); } @catch(ICENotRegisteredException*) { } - fm = [adapter removeAllFacets:[communicator stringToIdentity:@"id2"]]; + fm = [adapter removeAllFacets:[ICEUtil stringToIdentity:@"id2"]]; test([fm count] == 3); test([fm objectForKey:@"f1"] == obj1); test([fm objectForKey:@"f2"] == obj2); diff --git a/objective-c/test/Ice/facets/Collocated.m b/objective-c/test/Ice/facets/Collocated.m index b2810cd1cab..6dc77865cff 100644 --- a/objective-c/test/Ice/facets/Collocated.m +++ b/objective-c/test/Ice/facets/Collocated.m @@ -19,10 +19,10 @@ run(id<ICECommunicator> communicator) ICEObject* d = [TestFacetsDI d]; ICEObject* f = [TestFacetsFI f]; ICEObject* h = [TestFacetsHI h]; - [adapter add:d identity:[communicator stringToIdentity:@"d"]]; - [adapter addFacet:d identity:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; - [adapter addFacet:f identity:[communicator stringToIdentity:@"d"] facet:@"facetEF"]; - [adapter addFacet:h identity:[communicator stringToIdentity:@"d"] facet:@"facetGH"]; + [adapter add:d identity:[ICEUtil stringToIdentity:@"d"]]; + [adapter addFacet:d identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter addFacet:f identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetEF"]; + [adapter addFacet:h identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetGH"]; id<TestFacetsGPrx> facetsAllTests(id<ICECommunicator>); facetsAllTests(communicator); diff --git a/objective-c/test/Ice/facets/Server.m b/objective-c/test/Ice/facets/Server.m index 1f0d4cde3bd..3c9f52bd776 100644 --- a/objective-c/test/Ice/facets/Server.m +++ b/objective-c/test/Ice/facets/Server.m @@ -19,10 +19,10 @@ run(id<ICECommunicator> communicator) ICEObject* d = [TestFacetsDI d]; ICEObject* f = [TestFacetsFI f]; ICEObject* h = [TestFacetsHI h]; - [adapter add:d identity:[communicator stringToIdentity:@"d"]]; - [adapter addFacet:d identity:[communicator stringToIdentity:@"d"] facet:@"facetABCD"]; - [adapter addFacet:f identity:[communicator stringToIdentity:@"d"] facet:@"facetEF"]; - [adapter addFacet:h identity:[communicator stringToIdentity:@"d"] facet:@"facetGH"]; + [adapter add:d identity:[ICEUtil stringToIdentity:@"d"]]; + [adapter addFacet:d identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetABCD"]; + [adapter addFacet:f identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetEF"]; + [adapter addFacet:h identity:[ICEUtil stringToIdentity:@"d"] facet:@"facetGH"]; [adapter activate]; diff --git a/objective-c/test/Ice/faultTolerance/Server.m b/objective-c/test/Ice/faultTolerance/Server.m index fdba3426941..792893cca60 100644 --- a/objective-c/test/Ice/faultTolerance/Server.m +++ b/objective-c/test/Ice/faultTolerance/Server.m @@ -54,7 +54,7 @@ run(int argc, char** argv, id<ICECommunicator> communicator) id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TestI testIntf]; - [adapter add:object identity:[communicator stringToIdentity:@"test"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; [communicator waitForShutdown]; return EXIT_SUCCESS; diff --git a/objective-c/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m index 6db8bd58c5f..f4f62982764 100644 --- a/objective-c/test/Ice/hold/Server.m +++ b/objective-c/test/Ice/hold/Server.m @@ -29,8 +29,8 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter2.ThreadPool.Serialize" value:@"1"]; id<ICEObjectAdapter> adapter2 = [communicator createObjectAdapter:@"TestAdapter2"]; - [adapter1 add:[HoldI hold] identity:[communicator stringToIdentity:@"hold"]]; - [adapter2 add:[HoldI hold] identity:[communicator stringToIdentity:@"hold"]]; + [adapter1 add:[HoldI hold] identity:[ICEUtil stringToIdentity:@"hold"]]; + [adapter2 add:[HoldI hold] identity:[ICEUtil stringToIdentity:@"hold"]]; [adapter1 activate]; [adapter2 activate]; diff --git a/objective-c/test/Ice/info/Server.m b/objective-c/test/Ice/info/Server.m index 7472c0036ea..46c88de1321 100644 --- a/objective-c/test/Ice/info/Server.m +++ b/objective-c/test/Ice/info/Server.m @@ -16,7 +16,7 @@ run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; - [adapter add:[TestInfoTestIntfI testIntf] identity:[communicator stringToIdentity:@"test"]]; + [adapter add:[TestInfoTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/inheritance/Collocated.m b/objective-c/test/Ice/inheritance/Collocated.m index 50e591a3a87..1124cc70f0c 100644 --- a/objective-c/test/Ice/inheritance/Collocated.m +++ b/objective-c/test/Ice/inheritance/Collocated.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = ICE_AUTORELEASE([[TestInheritanceInitialI alloc] initWithAdapter:adapter]); - [adapter add:object identity:[communicator stringToIdentity:@"initial"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"initial"]]; id<TestInheritanceInitialPrx> inheritanceAllTests(id<ICECommunicator>); inheritanceAllTests(communicator); diff --git a/objective-c/test/Ice/inheritance/Server.m b/objective-c/test/Ice/inheritance/Server.m index 3ae5a3c4c06..32177bf2c3d 100644 --- a/objective-c/test/Ice/inheritance/Server.m +++ b/objective-c/test/Ice/inheritance/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = ICE_AUTORELEASE([[TestInheritanceInitialI alloc] initWithAdapter:adapter]); - [adapter add:object identity:[communicator stringToIdentity:@"initial"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"initial"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/location/AllTests.m b/objective-c/test/Ice/location/AllTests.m index b1edb7f3c0e..9e7b84754de 100644 --- a/objective-c/test/Ice/location/AllTests.m +++ b/objective-c/test/Ice/location/AllTests.m @@ -463,7 +463,7 @@ locationAllTests(id<ICECommunicator> communicator, NSString* ref) // @try // { // id<TestLocationHelloPrx> helloPrx = [TestLocationHelloPrx checkedCast:[communicator stringToProxy: -// [communicator identityToString:ident]]]; +// [ICEUtil identityToString:ident]]]; // [helloPrx ice_getConnection]; // test(NO); // } diff --git a/objective-c/test/Ice/location/Server.m b/objective-c/test/Ice/location/Server.m index cef03f85d96..b1e9ddd1540 100644 --- a/objective-c/test/Ice/location/Server.m +++ b/objective-c/test/Ice/location/Server.m @@ -33,15 +33,15 @@ run(id<ICECommunicator> communicator, ICEInitializationData* initData) ServerLocatorRegistry* registry = ICE_AUTORELEASE([[ServerLocatorRegistry alloc] init]); ServerManagerI* serverManager = ICE_AUTORELEASE([[ServerManagerI alloc] init:registry initData:initData]); - [registry addObject:[adapter createProxy:[communicator stringToIdentity:@"ServerManager"]]]; - [adapter add:serverManager identity:[communicator stringToIdentity:@"ServerManager"]]; + [registry addObject:[adapter createProxy:[ICEUtil stringToIdentity:@"ServerManager"]]]; + [adapter add:serverManager identity:[ICEUtil stringToIdentity:@"ServerManager"]]; id<ICELocatorRegistryPrx> registryPrx = [ICELocatorRegistryPrx uncheckedCast:[adapter add:registry - identity:[communicator stringToIdentity:@"registry"]]]; + identity:[ICEUtil stringToIdentity:@"registry"]]]; ServerLocator* locator = ICE_AUTORELEASE([[ServerLocator alloc] init:registry proxy:registryPrx]); - [adapter add:locator identity:[communicator stringToIdentity:@"locator"]]; + [adapter add:locator identity:[ICEUtil stringToIdentity:@"locator"]]; [adapter activate]; diff --git a/objective-c/test/Ice/location/TestI.m b/objective-c/test/Ice/location/TestI.m index df93d7ecde5..20f6438c244 100644 --- a/objective-c/test/Ice/location/TestI.m +++ b/objective-c/test/Ice/location/TestI.m @@ -70,9 +70,9 @@ [adapter2 setLocator:[ICELocatorPrx uncheckedCast:locator]]; ICEObject* object = ICE_AUTORELEASE([[TestLocationI alloc] init:adapter adapter2:adapter2 registry:registry_]); - [registry_ addObject:[adapter add:object identity:[serverCommunicator stringToIdentity:@"test"]]]; - [registry_ addObject:[adapter add:object identity:[serverCommunicator stringToIdentity:@"test2"]]]; - [adapter add:object identity:[serverCommunicator stringToIdentity:@"test3"]]; + [registry_ addObject:[adapter add:object identity:[ICEUtil stringToIdentity:@"test"]]]; + [registry_ addObject:[adapter add:object identity:[ICEUtil stringToIdentity:@"test2"]]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"test3"]]; [adapter activate]; [adapter2 activate]; @@ -111,7 +111,7 @@ adapter1_ = ICE_RETAIN(adapter); adapter2_ = ICE_RETAIN(adapter2); registry_ = registry; - [registry_ addObject:[adapter1_ add:[HelloI hello] identity:[[adapter1_ getCommunicator] stringToIdentity:@"hello"]]]; + [registry_ addObject:[adapter1_ add:[HelloI hello] identity:[ICEUtil stringToIdentity:@"hello"]]]; return self; } @@ -131,18 +131,17 @@ -(id<TestLocationHelloPrx>) getHello:(ICECurrent*)current { - return [TestLocationHelloPrx uncheckedCast:[adapter1_ createIndirectProxy:[[adapter1_ getCommunicator] - stringToIdentity:@"hello"]]]; + return [TestLocationHelloPrx uncheckedCast:[adapter1_ createIndirectProxy:[ICEUtil stringToIdentity:@"hello"]]]; } -(id<TestLocationHelloPrx>) getReplicatedHello:(ICECurrent*)current { - return [TestLocationHelloPrx uncheckedCast:[adapter1_ createProxy:[[adapter1_ getCommunicator] stringToIdentity:@"hello"]]]; + return [TestLocationHelloPrx uncheckedCast:[adapter1_ createProxy:[ICEUtil stringToIdentity:@"hello"]]]; } -(void) migrateHello:(ICECurrent*)current { - ICEIdentity* ident = [[adapter1_ getCommunicator] stringToIdentity:@"hello"]; + ICEIdentity* ident = [ICEUtil stringToIdentity:@"hello"]; @try { [registry_ addObject:[adapter2_ add:[adapter1_ remove:ident] identity:ident]]; diff --git a/objective-c/test/Ice/metrics/Server.m b/objective-c/test/Ice/metrics/Server.m index 4f603bd3db4..9c7d255973c 100644 --- a/objective-c/test/Ice/metrics/Server.m +++ b/objective-c/test/Ice/metrics/Server.m @@ -18,14 +18,14 @@ run(id<ICECommunicator> communicator) id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [MetricsI metrics]; - [adapter add:object identity:[communicator stringToIdentity:@"metrics"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"metrics"]]; [adapter activate]; [[communicator getProperties] setProperty:@"ControllerAdapter.Endpoints" value:@"default -p 12011"]; id<ICEObjectAdapter> controllerAdapter = [communicator createObjectAdapter:@"ControllerAdapter"]; ICEObject* controller = ICE_AUTORELEASE([[ControllerI alloc] init:adapter]); - [controllerAdapter add:controller identity:[communicator stringToIdentity:@"controller"]]; + [controllerAdapter add:controller identity:[ICEUtil stringToIdentity:@"controller"]]; [controllerAdapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/objects/Collocated.m b/objective-c/test/Ice/objects/Collocated.m index a48559da9da..742bf8e7483 100644 --- a/objective-c/test/Ice/objects/Collocated.m +++ b/objective-c/test/Ice/objects/Collocated.m @@ -89,10 +89,10 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; TestObjectsInitialI* initial = [TestObjectsInitialI initial]; - [adapter add:initial identity:[communicator stringToIdentity:@"initial"]]; + [adapter add:initial identity:[ICEUtil stringToIdentity:@"initial"]]; ICEObject* uoet = ICE_AUTORELEASE([[UnexpectedObjectExceptionTestI alloc] init]); - [adapter add:uoet identity:[communicator stringToIdentity:@"uoet"]]; + [adapter add:uoet identity:[ICEUtil stringToIdentity:@"uoet"]]; id<TestObjectsInitialPrx> objectsAllTests(id<ICECommunicator>, bool); objectsAllTests(communicator, NO); diff --git a/objective-c/test/Ice/objects/Server.m b/objective-c/test/Ice/objects/Server.m index 5eef14fbbc5..72c96b730ed 100644 --- a/objective-c/test/Ice/objects/Server.m +++ b/objective-c/test/Ice/objects/Server.m @@ -44,10 +44,10 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* initial = [TestObjectsInitialI initial]; - [adapter add:initial identity:[communicator stringToIdentity:@"initial"]]; + [adapter add:initial identity:[ICEUtil stringToIdentity:@"initial"]]; ICEObject* uoet = ICE_AUTORELEASE([[UnexpectedObjectExceptionTestI alloc] init]); - [adapter add:uoet identity:[communicator stringToIdentity:@"uoet"]]; + [adapter add:uoet identity:[ICEUtil stringToIdentity:@"uoet"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/operations/Collocated.m b/objective-c/test/Ice/operations/Collocated.m index 9d4dad1fea9..b3937a6e441 100644 --- a/objective-c/test/Ice/operations/Collocated.m +++ b/objective-c/test/Ice/operations/Collocated.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestOperationsAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestOperationsAdapter"]; id<ICEObjectPrx> prx = [adapter add:[TestOperationsMyDerivedClassI myDerivedClass] - identity:[communicator stringToIdentity:@"test"]]; + identity:[ICEUtil stringToIdentity:@"test"]]; //[adapter activate]; // Don't activate OA to ensure collocation is used. test(![prx ice_getConnection]); diff --git a/objective-c/test/Ice/operations/Server.m b/objective-c/test/Ice/operations/Server.m index a952f03c4e9..9e422112c88 100644 --- a/objective-c/test/Ice/operations/Server.m +++ b/objective-c/test/Ice/operations/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestOperationsAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestOperationsAdapter"]; [adapter add:[TestOperationsMyDerivedClassI myDerivedClass] - identity:[communicator stringToIdentity:@"test"]]; + identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/operations/TestI.m b/objective-c/test/Ice/operations/TestI.m index 65ed8d8abf9..ba0cc277153 100644 --- a/objective-c/test/Ice/operations/TestI.m +++ b/objective-c/test/Ice/operations/TestI.m @@ -97,8 +97,7 @@ { *p2 = p1; *p3 = [TestOperationsMyClassPrx uncheckedCast:[current.adapter - createProxy:[[current.adapter getCommunicator] - stringToIdentity:@"noSuchIdentity"]]]; + createProxy:[ICEUtil stringToIdentity:@"noSuchIdentity"]]]; return [TestOperationsMyClassPrx uncheckedCast:[current.adapter createProxy:[current id_]]]; } diff --git a/objective-c/test/Ice/operations/Twoways.m b/objective-c/test/Ice/operations/Twoways.m index 92bfa5ba61e..0ab0ffb8a90 100644 --- a/objective-c/test/Ice/operations/Twoways.m +++ b/objective-c/test/Ice/operations/Twoways.m @@ -268,9 +268,9 @@ twoways(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p) test([c1 compareIdentityAndFacet:p] == NSOrderedSame); test([c2 compareIdentityAndFacet:p] != NSOrderedSame); test([r compareIdentityAndFacet:p] == NSOrderedSame); - test([[c1 ice_getIdentity] isEqual:[communicator stringToIdentity:@"test"]]); - test([[c2 ice_getIdentity]isEqual:[communicator stringToIdentity:@"noSuchIdentity"]]); - test([[r ice_getIdentity] isEqual:[communicator stringToIdentity:@"test"]]); + test([[c1 ice_getIdentity] isEqual:[ICEUtil stringToIdentity:@"test"]]); + test([[c2 ice_getIdentity]isEqual:[ICEUtil stringToIdentity:@"noSuchIdentity"]]); + test([[r ice_getIdentity] isEqual:[ICEUtil stringToIdentity:@"test"]]); [r opVoid]; [c1 opVoid]; @try diff --git a/objective-c/test/Ice/operations/TwowaysNewAMI.m b/objective-c/test/Ice/operations/TwowaysNewAMI.m index e971bebdd2e..e4966a6e149 100644 --- a/objective-c/test/Ice/operations/TwowaysNewAMI.m +++ b/objective-c/test/Ice/operations/TwowaysNewAMI.m @@ -163,9 +163,9 @@ -(void) opMyClassResponse:(id<TestOperationsMyClassPrx>)r p2:(id<TestOperationsMyClassPrx>)c1 p3:(id<TestOperationsMyClassPrx>)c2 { - test([[c1 ice_getIdentity] isEqual:[[c1 ice_getCommunicator] stringToIdentity:@"test"]]); - test([[c2 ice_getIdentity] isEqual:[[c1 ice_getCommunicator] stringToIdentity:@"noSuchIdentity"]]); - test([[r ice_getIdentity] isEqual:[[c1 ice_getCommunicator] stringToIdentity:@"test"]]); + test([[c1 ice_getIdentity] isEqual:[ICEUtil stringToIdentity:@"test"]]); + test([[c2 ice_getIdentity] isEqual:[ICEUtil stringToIdentity:@"noSuchIdentity"]]); + test([[r ice_getIdentity] isEqual:[ICEUtil stringToIdentity:@"test"]]); // We can't do the callbacks below in connection serialization mode. if([[[c1 ice_getCommunicator] getProperties] getPropertyAsInt:@"Ice.ThreadPool.Client.Serialize"]) { diff --git a/objective-c/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m index 2aba2329100..9a65e15b5ad 100644 --- a/objective-c/test/Ice/optional/Server.m +++ b/objective-c/test/Ice/optional/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [InitialI initial]; - [adapter add:object identity:[communicator stringToIdentity:@"initial"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"initial"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/proxy/AllTests.m b/objective-c/test/Ice/proxy/AllTests.m index a634c147f07..5f595d46687 100644 --- a/objective-c/test/Ice/proxy/AllTests.m +++ b/objective-c/test/Ice/proxy/AllTests.m @@ -413,6 +413,8 @@ proxyAllTests(id<ICECommunicator> communicator) tprintf("testing proxy methods... "); test([[communicator identityToString:[[base ice_identity:[communicator stringToIdentity:@"other"]] ice_getIdentity]] isEqualToString:@"other"]); + test([[ICEUtil identityToString:[[base ice_identity:[ICEUtil stringToIdentity:@"other"]] ice_getIdentity]] + isEqualToString:@"other"]); test([[[base ice_facet:@"facet"] ice_getFacet] isEqualToString:@"facet"]); test([[[base ice_adapterId:@"id"] ice_getAdapterId] isEqualToString:@"id"]); test([[base ice_twoway] ice_isTwoway]); diff --git a/objective-c/test/Ice/proxy/Collocated.m b/objective-c/test/Ice/proxy/Collocated.m index b13e97806bc..4e8fb75d907 100644 --- a/objective-c/test/Ice/proxy/Collocated.m +++ b/objective-c/test/Ice/proxy/Collocated.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; [adapter add:[TestProxyMyDerivedClassI myDerivedClass] - identity:[communicator stringToIdentity:@"test"]]; + identity:[ICEUtil stringToIdentity:@"test"]]; //[adapter activate]; //adapter->activate(); // Don't activate OA to ensure collocation is used. TestProxyMyClassPrx* proxyAllTests(id<ICECommunicator>); diff --git a/objective-c/test/Ice/proxy/Server.m b/objective-c/test/Ice/proxy/Server.m index cdd2ffc0e90..0f339cf6016 100644 --- a/objective-c/test/Ice/proxy/Server.m +++ b/objective-c/test/Ice/proxy/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; [adapter add:[TestProxyMyDerivedClassI myDerivedClass] - identity:[communicator stringToIdentity:@"test"]]; + identity:[ICEUtil stringToIdentity:@"test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/retry/Collocated.m b/objective-c/test/Ice/retry/Collocated.m index 1bac890a477..a40fc2df4cb 100644 --- a/objective-c/test/Ice/retry/Collocated.m +++ b/objective-c/test/Ice/retry/Collocated.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TestRetryRetryI retry]; - [adapter add:object identity:[communicator stringToIdentity:@"retry"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"retry"]]; //[adapter activate]; // Don't activate OA to ensure collocation is used. TestRetryRetryPrx* retryAllTests(id<ICECommunicator>); diff --git a/objective-c/test/Ice/retry/Server.m b/objective-c/test/Ice/retry/Server.m index dc74ce63ceb..3a588109051 100644 --- a/objective-c/test/Ice/retry/Server.m +++ b/objective-c/test/Ice/retry/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TestRetryRetryI retry]; - [adapter add:object identity:[communicator stringToIdentity:@"retry"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"retry"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/servantLocator/Collocated.m b/objective-c/test/Ice/servantLocator/Collocated.m index 6d8478c40d9..e98e08636a8 100644 --- a/objective-c/test/Ice/servantLocator/Collocated.m +++ b/objective-c/test/Ice/servantLocator/Collocated.m @@ -66,8 +66,8 @@ run(id<ICECommunicator> communicator) [adapter addServantLocator:ICE_AUTORELEASE([[ServantLocatorI alloc] init:@""]) category:@""]; [adapter addServantLocator:ICE_AUTORELEASE([[ServantLocatorI alloc] init:@"category"]) category:@"category"]; - [adapter add:[TestServantLocatorTestIntfI testIntf] identity:[communicator stringToIdentity:@"asm"]]; - [adapter add:[TestActivationI testActivation] identity:[communicator stringToIdentity:@"test/activation"]]; + [adapter add:[TestServantLocatorTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"asm"]]; + [adapter add:[TestActivationI testActivation] identity:[ICEUtil stringToIdentity:@"test/activation"]]; TestServantLocatorTestIntfPrx* servantLocatorAllTests(id<ICECommunicator>); servantLocatorAllTests(communicator); diff --git a/objective-c/test/Ice/servantLocator/Server.m b/objective-c/test/Ice/servantLocator/Server.m index 922e19b31d3..f2c342caaf1 100644 --- a/objective-c/test/Ice/servantLocator/Server.m +++ b/objective-c/test/Ice/servantLocator/Server.m @@ -66,8 +66,8 @@ run(id<ICECommunicator> communicator) [adapter addServantLocator:ICE_AUTORELEASE([[ServantLocatorI alloc] init:@""]) category:@""]; [adapter addServantLocator:ICE_AUTORELEASE([[ServantLocatorI alloc] init:@"category"]) category:@"category"]; - [adapter add:[TestServantLocatorTestIntfI testIntf] identity:[communicator stringToIdentity:@"asm"]]; - [adapter add:[TestActivationI testActivation] identity:[communicator stringToIdentity:@"test/activation"]]; + [adapter add:[TestServantLocatorTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"asm"]]; + [adapter add:[TestActivationI testActivation] identity:[ICEUtil stringToIdentity:@"test/activation"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/slicing/exceptions/Server.m b/objective-c/test/Ice/slicing/exceptions/Server.m index 3df6ff8e516..657b20d1f61 100644 --- a/objective-c/test/Ice/slicing/exceptions/Server.m +++ b/objective-c/test/Ice/slicing/exceptions/Server.m @@ -18,7 +18,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TestSlicingExceptionsServerI testIntf]; - [adapter add:object identity:[communicator stringToIdentity:@"Test"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"Test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/slicing/objects/Server.m b/objective-c/test/Ice/slicing/objects/Server.m index d913f6c1781..40380311a33 100644 --- a/objective-c/test/Ice/slicing/objects/Server.m +++ b/objective-c/test/Ice/slicing/objects/Server.m @@ -19,7 +19,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TestSlicingObjectsServerI testIntf]; - [adapter add:object identity:[communicator stringToIdentity:@"Test"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"Test"]]; [adapter activate]; serverReady(communicator); diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m index 25662b9a00d..12c2f311ffd 100644 --- a/objective-c/test/Ice/timeout/Server.m +++ b/objective-c/test/Ice/timeout/Server.m @@ -17,7 +17,7 @@ run(id<ICECommunicator> communicator) [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:@"default -p 12010:udp"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; ICEObject* object = [TimeoutI timeout]; - [adapter add:object identity:[communicator stringToIdentity:@"timeout"]]; + [adapter add:object identity:[ICEUtil stringToIdentity:@"timeout"]]; [adapter activate]; serverReady(communicator); diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index 37042b9d5a2..4b6c29f5ae1 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -309,7 +309,8 @@ function allTests($communicator) echo "catching object not exist exception... "; flush(); - $id = $communicator->stringToIdentity("does not exist"); + $stringToIdentity = $NS ? "Ice\\stringToIdentity" : "Ice_stringToIdentity"; + $id = $stringToIdentity("does not exist"); try { $thrower2 = $thrower->ice_identity($id)->ice_uncheckedCast("::Test::Thrower"); diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php index b5426df1ef8..6d193bcc51b 100644 --- a/php/test/Ice/operations/Client.php +++ b/php/test/Ice/operations/Client.php @@ -356,13 +356,15 @@ function twoways($communicator, $p) } { + $stringToIdentity = $NS ? "Ice\\stringToIdentity" : "Ice_stringToIdentity"; + $r = $p->opMyClass($p, $c1, $c2); test(Ice_proxyIdentityAndFacetEqual($c1, $p)); test(!Ice_proxyIdentityAndFacetEqual($c2, $p)); test(Ice_proxyIdentityAndFacetEqual($r, $p)); - test($c1->ice_getIdentity() == $communicator->stringToIdentity("test")); - test($c2->ice_getIdentity() == $communicator->stringToIdentity("noSuchIdentity")); - test($r->ice_getIdentity() == $communicator->stringToIdentity("test")); + test($c1->ice_getIdentity() == $stringToIdentity("test")); + test($c2->ice_getIdentity() == $stringToIdentity("noSuchIdentity")); + test($r->ice_getIdentity() == $stringToIdentity("test")); $r->opVoid(); $c1->opVoid(); try diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index 76b1b5e419c..72a5ddc12d8 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -3337,7 +3337,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con if(!method.get()) { ostringstream ostr; - ostr << "servant for identity " << _communicator->identityToString(current.id) + ostr << "servant for identity " << identityToString(current.id) << " does not define operation `" << _op->dispatchName << "'"; string str = ostr.str(); PyErr_Warn(PyExc_RuntimeWarning, const_cast<char*>(str.c_str())); @@ -3720,7 +3720,7 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, if(!method.get()) { ostringstream ostr; - ostr << "servant for identity " << communicator->identityToString(current.id) + ostr << "servant for identity " << identityToString(current.id) << " does not define operation `" << dispatchName << "'"; string str = ostr.str(); PyErr_Warn(PyExc_RuntimeWarning, const_cast<char*>(str.c_str())); diff --git a/python/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py index 4769e6de0bc..78f2486754b 100755 --- a/python/test/Ice/acm/Server.py +++ b/python/test/Ice/acm/Server.py @@ -22,7 +22,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0") adapter = communicator.createObjectAdapter("TestAdapter") - id = communicator.stringToIdentity("communicator") + id = Ice.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) adapter.activate() diff --git a/python/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py index 920cbd44c7e..a728dfce1b3 100644 --- a/python/test/Ice/acm/TestI.py +++ b/python/test/Ice/acm/TestI.py @@ -33,7 +33,7 @@ class RemoteObjectAdapterI(Test.RemoteObjectAdapter): def __init__(self, adapter): self._adapter = adapter self._testIntf = Test.TestIntfPrx.uncheckedCast(adapter.add(TestIntfI(), - adapter.getCommunicator().stringToIdentity("test"))) + Ice.stringToIdentity("test"))) adapter.activate() def getTestIntf(self, current=None): diff --git a/python/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py index e6ee6e196e0..685ec77ee9f 100644 --- a/python/test/Ice/admin/AllTests.py +++ b/python/test/Ice/admin/AllTests.py @@ -116,7 +116,7 @@ def allTests(communicator): init.properties.setProperty("Ice.Admin.Enabled", "1") com = Ice.initialize(init) test(com.getAdmin() == None) - identity = com.stringToIdentity("test-admin") + identity = Ice.stringToIdentity("test-admin") try: com.createAdmin(None, identity) test(False) diff --git a/python/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py index a28da94e27d..ebdd142b967 100644 --- a/python/test/Ice/admin/Server.py +++ b/python/test/Ice/admin/Server.py @@ -22,7 +22,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); adapter = communicator.createObjectAdapter("TestAdapter"); - ident = communicator.stringToIdentity("factory"); + ident = Ice.stringToIdentity("factory"); adapter.add(TestI.RemoteCommunicatorFactoryI(), ident); adapter.activate(); diff --git a/python/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py index 689d7625686..062ff31f8fb 100755 --- a/python/test/Ice/ami/Collocated.py +++ b/python/test/Ice/ami/Collocated.py @@ -29,10 +29,10 @@ def run(args, communicator): testController = TestI.TestIntfControllerI(adapter) - adapter.add(TestI.TestIntfI(), communicator.stringToIdentity("test")) + adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test")) #adapter.activate() # Collocated test doesn't need to active the OA - adapter2.add(testController, communicator.stringToIdentity("testController")) + adapter2.add(testController, Ice.stringToIdentity("testController")) #adapter2.activate() # Collocated test doesn't need to active the OA AllTests.allTests(communicator, True) diff --git a/python/test/Ice/ami/Server.py b/python/test/Ice/ami/Server.py index 621f719d0bc..a1c51251af5 100755 --- a/python/test/Ice/ami/Server.py +++ b/python/test/Ice/ami/Server.py @@ -28,10 +28,10 @@ def run(args, communicator): testController = TestI.TestIntfControllerI(adapter) - adapter.add(TestI.TestIntfI(), communicator.stringToIdentity("test")) + adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test")) adapter.activate() - adapter2.add(testController, communicator.stringToIdentity("testController")) + adapter2.add(testController, Ice.stringToIdentity("testController")) adapter2.activate() communicator.waitForShutdown() diff --git a/python/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py index 41bfe2404ff..e86495fecc4 100755 --- a/python/test/Ice/binding/Server.py +++ b/python/test/Ice/binding/Server.py @@ -17,7 +17,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - id = communicator.stringToIdentity("communicator") + id = Ice.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) adapter.activate() diff --git a/python/test/Ice/binding/TestI.py b/python/test/Ice/binding/TestI.py index e5aebf4a66e..a707b83f191 100644 --- a/python/test/Ice/binding/TestI.py +++ b/python/test/Ice/binding/TestI.py @@ -35,7 +35,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator): class RemoteObjectAdapterI(Test.RemoteObjectAdapter): def __init__(self, adapter): self._adapter = adapter - self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), adapter.getCommunicator().stringToIdentity("test"))) + self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), Ice.stringToIdentity("test"))) self._adapter.activate() def getTestIntf(self, current=None): diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py index a3123f43b69..9acab682de3 100755 --- a/python/test/Ice/blobject/Server.py +++ b/python/test/Ice/blobject/Server.py @@ -33,7 +33,7 @@ class TestI(Test.Hello): def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TestI(), communicator.stringToIdentity("test")) + adapter.add(TestI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py index 1d8c49494a4..0f323f7e077 100755 --- a/python/test/Ice/checksum/Server.py +++ b/python/test/Ice/checksum/Server.py @@ -30,7 +30,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = ChecksumI() - adapter.add(object, communicator.stringToIdentity("test")) + adapter.add(object, Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py index c208c67b89f..46d1a70cda0 100755 --- a/python/test/Ice/custom/Server.py +++ b/python/test/Ice/custom/Server.py @@ -93,7 +93,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = CustomI() - adapter.add(object, communicator.stringToIdentity("test")) + adapter.add(object, Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py index bc501d7541c..2c6c8292a16 100755 --- a/python/test/Ice/enums/Server.py +++ b/python/test/Ice/enums/Server.py @@ -50,7 +50,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestIntfI() - adapter.add(object, communicator.stringToIdentity("test")) + adapter.add(object, Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index 97d68ecabb0..5cab53dd6f4 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -172,7 +172,7 @@ class Callback(CallbackBase): try: raise ex except Ice.ObjectNotExistException as ex: - id = self._communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") test(ex.id == id) except: test(False) @@ -222,29 +222,29 @@ def allTests(communicator): communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter1") obj = EmptyI() - adapter.add(obj, communicator.stringToIdentity("x")) + adapter.add(obj, Ice.stringToIdentity("x")) try: - adapter.add(obj, communicator.stringToIdentity("x")) + adapter.add(obj, Ice.stringToIdentity("x")) test(false) except Ice.AlreadyRegisteredException: pass try: - adapter.add(obj, communicator.stringToIdentity("")) + adapter.add(obj, Ice.stringToIdentity("")) test(false) except Ice.IllegalIdentityException as ex: test(ex.id.name == "") try: - adapter.add(None, communicator.stringToIdentity("x")) + adapter.add(None, Ice.stringToIdentity("x")) test(false) except Ice.IllegalServantException: pass - adapter.remove(communicator.stringToIdentity("x")) + adapter.remove(Ice.stringToIdentity("x")) try: - adapter.remove(communicator.stringToIdentity("x")) + adapter.remove(Ice.stringToIdentity("x")) test(false) except Ice.NotRegisteredException: pass @@ -495,7 +495,7 @@ def allTests(communicator): sys.stdout.write("catching object not exist exception... ") sys.stdout.flush() - id = communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") try: thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id)) thrower2.throwAasA(1) @@ -664,7 +664,7 @@ def allTests(communicator): sys.stdout.write("catching object not exist exception with AMI mapping... ") sys.stdout.flush() - id = communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id)) cb = Callback(communicator) thrower2.begin_throwAasA(1, cb.response, cb.exception_AasAObjectNotExist) diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py index 0f49dc62e87..b1dc368a161 100755 --- a/python/test/Ice/exceptions/Collocated.py +++ b/python/test/Ice/exceptions/Collocated.py @@ -25,7 +25,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) #adapter.activate() // Don't activate OA to ensure collocation is used. thrower = AllTests.allTests(communicator) diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py index 560a2f06220..a3556e7f439 100755 --- a/python/test/Ice/exceptions/Server.py +++ b/python/test/Ice/exceptions/Server.py @@ -24,9 +24,9 @@ def run(args, communicator): adapter2 = communicator.createObjectAdapter("TestAdapter2") adapter3 = communicator.createObjectAdapter("TestAdapter3") object = TestI.ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) - adapter2.add(object, communicator.stringToIdentity("thrower")) - adapter3.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) + adapter2.add(object, Ice.stringToIdentity("thrower")) + adapter3.add(object, Ice.stringToIdentity("thrower")) adapter.activate() adapter2.activate() adapter3.activate() diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py index 966ebd17618..ae11c454596 100755 --- a/python/test/Ice/exceptions/ServerAMD.py +++ b/python/test/Ice/exceptions/ServerAMD.py @@ -144,9 +144,9 @@ def run(args, communicator): adapter2 = communicator.createObjectAdapter("TestAdapter2") adapter3 = communicator.createObjectAdapter("TestAdapter3") object = ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) - adapter2.add(object, communicator.stringToIdentity("thrower")) - adapter3.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) + adapter2.add(object, Ice.stringToIdentity("thrower")) + adapter3.add(object, Ice.stringToIdentity("thrower")) adapter.activate() adapter2.activate() adapter3.activate() diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py index e6fa69e3d01..4f804da33f7 100644 --- a/python/test/Ice/facets/AllTests.py +++ b/python/test/Ice/facets/AllTests.py @@ -45,16 +45,16 @@ def allTests(communicator): communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default") adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter") obj = EmptyI() - adapter.add(obj, communicator.stringToIdentity("d")) - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD") + adapter.add(obj, Ice.stringToIdentity("d")) + adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD") try: - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD") + adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD") test(false) except Ice.AlreadyRegisteredException: pass - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD") + adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD") try: - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD") + adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD") test(false) except Ice.NotRegisteredException: pass @@ -64,22 +64,22 @@ def allTests(communicator): sys.stdout.flush() obj1 = EmptyI() obj2 = EmptyI() - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1") - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2") + adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1") + adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2") obj3 = EmptyI() - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1") - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2") - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), "") - fm = adapter.removeAllFacets(communicator.stringToIdentity("id1")) + adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1") + adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2") + adapter.addFacet(obj3, Ice.stringToIdentity("id2"), "") + fm = adapter.removeAllFacets(Ice.stringToIdentity("id1")) test(len(fm) == 2) test(fm["f1"] == obj1) test(fm["f2"] == obj2) try: - adapter.removeAllFacets(communicator.stringToIdentity("id1")) + adapter.removeAllFacets(Ice.stringToIdentity("id1")) test(false) except Ice.NotRegisteredException: pass - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")) + fm = adapter.removeAllFacets(Ice.stringToIdentity("id2")) test(len(fm) == 3) test(fm["f1"] == obj1) test(fm["f2"] == obj2) diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py index 18e25a4baf0..5936768fbdc 100755 --- a/python/test/Ice/facets/Collocated.py +++ b/python/test/Ice/facets/Collocated.py @@ -18,12 +18,12 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() - adapter.add(d, communicator.stringToIdentity("d")) - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD") + adapter.add(d, Ice.stringToIdentity("d")) + adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD") f = TestI.FI() - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF") + adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF") h = TestI.HI(communicator) - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH") + adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH") #adapter.activate() // Don't activate OA to ensure collocation is used. diff --git a/python/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py index 0c9b334d1b7..e00238e0834 100755 --- a/python/test/Ice/facets/Server.py +++ b/python/test/Ice/facets/Server.py @@ -18,12 +18,12 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() - adapter.add(d, communicator.stringToIdentity("d")) - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD") + adapter.add(d, Ice.stringToIdentity("d")) + adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD") f = TestI.FI() - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF") + adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF") h = TestI.HI(communicator) - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH") + adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH") adapter.activate() communicator.waitForShutdown() diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py index 4698f60e378..fd9b0f4096c 100755 --- a/python/test/Ice/faultTolerance/Server.py +++ b/python/test/Ice/faultTolerance/Server.py @@ -54,7 +54,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts) adapter = communicator.createObjectAdapter("TestAdapter") object = TestI() - adapter.add(object, communicator.stringToIdentity("test")) + adapter.add(object, Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/info/Server.py b/python/test/Ice/info/Server.py index 9b516c665f8..1c6057ce26c 100755 --- a/python/test/Ice/info/Server.py +++ b/python/test/Ice/info/Server.py @@ -22,7 +22,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py index c87c477ade1..cca4200f26e 100755 --- a/python/test/Ice/inheritance/Collocated.py +++ b/python/test/Ice/inheritance/Collocated.py @@ -18,7 +18,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) - adapter.add(object, communicator.stringToIdentity("initial")) + adapter.add(object, Ice.stringToIdentity("initial")) #adapter.activate() // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator) diff --git a/python/test/Ice/inheritance/Server.py b/python/test/Ice/inheritance/Server.py index 2aa29b366ee..3415ad4519d 100755 --- a/python/test/Ice/inheritance/Server.py +++ b/python/test/Ice/inheritance/Server.py @@ -18,7 +18,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) - adapter.add(object, communicator.stringToIdentity("initial")) + adapter.add(object, Ice.stringToIdentity("initial")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/location/AllTests.py b/python/test/Ice/location/AllTests.py index 91519152101..bf0a378b85f 100644 --- a/python/test/Ice/location/AllTests.py +++ b/python/test/Ice/location/AllTests.py @@ -248,7 +248,7 @@ def allTests(communicator, ref): registry.addObject(adapter.add(HelloI(), id)); adapter.activate(); - helloPrx = Test.HelloPrx.checkedCast(communicator.stringToProxy(communicator.identityToString(id))); + helloPrx = Test.HelloPrx.checkedCast(communicator.stringToProxy(Ice.identityToString(id))); test(not helloPrx.ice_getConnection()); adapter.deactivate(); diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py index 0ec827f3afc..24cd82df2d8 100755 --- a/python/test/Ice/location/Server.py +++ b/python/test/Ice/location/Server.py @@ -109,9 +109,9 @@ class ServerManagerI(Test.ServerManager): adapter2.setLocator(Ice.LocatorPrx.uncheckedCast(locator)) object = TestI(adapter, adapter2, self._registry) - self._registry.addObject(adapter.add(object, communicator.stringToIdentity("test"))) - self._registry.addObject(adapter.add(object, communicator.stringToIdentity("test2"))) - adapter.add(object, communicator.stringToIdentity("test3")) + self._registry.addObject(adapter.add(object, Ice.stringToIdentity("test"))) + self._registry.addObject(adapter.add(object, Ice.stringToIdentity("test2"))) + adapter.add(object, Ice.stringToIdentity("test3")) adapter.activate() adapter2.activate() @@ -130,19 +130,19 @@ class TestI(Test.TestIntf): self._adapter1 = adapter self._adapter2 = adapter2 self._registry = registry - self._registry.addObject(self._adapter1.add(HelloI(), communicator.stringToIdentity("hello"))) + self._registry.addObject(self._adapter1.add(HelloI(), Ice.stringToIdentity("hello"))) def shutdown(self, current=None): self._adapter1.getCommunicator().shutdown() def getHello(self, current=None): - return Test.HelloPrx.uncheckedCast(self._adapter1.createIndirectProxy(communicator.stringToIdentity("hello"))) + return Test.HelloPrx.uncheckedCast(self._adapter1.createIndirectProxy(Ice.stringToIdentity("hello"))) def getReplicatedHello(self, current=None): - return Test.HelloPrx.uncheckedCast(self._adapter1.createProxy(communicator.stringToIdentity("hello"))) + return Test.HelloPrx.uncheckedCast(self._adapter1.createProxy(Ice.stringToIdentity("hello"))) def migrateHello(self, current=None): - id = communicator.stringToIdentity("hello") + id = Ice.stringToIdentity("hello") try: self._registry.addObject(self._adapter2.add(self._adapter1.remove(id), id)) except Ice.NotRegisteredException: @@ -166,14 +166,14 @@ def run(args, communicator, initData): # 'servers' created with the server manager interface. # registry = ServerLocatorRegistry() - registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager"))) + registry.addObject(adapter.createProxy(Ice.stringToIdentity("ServerManager"))) object = ServerManagerI(registry, initData) - adapter.add(object, communicator.stringToIdentity("ServerManager")) + adapter.add(object, Ice.stringToIdentity("ServerManager")) - registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, communicator.stringToIdentity("registry"))) + registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, Ice.stringToIdentity("registry"))) locator = ServerLocator(registry, registryPrx) - adapter.add(locator, communicator.stringToIdentity("locator")) + adapter.add(locator, Ice.stringToIdentity("locator")) adapter.activate() communicator.waitForShutdown() diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py index e3c50516101..02570bc35a9 100755 --- a/python/test/Ice/objects/Collocated.py +++ b/python/test/Ice/objects/Collocated.py @@ -19,9 +19,9 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) - adapter.add(initial, communicator.stringToIdentity("initial")) + adapter.add(initial, Ice.stringToIdentity("initial")) uoet = TestI.UnexpectedObjectExceptionTestI() - adapter.add(uoet, communicator.stringToIdentity("uoet")) + adapter.add(uoet, Ice.stringToIdentity("uoet")) #adapter.activate() // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator) diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py index 0758fc4009b..89b440c6845 100755 --- a/python/test/Ice/objects/Server.py +++ b/python/test/Ice/objects/Server.py @@ -32,9 +32,9 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) - adapter.add(initial, communicator.stringToIdentity("initial")) + adapter.add(initial, Ice.stringToIdentity("initial")) uoet = TestI.UnexpectedObjectExceptionTestI() - adapter.add(uoet, communicator.stringToIdentity("uoet")) + adapter.add(uoet, Ice.stringToIdentity("uoet")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/operations/Collocated.py b/python/test/Ice/operations/Collocated.py index d57476734de..757d5089247 100755 --- a/python/test/Ice/operations/Collocated.py +++ b/python/test/Ice/operations/Collocated.py @@ -22,7 +22,7 @@ import Test, TestI, AllTests def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") - prx = adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) + prx = adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test")) #adapter.activate() // Don't activate OA to ensure collocation is used. if prx.ice_getConnection(): diff --git a/python/test/Ice/operations/Server.py b/python/test/Ice/operations/Server.py index 1ecf2c4a213..3c740d9504e 100755 --- a/python/test/Ice/operations/Server.py +++ b/python/test/Ice/operations/Server.py @@ -21,7 +21,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py index 63611ff1ed8..20f1dc2de45 100755 --- a/python/test/Ice/operations/ServerAMD.py +++ b/python/test/Ice/operations/ServerAMD.py @@ -96,7 +96,7 @@ class MyDerivedClassI(Test.MyDerivedClass): def opMyClass_async(self, cb, p1, current=None): p2 = p1 - p3 = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(communicator.stringToIdentity("noSuchIdentity"))) + p3 = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity"))) cb.ice_response(Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3) def opStruct_async(self, cb, p1, p2, current=None): @@ -416,7 +416,7 @@ class MyDerivedClassI(Test.MyDerivedClass): def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py index 449afb523fe..b776b075e78 100644 --- a/python/test/Ice/operations/TestI.py +++ b/python/test/Ice/operations/TestI.py @@ -60,7 +60,7 @@ class MyDerivedClassI(Test.MyDerivedClass): def opMyClass(self, p1, current=None): return (Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)), p1, - Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")))) + Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity")))) def opStruct(self, p1, p2, current=None): p1.s.s = "a new string" @@ -328,47 +328,45 @@ class MyDerivedClassI(Test.MyDerivedClass): def opShort1(self, value, current=None): return value - + def opInt1(self, value, current=None): return value - + def opLong1(self, value, current=None): return value - + def opFloat1(self, value, current=None): return value - + def opDouble1(self, value, current=None): return value - + def opString1(self, value, current=None): return value - + def opStringS1(self, value, current=None): return value - + def opByteBoolD1(self, value, current=None): return value - + def opStringS2(self, value, current=None): return value - + def opByteBoolD2(self, value, current=None): return value - + def opMyClass1(self, value, current=None): return value def opMyStruct1(self, value, current=None): return value - + def opStringLiterals(self, current=None): return [Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10, Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10, Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5, Test.su0, Test.su1, Test.su2] - + def opWStringLiterals(self, current=None): return self.opStringLiterals(current) - -
\ No newline at end of file diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py index 8944ed4d94a..a1b2d2848b5 100644 --- a/python/test/Ice/operations/Twoways.py +++ b/python/test/Ice/operations/Twoways.py @@ -266,9 +266,9 @@ def twoways(communicator, p): test(Ice.proxyIdentityAndFacetEqual(c1, p)) test(not Ice.proxyIdentityAndFacetEqual(c2, p)) test(Ice.proxyIdentityAndFacetEqual(r, p)) - test(c1.ice_getIdentity() == communicator.stringToIdentity("test")) - test(c2.ice_getIdentity() == communicator.stringToIdentity("noSuchIdentity")) - test(r.ice_getIdentity() == communicator.stringToIdentity("test")) + test(c1.ice_getIdentity() == Ice.stringToIdentity("test")) + test(c2.ice_getIdentity() == Ice.stringToIdentity("noSuchIdentity")) + test(r.ice_getIdentity() == Ice.stringToIdentity("test")) r.opVoid() c1.opVoid() try: diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py index 10002fb4704..cb356b3177f 100644 --- a/python/test/Ice/operations/TwowaysAMI.py +++ b/python/test/Ice/operations/TwowaysAMI.py @@ -90,9 +90,9 @@ class Callback(CallbackBase): self.called() def opMyClass(self, r, c1, c2): - test(c1.ice_getIdentity() == self._communicator.stringToIdentity("test")) - test(c2.ice_getIdentity() == self._communicator.stringToIdentity("noSuchIdentity")) - test(r.ice_getIdentity() == self._communicator.stringToIdentity("test")) + test(c1.ice_getIdentity() == Ice.stringToIdentity("test")) + test(c2.ice_getIdentity() == Ice.stringToIdentity("noSuchIdentity")) + test(r.ice_getIdentity() == Ice.stringToIdentity("test")) # We can't do the callbacks below in serialize mode if self._communicator.getProperties().getPropertyAsInt("Ice.Client.ThreadPool.Serialize") == 0: r.opVoid() diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py index bf4236de34d..106fe5182eb 100755 --- a/python/test/Ice/optional/Server.py +++ b/python/test/Ice/optional/Server.py @@ -163,7 +163,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") initial = InitialI() - adapter.add(initial, communicator.stringToIdentity("initial")) + adapter.add(initial, Ice.stringToIdentity("initial")) adapter.activate() communicator.waitForShutdown() diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py index a300cf17e22..ab0bfc28abf 100755 --- a/python/test/Ice/optional/ServerAMD.py +++ b/python/test/Ice/optional/ServerAMD.py @@ -164,7 +164,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") initial = InitialI() - adapter.add(initial, communicator.stringToIdentity("initial")) + adapter.add(initial, Ice.stringToIdentity("initial")) adapter.activate() communicator.waitForShutdown() diff --git a/python/test/Ice/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py index 43565504d3b..26574d5b64e 100755 --- a/python/test/Ice/proxy/Collocated.py +++ b/python/test/Ice/proxy/Collocated.py @@ -22,7 +22,7 @@ import Test, TestI, AllTests def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test")) #adapter.activate() // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, True) diff --git a/python/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py index 9c91f317da3..33ec4916591 100755 --- a/python/test/Ice/proxy/Server.py +++ b/python/test/Ice/proxy/Server.py @@ -23,7 +23,7 @@ def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py index 028dfb55af7..35804df3068 100755 --- a/python/test/Ice/proxy/ServerAMD.py +++ b/python/test/Ice/proxy/ServerAMD.py @@ -40,7 +40,7 @@ class MyDerivedClassI(Test.MyDerivedClass): def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) + adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/servantLocator/Collocated.py b/python/test/Ice/servantLocator/Collocated.py index 872fe98ca78..256d8a73542 100755 --- a/python/test/Ice/servantLocator/Collocated.py +++ b/python/test/Ice/servantLocator/Collocated.py @@ -23,8 +23,8 @@ class TestServer(Ice.Application): #adapter.activate() // Don't activate OA to ensure collocation is used. adapter.addServantLocator(TestI.ServantLocatorI("category"), "category") adapter.addServantLocator(TestI.ServantLocatorI(""), "") - adapter.add(TestI.TestI(), self.communicator().stringToIdentity("asm")) - adapter.add(TestActivationI.TestActivationI(), self.communicator().stringToIdentity("test/activation")) + adapter.add(TestI.TestI(), Ice.stringToIdentity("asm")) + adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation")) AllTests.allTests(self.communicator(), False) diff --git a/python/test/Ice/servantLocator/Server.py b/python/test/Ice/servantLocator/Server.py index 0d5ed9e3574..3eb06581e9a 100755 --- a/python/test/Ice/servantLocator/Server.py +++ b/python/test/Ice/servantLocator/Server.py @@ -22,8 +22,8 @@ class TestServer(Ice.Application): adapter = self.communicator().createObjectAdapter("TestAdapter") adapter.addServantLocator(TestI.ServantLocatorI("category"), "category") adapter.addServantLocator(TestI.ServantLocatorI(""), "") - adapter.add(TestI.TestI(), self.communicator().stringToIdentity("asm")) - adapter.add(TestActivationI.TestActivationI(), self.communicator().stringToIdentity("test/activation")) + adapter.add(TestI.TestI(), Ice.stringToIdentity("asm")) + adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation")) adapter.activate() adapter.waitForDeactivate() diff --git a/python/test/Ice/servantLocator/ServerAMD.py b/python/test/Ice/servantLocator/ServerAMD.py index 9714e9525b8..78c87c366a1 100755 --- a/python/test/Ice/servantLocator/ServerAMD.py +++ b/python/test/Ice/servantLocator/ServerAMD.py @@ -22,8 +22,8 @@ class TestServer(Ice.Application): adapter = self.communicator().createObjectAdapter("TestAdapter") adapter.addServantLocator(TestAMDI.ServantLocatorI("category"), "category") adapter.addServantLocator(TestAMDI.ServantLocatorI(""), "") - adapter.add(TestAMDI.TestI(), self.communicator().stringToIdentity("asm")) - adapter.add(TestActivationAMDI.TestActivationAMDI(), self.communicator().stringToIdentity("test/activation")) + adapter.add(TestAMDI.TestI(), Ice.stringToIdentity("asm")) + adapter.add(TestActivationAMDI.TestActivationAMDI(), Ice.stringToIdentity("test/activation")) adapter.activate() adapter.waitForDeactivate() diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py index be53319bfa1..da672a90a7d 100755 --- a/python/test/Ice/slicing/exceptions/Server.py +++ b/python/test/Ice/slicing/exceptions/Server.py @@ -157,7 +157,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI() - adapter.add(object, communicator.stringToIdentity("Test")) + adapter.add(object, Ice.stringToIdentity("Test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py index e0fee657c5b..9b3004e1d6e 100755 --- a/python/test/Ice/slicing/exceptions/ServerAMD.py +++ b/python/test/Ice/slicing/exceptions/ServerAMD.py @@ -175,7 +175,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI() - adapter.add(object, communicator.stringToIdentity("Test")) + adapter.add(object, Ice.stringToIdentity("Test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py index 18e485fb52b..6103da811fe 100755 --- a/python/test/Ice/slicing/objects/Server.py +++ b/python/test/Ice/slicing/objects/Server.py @@ -368,7 +368,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI() - adapter.add(object, communicator.stringToIdentity("Test")) + adapter.add(object, Ice.stringToIdentity("Test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py index 4d7b9a3b96a..1477e119151 100755 --- a/python/test/Ice/slicing/objects/ServerAMD.py +++ b/python/test/Ice/slicing/objects/ServerAMD.py @@ -397,7 +397,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI() - adapter.add(object, communicator.stringToIdentity("Test")) + adapter.add(object, Ice.stringToIdentity("Test")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py index d5e82452cfe..1a1b52014cc 100755 --- a/python/test/Ice/timeout/Server.py +++ b/python/test/Ice/timeout/Server.py @@ -51,7 +51,7 @@ class TimeoutI(Test.Timeout): def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(TimeoutI(), communicator.stringToIdentity("timeout")) + adapter.add(TimeoutI(), Ice.stringToIdentity("timeout")) adapter.activate() communicator.waitForShutdown() return True diff --git a/python/test/Slice/keyword/Client.py b/python/test/Slice/keyword/Client.py index b58ded5b824..a81722b544d 100755 --- a/python/test/Slice/keyword/Client.py +++ b/python/test/Slice/keyword/Client.py @@ -79,13 +79,13 @@ def testtypes(): def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(execI(), communicator.stringToIdentity("test")) + adapter.add(execI(), Ice.stringToIdentity("test")) adapter.activate() sys.stdout.write("Testing operation name... ") sys.stdout.flush() p = _and.execPrx.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test"))); + adapter.createProxy(Ice.stringToIdentity("test"))); p._finally(); print("ok") diff --git a/ruby/test/Ice/exceptions/AllTests.rb b/ruby/test/Ice/exceptions/AllTests.rb index f504947c2f6..1a56228a686 100644 --- a/ruby/test/Ice/exceptions/AllTests.rb +++ b/ruby/test/Ice/exceptions/AllTests.rb @@ -288,7 +288,7 @@ def allTests(communicator) print "catching object not exist exception... " STDOUT.flush - id = communicator.stringToIdentity("does not exist") + id = Ice::stringToIdentity("does not exist") begin thrower2 = Test::ThrowerPrx::uncheckedCast(thrower.ice_identity(id)) thrower2.throwAasA(1) diff --git a/ruby/test/Ice/operations/Twoways.rb b/ruby/test/Ice/operations/Twoways.rb index e8a70e7e1a5..0b89bc9d0ce 100644 --- a/ruby/test/Ice/operations/Twoways.rb +++ b/ruby/test/Ice/operations/Twoways.rb @@ -267,9 +267,9 @@ def twoways(communicator, p) test(Ice::proxyIdentityAndFacetEqual(c1, p)) test(!Ice::proxyIdentityAndFacetEqual(c2, p)) test(Ice::proxyIdentityAndFacetEqual(r, p)) - test(c1.ice_getIdentity() == communicator.stringToIdentity("test")) - test(c2.ice_getIdentity() == communicator.stringToIdentity("noSuchIdentity")) - test(r.ice_getIdentity() == communicator.stringToIdentity("test")) + test(c1.ice_getIdentity() == Ice::stringToIdentity("test")) + test(c2.ice_getIdentity() == Ice::stringToIdentity("noSuchIdentity")) + test(r.ice_getIdentity() == Ice::stringToIdentity("test")) r.opVoid() c1.opVoid() begin diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index eb407edd3fe..d120dc72e52 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -198,7 +198,8 @@ local interface Communicator * @see #identityToString * **/ - ["cpp:const"] Identity stringToIdentity(string str); + ["cpp:const", "deprecate:stringToIdentity() is deprecated, use the static stringToIdentity() method instead."] + Identity stringToIdentity(string str); /** * @@ -211,7 +212,8 @@ local interface Communicator * @see #stringToIdentity * **/ - ["cpp:const"] string identityToString(Identity ident); + ["cpp:const", "deprecate:identityToString() is deprecated, use the static identityToString() method instead."] + string identityToString(Identity ident); /** * |