More changes to inconsistent ice_ proxy methods

21 files changed, 104 insertions, 72 deletions

diff --git a/cpp/CHANGES b/cpp/CHANGES
index fc4d4d2a407..3c62d863bb4 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -87,13 +87,15 @@ Changes since version 3.0.1
   override the timeout and compress flag of indirect proxy endpoints.
 
 - Added ice_getSecure, ice_getLocator, ice_getRouter,
-  ice_getCollocationOptimization proxy methods.
+  ice_isCollocationOptimized proxy methods.
 
-- Deprecated ice_newIdentity, ice_newFacet, ice_newContext,
+- Deprecated ice_hash, ice_communicator, ice_collocationOptimization,
+  ice_connection, ice_newIdentity, ice_newFacet, ice_newContext,
   ice_newAdapterId and ice_newEndpoints methods proxy. You should now
-  use the ice_identity, ice_facet, ice_context, ice_adapterId and
-  ice_endpoints proxy methods. The former methods will be removed from
-  the next major release.
+  use the ice_getHash, ice_getCommunicator, ice_collocationOptimized,
+  ice_sgetCconnection, ice_identity, ice_facet, ice_context,
+  ice_adapterId and ice_endpoints proxy methods. The former methods
+  will be removed from the next major release.
 
 - Changed the Ice core and services to use the random generator from
   IceUtil. The initialization of the communicator doesn't call srand
diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp
index f730fd025b7..5cb0aa1d576 100644
--- a/cpp/demo/Ice/bidir/Client.cpp
+++ b/cpp/demo/Ice/bidir/Client.cpp
@@ -64,7 +64,7 @@ CallbackClient::run(int argc, char* argv[])
     ident.category = "";
     adapter->add(new CallbackReceiverI, ident);
     adapter->activate();
-    server->ice_connection()->setAdapter(adapter);
+    server->ice_getConnection()->setAdapter(adapter);
     server->addClient(ident);
     communicator()->waitForShutdown();
 
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 5b816776a9f..52088bb504e 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -82,9 +82,12 @@ public:
     bool operator==(const Object&) const;
     bool operator!=(const Object&) const;
     bool operator<(const Object&) const;
-    ::Ice::Int ice_hash() const;
 
-    ::Ice::CommunicatorPtr ice_communicator() const;
+    ICE_DEPRECATED_API ::Ice::Int ice_hash() const;
+    ::Ice::Int ice_getHash() const;
+
+    ICE_DEPRECATED_API ::Ice::CommunicatorPtr ice_communicator() const;
+    ::Ice::CommunicatorPtr ice_getCommunicator() const;
 
     ::std::string ice_toString() const;
 
@@ -155,8 +158,9 @@ public:
     ::Ice::LocatorPrx ice_getLocator() const;
     ::Ice::ObjectPrx ice_locator(const ::Ice::LocatorPrx&) const;
 
-    bool ice_getCollocationOptimization() const;
-    ::Ice::ObjectPrx ice_collocationOptimization(bool) const;
+    bool ice_isCollocationOptimized() const;
+    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_collocationOptimization(bool) const;
+    ::Ice::ObjectPrx ice_collocationOptimized(bool) const;
 
     ::Ice::ObjectPrx ice_twoway() const;
     bool ice_isTwoway() const;
@@ -173,7 +177,8 @@ public:
     ::Ice::ObjectPrx ice_timeout(int) const;
     ::Ice::ObjectPrx ice_connectionId(const ::std::string&) const;
 
-    ::Ice::ConnectionPtr ice_connection();
+    ICE_DEPRECATED_API ::Ice::ConnectionPtr ice_connection();
+    ::Ice::ConnectionPtr ice_getConnection();
 
     ::IceInternal::ReferencePtr __reference() const;
     void __copyFrom(const ::Ice::ObjectPrx&);
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 7e37ad0ce1f..6554eda8b3b 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -170,7 +170,7 @@ Glacier2::Request::isBatch() const
 ConnectionPtr
 Glacier2::Request::getConnection() const
 {
-    return _proxy->ice_connection();
+    return _proxy->ice_getConnection();
 }
 
 Glacier2::Response::Response(const AMD_Array_Object_ice_invokePtr& amdCB, bool ok, 
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 1611c953f29..94e6ce98157 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -131,12 +131,24 @@ IceProxy::Ice::Object::operator<(const Object& r) const
 Int
 IceProxy::Ice::Object::ice_hash() const
 {
+    return ice_getHash();
+}
+
+Int
+IceProxy::Ice::Object::ice_getHash() const
+{
     return _reference->hash();
 }
 
 CommunicatorPtr
 IceProxy::Ice::Object::ice_communicator() const
 {
+    return ice_getCommunicator();
+}
+
+CommunicatorPtr
+IceProxy::Ice::Object::ice_getCommunicator() const
+{
     return _reference->getCommunicator();
 }
 
@@ -651,7 +663,7 @@ IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
 }
 
 bool
