1 files changed, 15 insertions, 16 deletions
diff --git a/cpp/src/IcePack/ObjectRegistryI.cpp b/cpp/src/IcePack/ObjectRegistryI.cpp
index c43cc0c1931..caaba45b346 100644
--- a/cpp/src/IcePack/ObjectRegistryI.cpp
+++ b/cpp/src/IcePack/ObjectRegistryI.cpp
@@ -14,24 +14,23 @@
 using namespace std;
 using namespace IcePack;
 
-IcePack::ObjectRegistryI::ObjectRegistryI(const Ice::CommunicatorPtr& communicator,
-					  const string& envName,
-					  const string& objectsDbName,
-					  const string& typesDbName,
-					  const TraceLevelsPtr& traceLevels) :
+const string ObjectRegistryI::_objectsDbName = "objectregistry";
+const string ObjectRegistryI::_typesDbName = "objectregistry-types";
+
+ObjectRegistryI::ObjectRegistryI(const Ice::CommunicatorPtr& communicator,
+				 const string& envName, 
+				 const TraceLevelsPtr& traceLevels) :
     _connectionCache(Freeze::createConnection(communicator, envName)),
-    _objectsCache(_connectionCache, objectsDbName, true),
-    _typesCache(_connectionCache, typesDbName, true),
+    _objectsCache(_connectionCache, _objectsDbName, true),
+    _typesCache(_connectionCache, _typesDbName, true),
     _traceLevels(traceLevels),
     _envName(envName),
-    _communicator(communicator),
-    _objectsDbName(objectsDbName),
-    _typesDbName(typesDbName)
+    _communicator(communicator)
 {
 }
 
 void
-IcePack::ObjectRegistryI::add(const ObjectDescriptor& obj, const Ice::Current&)
+ObjectRegistryI::add(const ObjectDescriptor& obj, const Ice::Current&)
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -85,7 +84,7 @@ IcePack::ObjectRegistryI::add(const ObjectDescriptor& obj, const Ice::Current&)
 }
 
 void
-IcePack::ObjectRegistryI::remove(const Ice::ObjectPrx& object, const Ice::Current&)
+ObjectRegistryI::remove(const Ice::ObjectPrx& object, const Ice::Current&)
 {
     IceUtil::Mutex::Lock sync(*this);
     
@@ -148,7 +147,7 @@ IcePack::ObjectRegistryI::remove(const Ice::ObjectPrx& object, const Ice::Curren
 }
 
 ObjectDescriptor
-IcePack::ObjectRegistryI::getObjectDescriptor(const Ice::Identity& id, const Ice::Current&) const
+ObjectRegistryI::getObjectDescriptor(const Ice::Identity& id, const Ice::Current&) const
 {
     Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
     IdentityObjectDescDict objects(connection, _objectsDbName);
@@ -163,7 +162,7 @@ IcePack::ObjectRegistryI::getObjectDescriptor(const Ice::Identity& id, const Ice
 }
 
 Ice::ObjectPrx
-IcePack::ObjectRegistryI::findById(const Ice::Identity& id, const Ice::Current&) const
+ObjectRegistryI::findById(const Ice::Identity& id, const Ice::Current&) const
 {
     Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
     IdentityObjectDescDict objects(connection, _objectsDbName);
@@ -178,7 +177,7 @@ IcePack::ObjectRegistryI::findById(const Ice::Identity& id, const Ice::Current&)
 }
 
 Ice::ObjectPrx
-IcePack::ObjectRegistryI::findByType(const string& type, const Ice::Current&) const
+ObjectRegistryI::findByType(const string& type, const Ice::Current&) const
 {
     Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
     StringObjectProxySeqDict types(connection, _typesDbName);
@@ -194,7 +193,7 @@ IcePack::ObjectRegistryI::findByType(const string& type, const Ice::Current&) co
 }
 
 Ice::ObjectProxySeq
-IcePack::ObjectRegistryI::findAllWithType(const string& type, const Ice::Current&) const
+ObjectRegistryI::findAllWithType(const string& type, const Ice::Current&) const
 {
     Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
     StringObjectProxySeqDict types(connection, _typesDbName);