case insensitivity fixes

14 files changed, 50 insertions, 50 deletions

diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index c641682b780..0bd309783b1 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -217,13 +217,13 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current
 
     EvictorElementPtr element;
 
-    map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(current.identity);
+    map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(current.id);
     if(p != _evictorMap.end())
     {
 	if(_trace >= 2)
 	{
 	    Trace out(_db->getCommunicator()->getLogger(), "Evictor");
-	    out << "found \"" << current.identity << "\" in the queue";
+	    out << "found \"" << current.id << "\" in the queue";
 	}
 
 	//
@@ -232,7 +232,7 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current
 	//
 	element = p->second;
 	_evictorList.erase(element->position);
-	_evictorList.push_front(current.identity);
+	_evictorList.push_front(current.id);
 	element->position = _evictorList.begin();
     }
     else
@@ -240,15 +240,15 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current
 	if(_trace >= 2)
 	{
 	    Trace out(_db->getCommunicator()->getLogger(), "Evictor");
-	    out << "couldn't find \"" << current.identity << "\" in the queue\n"
-		<< "loading \"" << current.identity << "\" from the database";
+	    out << "couldn't find \"" << current.id << "\" in the queue\n"
+		<< "loading \"" << current.id << "\" from the database";
 	}
 
 	//
 	// Load the Ice Object from database and create and add a
 	// Servant for it.
 	//
-	IdentityObjectDict::iterator p = _dict.find(current.identity);
+	IdentityObjectDict::iterator p = _dict.find(current.id);
 	if(p == _dict.end())
 	{
 	    //
@@ -262,14 +262,14 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current
 	// Add the new Servant to the evictor queue.
 	//
 	ObjectPtr servant = p->second;
-	element = add(current.identity, servant);
+	element = add(current.id, servant);
 
 	//
 	// If an initializer is installed, call it now.
 	//
 	if(_initializer)
 	{
-	    _initializer->initialize(adapter, current.identity, servant);
+	    _initializer->initialize(adapter, current.id, servant);
 	}
     }
 