-IceProxy::Ice::Object::ice_getCollocationOptimization() const
+IceProxy::Ice::Object::ice_isCollocationOptimized() const
 {
     return _reference->getCollocationOptimization();
 }
@@ -659,6 +671,12 @@ IceProxy::Ice::Object::ice_getCollocationOptimization() const
 ObjectPrx
 IceProxy::Ice::Object::ice_collocationOptimization(bool b) const
 {
+    return ice_collocationOptimized(b);
+}
+
+ObjectPrx
+IceProxy::Ice::Object::ice_collocationOptimized(bool b) const
+{
     if(b == _reference->getCollocationOptimization())
     {
 	return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
@@ -827,6 +845,12 @@ IceProxy::Ice::Object::ice_connectionId(const string& id) const
 ConnectionPtr
 IceProxy::Ice::Object::ice_connection()
 {
+    return ice_getConnection();
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::ice_getConnection()
+{
     int __cnt = 0;
     while(true)
     {
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index c426735b85d..9347ff82c09 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -175,7 +175,7 @@ IceInternal::RouterInfo::getClientProxy()
 	//
 	try
 	{
-	    _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+	    _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
 	}
 	catch(const Ice::CollocationOptimizationException&)
 	{
@@ -199,7 +199,7 @@ IceInternal::RouterInfo::setClientProxy(const ObjectPrx& clientProxy)
     //
     try
     {
-        _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+        _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
     }
     catch(const Ice::CollocationOptimizationException&)
     {
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index d512c82f6af..9104d68ece5 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -423,7 +423,7 @@ NodeService::start(int argc, char* argv[])
 	    try
 	    {
 		Ice::ObjectPrx object = _adapter->addWithUUID(new FileUserAccountMapperI(userAccountFileProperty));
-		object = object->ice_collocationOptimization(true);
+		object = object->ice_collocationOptimized(true);
 		mapper = UserAccountMapperPrx::uncheckedCast(object);
 	    }
 	    catch(const std::string& msg)
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index b655a31f4b2..43332e40a1f 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.cpp
@@ -70,7 +70,7 @@ public:
 	}
 	catch(const Ice::LocalException& ex)
 	{
-	    Ice::Warning out(_proxy->ice_communicator()->getLogger());
+	    Ice::Warning out(_proxy->ice_getCommunicator()->getLogger());
 	    out << "unexpected exception while reaping node session:\n" << ex;
 	}
     }
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index ddf4efdb535..b51be9e8789 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -287,7 +287,7 @@ LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator,
 		   const Ice::LocatorRegistryPrx& locatorRegistry) :
     _communicator(communicator),
     _database(database),
-    _locatorRegistry(Ice::LocatorRegistryPrx::uncheckedCast(locatorRegistry->ice_collocationOptimization(false)))
+    _locatorRegistry(Ice::LocatorRegistryPrx::uncheckedCast(locatorRegistry->ice_collocationOptimized(false)))
 {
 }
 
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index a48dfb956c8..42afc878e0f 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -38,7 +38,7 @@ public:
 	    Ice::Trace out(_traceLevels->logger, _traceLevels->serverCat);
 	    out << "loaded `" << _id << "' on node `" << _node << "'";	
 	}
-	_server->loadCallback(ServerPrx::uncheckedCast(proxy->ice_collocationOptimization(false)), adapters, at, dt);
+	_server->loadCallback(ServerPrx::uncheckedCast(proxy->ice_collocationOptimized(false)), adapters, at, dt);
     }
 
     void
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index dedc04e07c5..27a1c73f9fb 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -103,7 +103,7 @@ public:
 	}
 	catch(const Ice::LocalException& ex)
 	{
-	    Ice::Warning out(_proxy->ice_communicator()->getLogger());
+	    Ice::Warning out(_proxy->ice_getCommunicator()->getLogger());
 	    out << "unexpected exception while reaping node session:\n" << ex;
 	}
     }
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index 5b68c70bc5a..62fdfe8bd33 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -605,11 +605,11 @@ ServerEntry::loadCallback(const ServerPrx& proxy, const AdapterPrxDict& adpts, i
 	    _loaded = _load;
 	    assert(_loaded.get());
 	    int timeout = _cache.getNodeCache().getSessionTimeout() * 1000; // sec to ms
-	    _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimization(false));
+	    _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimized(false));
 	    _adapters.clear();
 	    for(AdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p)
 	    {
-		Ice::ObjectPrx adapter = p->second->ice_timeout(timeout)->ice_collocationOptimization(false);
+		Ice::ObjectPrx adapter = p->second->ice_timeout(timeout)->ice_collocationOptimized(false);
 		_adapters.insert(make_pair(p->first, AdapterPrx::uncheckedCast(adapter)));
 	    }
 	    _activationTimeout = at + timeout;
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index c91c87d3490..47795502db5 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -34,7 +34,7 @@ public:
     void
     ice_exception(const Ice::Exception& ex)
     {
-	Ice::Warning out(_observer->ice_communicator()->getLogger());
+	Ice::Warning out(_observer->ice_getCommunicator()->getLogger());
 	out << "couldn't initialize registry observer:\n" << ex;    
     }
 
@@ -65,7 +65,7 @@ public:
     void
     ice_exception(const Ice::Exception& ex)
     {
-	Ice::Warning out(_observer->ice_communicator()->getLogger());
+	Ice::Warning out(_observer->ice_getCommunicator()->getLogger());
 	out << "couldn't initialize node observer:\n" << ex;    
     }
     
@@ -94,7 +94,7 @@ NodeObserverTopic::NodeObserverTopic(const IceStorm::TopicManagerPrx& topicManag
     // topic because the subscribe() method is given a fixed proxy
     // which can't be marshalled.
     //
-    const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimization(true));
+    const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimized(true));
     const_cast<NodeObserverPrx&>(_publisher) = NodeObserverPrx::uncheckedCast(_topic->getPublisher()->ice_oneway());
 }
 
@@ -261,7 +261,7 @@ RegistryObserverTopic::RegistryObserverTopic(const IceStorm::TopicManagerPrx& to
     // topic because the subscribe() method is given a fixed proxy
     // which can't be marshalled.
     //
-    const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimization(true));
+    const_cast<IceStorm::TopicPrx&>(_topic) = IceStorm::TopicPrx::uncheckedCast(t->ice_collocationOptimized(true));
     const_cast<RegistryObserverPrx&>(_publisher) = 
 	RegistryObserverPrx::uncheckedCast(_topic->getPublisher()->ice_oneway());
 }
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index 8986ce37723..0cd356e93df 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -591,7 +591,8 @@ IcePatch2::Patcher::init(const FileServerPrx& server)
     // Make sure that _chunkSize doesn't exceed MessageSizeMax, otherwise
     // it won't work at all.
     //
-    int sizeMax = server->ice_communicator()->getProperties()->getPropertyAsIntWithDefault("Ice.MessageSizeMax", 1024);
+    int sizeMax = 
+        server->ice_getCommunicator()->getProperties()->getPropertyAsIntWithDefault("Ice.MessageSizeMax", 1024);
     if(_chunkSize < 1)
     {
 	const_cast<Int&>(_chunkSize) = 1;
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 9eee974b561..1aa77ec675e 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -96,7 +96,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
 	TestIntfPrx test1 = adapter->getTestIntf();
 	TestIntfPrx test2 = adapter->getTestIntf();
-	test(test1->ice_connection() == test2->ice_connection());
+	test(test1->ice_getConnection() == test2->ice_getConnection());
 
 	test1->ice_ping();
 	test2->ice_ping();
@@ -104,8 +104,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	com->deactivateObjectAdapter(adapter);
 	
 	TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1);