@@ -321,7 +321,7 @@ Freeze::EvictorI::finished(const ObjectAdapterPtr&, const Current& current,
     {
 	if(!current.nonmutating)
 	{
-	    _dict.insert(make_pair(current.identity, servant));
+	    _dict.insert(make_pair(current.id, servant));
 	}
     }
 
diff --git a/cpp/src/Glacier/Blobject.cpp b/cpp/src/Glacier/Blobject.cpp
index 37aed350eba..ab6b484c64c 100644
--- a/cpp/src/Glacier/Blobject.cpp
+++ b/cpp/src/Glacier/Blobject.cpp
@@ -79,7 +79,7 @@ Glacier::Blobject::invoke(ObjectPrx& proxy, const vector<Byte>& inParams, vector
 	    
 	    if(_forwardContext)
 	    {
-		return proxy->ice_invoke(current.operation, current.nonmutating, inParams, outParams, current.context);
+		return proxy->ice_invoke(current.operation, current.nonmutating, inParams, outParams, current.ctx);
 	    }
 	    else
 	    {
@@ -115,8 +115,8 @@ Glacier::Blobject::modifyProxy(ObjectPrx& proxy, const Current& current)
     }
 
     MissiveQueuePtr missiveQueue;
-    Context::const_iterator p = current.context.find("_fwd");
-    if(p != current.context.end())
+    Context::const_iterator p = current.ctx.find("_fwd");
+    if(p != current.ctx.end())
     {
 	for(unsigned int i = 0; i < p->second.length(); ++i)
 	{
diff --git a/cpp/src/Glacier/ClientBlobject.cpp b/cpp/src/Glacier/ClientBlobject.cpp
index e582b4e73c9..de8a070f9d3 100644
--- a/cpp/src/Glacier/ClientBlobject.cpp
+++ b/cpp/src/Glacier/ClientBlobject.cpp
@@ -70,25 +70,25 @@ Glacier::ClientBlobject::ice_invoke(const vector<Byte>& inParams, vector<Byte>&
     //
     if(!_allowCategories.empty())
     {
-	if(!binary_search(_allowCategories.begin(), _allowCategories.end(), current.identity.category))
+	if(!binary_search(_allowCategories.begin(), _allowCategories.end(), current.id.category))
 	{
 	    if(_traceLevel >= 1)
 	    {
 		Trace out(_logger, "Glacier");
 		out << "rejecting request\n";
-		out << "identity: " << identityToString(current.identity);
+		out << "identity: " << identityToString(current.id);
 	    }
 	    ObjectNotExistException ex(__FILE__, __LINE__);
-	    ex.identity = current.identity;
+	    ex.id = current.id;
 	    throw ex;
 	}
     }
 
-    ObjectPrx proxy = _routingTable->get(current.identity);
+    ObjectPrx proxy = _routingTable->get(current.id);
     if(!proxy)
     {
 	ObjectNotExistException ex(__FILE__, __LINE__);
-	ex.identity = current.identity;
+	ex.id = current.id;
 	throw ex;
     }
 
diff --git a/cpp/src/Glacier/Missive.cpp b/cpp/src/Glacier/Missive.cpp
index be8493cf29e..9363b7f8711 100644
--- a/cpp/src/Glacier/Missive.cpp
+++ b/cpp/src/Glacier/Missive.cpp
@@ -21,8 +21,8 @@ Glacier::Missive::Missive(const ObjectPrx& proxy, const vector<Byte>& inParams,
     _current(current),
     _forwardContext(forwardContext)
 {
-    Context::const_iterator p = current.context.find("_ovrd");
-    if(p != current.context.end())
+    Context::const_iterator p = current.ctx.find("_ovrd");
+    if(p != current.ctx.end())
     {
 	_override = p->second;
     }
@@ -34,7 +34,7 @@ Glacier::Missive::invoke()
     std::vector<Byte> dummy;
     if(_forwardContext)
     {
-	_proxy->ice_invoke(_current.operation, _current.nonmutating, _inParams, dummy, _current.context);
+	_proxy->ice_invoke(_current.operation, _current.nonmutating, _inParams, dummy, _current.ctx);
     }
     else
     {
diff --git a/cpp/src/Glacier/ServerBlobject.cpp b/cpp/src/Glacier/ServerBlobject.cpp
index 84ab3339bc7..2cf87e0d4ad 100644
--- a/cpp/src/Glacier/ServerBlobject.cpp
+++ b/cpp/src/Glacier/ServerBlobject.cpp
@@ -48,7 +48,7 @@ Glacier::ServerBlobject::ice_invoke(const vector<Byte>& inParams, vector<Byte>&
 {
     assert(_clientAdapter); // Destroyed?
 
-    ObjectPrx proxy = _clientAdapter->createReverseProxy(current.identity);
+    ObjectPrx proxy = _clientAdapter->createReverseProxy(current.id);
     assert(proxy);
 
     return invoke(proxy, inParams, outParams, current);
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index 87f48b10516..d97a903c371 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -25,11 +25,11 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& curr
 {
     try
     {
-	_servant = _adapter->identityToServant(_current.identity);
+	_servant = _adapter->identityToServant(_current.id);
     
-	if(!_servant && !_current.identity.category.empty())
+	if(!_servant && !_current.id.category.empty())
 	{
-	    _locator = _adapter->findServantLocator(_current.identity.category);
+	    _locator = _adapter->findServantLocator(_current.id.category);
 	    if(_locator)
 	    {
 		_servant = _locator->locate(_adapter, _current, _cookie);
@@ -68,7 +68,7 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& curr
     if(!_servant)
     {
 	ObjectNotExistException ex(__FILE__, __LINE__);
-	ex.identity = _current.identity;
+	ex.id = _current.id;
 	throw ex;
     }
 }
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 817c1764ce4..daa6ee8b3fe 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -106,7 +106,7 @@ void
 Ice::ObjectNotExistException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nobject `" << identityToString(identity) << "' does not exist";
+    out << ":\nobject `" << identityToString(id) << "' does not exist";
 }
 
 void
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 59864d56feb..f8a2624b4dd 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -29,7 +29,7 @@ void
 IceInternal::Incoming::invoke(bool response)
 {
     Current current;
-    current.identity.__read(&_is);
+    current.id.__read(&_is);
     _is.read(current.facet);
     _is.read(current.operation);
     _is.read(current.nonmutating);
@@ -37,10 +37,10 @@ IceInternal::Incoming::invoke(bool response)
     _is.readSize(sz);
     while(sz--)
     {
-	pair<string, string> pair;
-	_is.read(pair.first);
-	_is.read(pair.second);
-	current.context.insert(current.context.end(), pair);
+	pair<string, string> pr;
+	_is.read(pr.first);
+	_is.read(pr.second);
+	current.ctx.insert(current.ctx.end(), pr);
     }
 
     BasicStream::Container::size_type statusPos = 0; // Initialize, to keep the compiler happy.
@@ -69,11 +69,11 @@ IceInternal::Incoming::invoke(bool response)
     {
 	if(_adapter)
 	{
-	    servant = _adapter->identityToServant(current.identity);
+	    servant = _adapter->identityToServant(current.id);
 	    
-	    if(!servant && !current.identity.category.empty())
+	    if(!servant && !current.id.category.empty())
 	    {
-		locator = _adapter->findServantLocator(current.identity.category);
+		locator = _adapter->findServantLocator(current.id.category);
 		if(locator)
 		{
 		    servant = locator->locate(_adapter, current, cookie);
@@ -134,7 +134,7 @@ IceInternal::Incoming::invoke(bool response)
 
 		if(status == DispatchObjectNotExist)
 		{
-		    current.identity.__write(&_os);
+		    current.id.__write(&_os);
 		}
 		else if(status == DispatchFacetNotExist)
 		{
@@ -184,7 +184,7 @@ IceInternal::Incoming::invoke(bool response)
 	    _os.write(static_cast<Byte>(DispatchObjectNotExist));
             // Not current.identity.__write(_os), so that the identity
             // can be overwritten.
-	    ex.identity.__write(&_os);
+	    ex.id.__write(&_os);
 	}
 
 	// Rethrow, so that the caller can print a warning.
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 58902503b48..c51c921f3c6 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -254,7 +254,7 @@ IceInternal::Outgoing::finished(BasicStream& is)
 		Identity ident;
 		ident.__read(&_is);
 		ObjectNotExistException* ex = new ObjectNotExistException(__FILE__, __LINE__);
-		ex->identity = ident;
+		ex->id = ident;
 		_exception = auto_ptr<LocalException>(ex);
 		break;
 	    }
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index cac00118bf5..319c12aa623 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1155,11 +1155,11 @@ IceDelegateD::Ice::Object::__copyFrom(const ::IceInternal::Handle< ::IceDelegate
 void
 IceDelegateD::Ice::Object::__initCurrent(Current& current, const string& op, bool nonmutating, const Context& context)
 {
-    current.identity = __reference->identity;
+    current.id = __reference->identity;
     current.facet = __reference->facet;
     current.operation = op;
     current.nonmutating = nonmutating;
-    current.context = context;
+    current.ctx = context;
 }
 
 void
diff --git a/cpp/src/IcePack/Forward.cpp b/cpp/src/IcePack/Forward.cpp
index e55f4b64f45..5034884d1da 100644
--- a/cpp/src/IcePack/Forward.cpp
+++ b/cpp/src/IcePack/Forward.cpp
@@ -42,7 +42,7 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const Current& current
     //
     // Look up the server description
     //
-    ServerDescription desc = _admin->find(current.identity, current);
+    ServerDescription desc = _admin->find(current.id, current);
 
     //
     // If we didn't find a server description, we return null, meaning
diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp
index d8ad3fb02e2..9809758da3c 100644
--- a/cpp/src/IcePatch/FileLocator.cpp
+++ b/cpp/src/IcePatch/FileLocator.cpp
@@ -28,7 +28,7 @@ IcePatch::FileLocator::locate(const ObjectAdapterPtr& adapter, const Current& cu
     //
     // Check whether the path is valid.
     //
-    string path = identityToPath(current.identity);
+    string path = identityToPath(current.id);
 
     if(path.empty()) // Empty paths are not permissible.
     {
diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp
index 9dc64f5e8d6..a60480e652d 100644
--- a/cpp/src/IcePatch/IcePatchI.cpp
+++ b/cpp/src/IcePatch/IcePatchI.cpp
@@ -35,9 +35,9 @@ FileDescPtr
 IcePatch::DirectoryI::describe(const Ice::Current& current)
 {
     // No lock necessary.
-    string path = identityToPath(current.identity);
+    string path = identityToPath(current.id);
     DirectoryDescPtr desc = new DirectoryDesc;
-    desc->directory = DirectoryPrx::uncheckedCast(_adapter->createProxy(current.identity));
+    desc->directory = DirectoryPrx::uncheckedCast(_adapter->createProxy(current.id));
     return desc;
 }
 
@@ -50,7 +50,7 @@ IcePatch::DirectoryI::getContents(const Ice::Current& current)
     {
 	IceUtil::RWRecMutex::TryRLock sync(_globalMutex, _busyTimeout);
 	bool syncUpgraded = false;
-	string path = identityToPath(current.identity);
+	string path = identityToPath(current.id);
 	StringSeq paths = readDirectory(path);
 	filteredPaths.reserve(paths.size() / 3);
 	for(StringSeq::const_iterator p = paths.begin(); p != paths.end(); ++p)
@@ -127,7 +127,7 @@ IcePatch::RegularI::describe(const Ice::Current& current)
     try
     {
 	IceUtil::RWRecMutex::TryRLock sync(_globalMutex, _busyTimeout);
-	string path = identityToPath(current.identity);
+	string path = identityToPath(current.id);
 	
 	FileInfo info = getFileInfo(path, true);
 	FileInfo infoMD5 = getFileInfo(path + ".md5", false);
@@ -148,7 +148,7 @@ IcePatch::RegularI::describe(const Ice::Current& current)
 	}
 	
 	RegularDescPtr desc = new RegularDesc;
-	desc->regular = RegularPrx::uncheckedCast(_adapter->createProxy(current.identity));
+	desc->regular = RegularPrx::uncheckedCast(_adapter->createProxy(current.id));
 	desc->md5 = getMD5(path);
 	return desc;
     }
@@ -164,7 +164,7 @@ IcePatch::RegularI::getBZ2Size(const Ice::Current& current)
     try
     {
 	IceUtil::RWRecMutex::TryRLock sync(_globalMutex, _busyTimeout);
-	string path = identityToPath(current.identity);
+	string path = identityToPath(current.id);
 	
 	FileInfo info = getFileInfo(path, true);
 	FileInfo infoBZ2 = getFileInfo(path + ".bz2", false);
@@ -203,7 +203,7 @@ IcePatch::RegularI::getBZ2(Ice::Int pos, Ice::Int num, const Ice::Current& curre
     try
     {
 	IceUtil::RWRecMutex::TryRLock sync(_globalMutex, _busyTimeout);
-	string path = identityToPath(current.identity);
+	string path = identityToPath(current.id);
 	
 	FileInfo info = getFileInfo(path, true);
 	FileInfo infoBZ2 = getFileInfo(path + ".bz2", false);
@@ -237,7 +237,7 @@ IcePatch::RegularI::getBZ2MD5(Ice::Int size, const Ice::Current& current)
     try
     {
 	IceUtil::RWRecMutex::TryRLock sync(_globalMutex, _busyTimeout);
-	string path = identityToPath(current.identity);
+	string path = identityToPath(current.id);
 	
 	FileInfo info = getFileInfo(path, true);
 	FileInfo infoBZ2 = getFileInfo(path + ".bz2", false);
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index e45e45199f3..06e20aec5a2 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -280,7 +280,7 @@ bool
 PublisherProxyI::ice_invoke(const vector< Ice::Byte>& inParams, vector< Ice::Byte>& outParam,
                             const Ice::Current& current)
 {
-    const Ice::Context& context = current.context;
+    const Ice::Context& context = current.ctx;
 
     Event event;
     event.forwarded = false;