-	test(test3->ice_connection() == test1->ice_connection());
-	test(test3->ice_connection() == test2->ice_connection());
+	test(test3->ice_getConnection() == test1->ice_getConnection());
+	test(test3->ice_getConnection() == test2->ice_getConnection());
 	
 	try
 	{
@@ -143,11 +143,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    random_shuffle(adpts.begin(), adpts.end(), randomGenerator);
 	    TestIntfPrx test3 = createTestIntfPrx(adpts);
 
-	    test(test1->ice_connection() == test2->ice_connection());
-	    test(test2->ice_connection() == test3->ice_connection());
+	    test(test1->ice_getConnection() == test2->ice_getConnection());
+	    test(test2->ice_getConnection() == test3->ice_getConnection());
 	    
 	    names.erase(test1->getAdapterName());
-	    test1->ice_connection()->close(false);
+	    test1->ice_getConnection()->close(false);
 	}
 
 	//
@@ -169,7 +169,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
 	    for(vector<RemoteObjectAdapterPrx>::const_iterator q = adapters.begin(); q != adapters.end(); ++q)
 	    {
-		(*q)->getTestIntf()->ice_connection()->close(false);
+		(*q)->getTestIntf()->ice_getConnection()->close(false);
 	    }
 	}	    
 
@@ -190,11 +190,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    random_shuffle(adpts.begin(), adpts.end(), randomGenerator);
 	    TestIntfPrx test3 = createTestIntfPrx(adpts);
 	    
-	    test(test1->ice_connection() == test2->ice_connection());
-	    test(test2->ice_connection() == test3->ice_connection());
+	    test(test1->ice_getConnection() == test2->ice_getConnection());
+	    test(test2->ice_getConnection() == test3->ice_getConnection());
 
 	    names.erase(test1->getAdapterName());
-	    test1->ice_connection()->close(false);
+	    test1->ice_getConnection()->close(false);
 	}
 	
 	//
@@ -234,11 +234,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    random_shuffle(adpts.begin(), adpts.end(), randomGenerator);
 	    TestIntfPrx test3 = createTestIntfPrx(adpts);
 
-	    test(test1->ice_connection() == test2->ice_connection());
-	    test(test2->ice_connection() == test3->ice_connection());
+	    test(test1->ice_getConnection() == test2->ice_getConnection());
+	    test(test2->ice_getConnection() == test3->ice_getConnection());
 	    
 	    names.erase(getAdapterNameWithAMI(test1));
-	    test1->ice_connection()->close(false);
+	    test1->ice_getConnection()->close(false);
 	}
 
 	//
@@ -260,7 +260,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
 	    for(vector<RemoteObjectAdapterPrx>::const_iterator q = adapters.begin(); q != adapters.end(); ++q)
 	    {
-		(*q)->getTestIntf()->ice_connection()->close(false);
+		(*q)->getTestIntf()->ice_getConnection()->close(false);
 	    }
 	}	    
 
@@ -281,11 +281,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    random_shuffle(adpts.begin(), adpts.end(), randomGenerator);
 	    TestIntfPrx test3 = createTestIntfPrx(adpts);
 	    
-	    test(test1->ice_connection() == test2->ice_connection());
-	    test(test2->ice_connection() == test3->ice_connection());
+	    test(test1->ice_getConnection() == test2->ice_getConnection());
+	    test(test2->ice_getConnection() == test3->ice_getConnection());
 
 	    names.erase(test1->getAdapterName());
-	    test1->ice_connection()->close(false);
+	    test1->ice_getConnection()->close(false);
 	}
 	
 	//
@@ -317,7 +317,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	while(!names.empty())
 	{
 	    names.erase(test->getAdapterName());
-	    test->ice_connection()->close(false);
+	    test->ice_getConnection()->close(false);
 	}
 
 	test = TestIntfPrx::uncheckedCast(test->ice_endpointSelection(Ice::Random));
@@ -329,7 +329,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	while(!names.empty())
 	{
 	    names.erase(test->getAdapterName());
-	    test->ice_connection()->close(false);
+	    test->ice_getConnection()->close(false);
 	}
 
 	deactivate(com, adapters);
@@ -382,11 +382,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	adapters.push_back(com->createObjectAdapter("Adapter36", endpoints[2]->toString()));
 	for(i = 0; i < nRetry && test->getAdapterName() == "Adapter36"; i++);
 	test(i == nRetry);
-	test->ice_connection()->close(false);
+	test->ice_getConnection()->close(false);
 	adapters.push_back(com->createObjectAdapter("Adapter35", endpoints[1]->toString()));
 	for(i = 0; i < nRetry && test->getAdapterName() == "Adapter35"; i++);
 	test(i == nRetry);
-	test->ice_connection()->close(false);
+	test->ice_getConnection()->close(false);
 	adapters.push_back(com->createObjectAdapter("Adapter34", endpoints[0]->toString()));
 	for(i = 0; i < nRetry && test->getAdapterName() == "Adapter34"; i++);
 	test(i == nRetry);
@@ -403,7 +403,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	TestIntfPrx test2 = TestIntfPrx::uncheckedCast(adapter->getTestIntf()->ice_cacheConnection(false));
 	test(!test1->ice_getCacheConnection());
 	test(!test2->ice_getCacheConnection());
-	test(test1->ice_connection() == test2->ice_connection());
+	test(test1->ice_getConnection() == test2->ice_getConnection());
 
 	test1->ice_ping();
 	
@@ -412,7 +412,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1);
 	try
 	{
-	    test(test3->ice_connection() == test1->ice_connection());
+	    test(test3->ice_getConnection() == test1->ice_getConnection());
 	    test(false);
 	}
 	catch(const Ice::ConnectionRefusedException&)
@@ -622,7 +622,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	test(test->getAdapterName() == "Adapter71");
 	
 	TestIntfPrx testUDP = TestIntfPrx::uncheckedCast(test->ice_datagram());
-	test(test->ice_connection() != testUDP->ice_connection());
+	test(test->ice_getConnection() != testUDP->ice_getConnection());
 	try
 	{
 	    testUDP->getAdapterName();
@@ -646,7 +646,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    for(i = 0; i < 5; i++)
 	    {
 		test(test->getAdapterName() == "Adapter82");
-		test->ice_connection()->close(false);
+		test->ice_getConnection()->close(false);
 	    }
 	    
 	    TestIntfPrx testSecure = TestIntfPrx::uncheckedCast(test->ice_secure(true));
@@ -655,14 +655,14 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    test(!testSecure->ice_getSecure());
 	    testSecure = TestIntfPrx::uncheckedCast(test->ice_secure(true));
 	    test(testSecure->ice_getSecure());
-	    test(test->ice_connection() != testSecure->ice_connection());
+	    test(test->ice_getConnection() != testSecure->ice_getConnection());
 
 	    com->deactivateObjectAdapter(adapters[1]);
 	    
 	    for(i = 0; i < 5; i++)
 	    {
 		test(test->getAdapterName() == "Adapter81");
-		test->ice_connection()->close(false);
+		test->ice_getConnection()->close(false);
 	    }
 
 	    com->createObjectAdapter("Adapter83", (test->ice_getEndpoints()[1])->toString()); // Reactive tcp OA.
@@ -670,7 +670,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    for(i = 0; i < 5; i++)
 	    {
 		test(test->getAdapterName() == "Adapter83");
-		test->ice_connection()->close(false);
+		test->ice_getConnection()->close(false);
 	    }
 
 	    com->deactivateObjectAdapter(adapters[0]);
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index b47213d18ea..c30da4dab97 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -363,7 +363,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     try
     {
 	HelloPrx helloPrx = HelloPrx::checkedCast(communicator->stringToProxy(communicator->identityToString(id)));
-	Ice::ConnectionPtr connection = helloPrx->ice_connection();
+	Ice::ConnectionPtr connection = helloPrx->ice_getConnection();
 	test(false);
     }
     catch(const Ice::CollocationOptimizationException&)
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 7c554a23be5..f3ebb343833 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -23,8 +23,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     test(base);
     cout << "ok" << endl;
 
-    cout << "testing ice_communicator... " << flush;
-    test(base->ice_communicator() == communicator);
+    cout << "testing ice_getCommunicator... " << flush;
+    test(base->ice_getCommunicator() == communicator);
     cout << "ok" << endl;
 
     cout << "testing proxy methods... " << flush;
@@ -39,8 +39,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     test(base->ice_batchDatagram()->ice_isBatchDatagram());
     test(base->ice_secure(true)->ice_getSecure());
     test(!base->ice_secure(false)->ice_getSecure());
-    test(base->ice_collocationOptimization(true)->ice_getCollocationOptimization());
-    test(!base->ice_collocationOptimization(false)->ice_getCollocationOptimization());
+    test(base->ice_collocationOptimized(true)->ice_isCollocationOptimized());
+    test(!base->ice_collocationOptimized(false)->ice_isCollocationOptimized());
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index 7749e88be68..918db1778c9 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -66,7 +66,7 @@ batchOneways(const Test::MyClassPrx& p)
 	    test(false);
 	}
 	
-	batch->ice_connection()->flushBatchRequests();
+	batch->ice_getConnection()->flushBatchRequests();
     }
     
     for(i = 0 ; i < 10 ; ++i)
@@ -94,6 +94,6 @@ batchOneways(const Test::MyClassPrx& p)
 	    test(false);
 	}
 	
-	batch->ice_connection()->flushBatchRequests();
+	batch->ice_getConnection()->flushBatchRequests();
     }
 }
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 95d8a6f835a..694933833dc 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -139,7 +139,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	//
 	TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_timeout(500));
 	to->holdAdapter(750);
-	to->ice_connection()->close(true); // Force a reconnect.
+	to->ice_getConnection()->close(true); // Force a reconnect.
 	try
 	{
 	    to->op();
@@ -157,7 +157,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	timeout->op(); // Ensure adapter is active.
 	TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_timeout(1000));
 	to->holdAdapter(500);
-	to->ice_connection()->close(true); // Force a reconnect.
+	to->ice_getConnection()->close(true); // Force a reconnect.
 	try
 	{
 	    to->op();
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index 19ffe431337..e44a745cd93 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -654,7 +654,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	NodeObserverI* nodeObs1 = new NodeObserverI();
 	Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1);
 	adpt1->activate();
-	registry->ice_connection()->setAdapter(adpt1);	
+	registry->ice_getConnection()->setAdapter(adpt1);	
 	session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity());
 	
 	Ice::ObjectAdapterPtr adpt2 = communicator->createObjectAdapterWithEndpoints("Observer2", "default");
@@ -866,7 +866,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	NodeObserverI* nodeObs1 = new NodeObserverI();
 	Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1);
 	adpt1->activate();
-	registry->ice_connection()->setAdapter(adpt1);	
+	registry->ice_getConnection()->setAdapter(adpt1);	
 	session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity());
 	
 	regObs1->waitForUpdate(__FILE__, __LINE__);
@@ -1164,7 +1164,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	NodeObserverI* nodeObs1 = new NodeObserverI();
 	Ice::ObjectPrx no1 = adpt1->addWithUUID(nodeObs1);
 	adpt1->activate();
-	registry->ice_connection()->setAdapter(adpt1);	
+	registry->ice_getConnection()->setAdapter(adpt1);	
 	session1->setObserversByIdentity(ro1->ice_getIdentity(), no1->ice_getIdentity());
 	
 	regObs1->waitForUpdate(__FILE__, __LINE__);
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index a8bd6ba2efe..d89a647c143 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -238,7 +238,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
 	//
 	try
 	{
-	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection());
+	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection());
 	    test(info.certs.size() == 2);
 	}
 	catch(const IceSSL::ConnectionInvalidException&)
@@ -344,7 +344,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
 	    test(serverCert->verify(caCert->getPublicKey()));
 	    test(caCert->verify(caCert->getPublicKey()));
 
-	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection());
+	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection());
 
 	    test(info.certs.size() == 2);
 
@@ -499,7 +499,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
 	{
 	    string cipherSub = "ADH-";
 	    server->checkCipher(cipherSub);
-	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection());
+	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection());
 	    test(info.cipher.compare(0, cipherSub.size(), cipherSub) == 0);
 	}
 	catch(const LocalException&)
@@ -515,7 +515,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
 	//
 	verifier->reset();
 	verifier->returnValue(false);
-	server->ice_connection()->close(false);
+	server->ice_getConnection()->close(false);
 	try
 	{
 	    server->ice_ping();
@@ -859,7 +859,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
 	{
 	    string cipherSub = "ADH-";
 	    server->checkCipher(cipherSub);
-	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection());
+	    IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_getConnection());
 	    test(info.cipher.compare(0, cipherSub.size(), cipherSub) == 0);
 	}
 	catch(const LocalException&)