ICE-6908 - Add ValueFactory

ValueFactory is a replacement for ObjectFactory (which is still
available if needed). It is an interface with only one operation
and can has the "delegate" metadata.

1 files changed, 5 insertions, 9 deletions

diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp
index 92c95a803b1..2c810287d3f 100644
--- a/cpp/src/IceGrid/IceGridDB.cpp
+++ b/cpp/src/IceGrid/IceGridDB.cpp
@@ -66,11 +66,11 @@ private:
     string _serverVersion;
 };
 
-class ObjectFactoryI : public Ice::ObjectFactory
+class ValueFactoryI : public Ice::ValueFactory
 {
 public:
 
-    ObjectFactoryI(const string& serverVersion) :
+    ValueFactoryI(const string& serverVersion) :
         _serverVersion(serverVersion)
     {
     }
@@ -88,10 +88,6 @@ public:
         return 0;
     }
 
-    virtual void destroy()
-    {
-    }
-
 private:
 
     string _serverVersion;
@@ -282,9 +278,9 @@ Client::run(int argc, char* argv[])
 
             if(!serverVersion.empty())
             {
-                ObjectFactoryPtr factory = new ObjectFactoryI(serverVersion);
-                communicator()->addObjectFactory(factory, "::IceGrid::ServerDescriptor");
-                communicator()->addObjectFactory(factory, "::IceGrid::IceBoxDescriptor");
+                ValueFactoryPtr factory = new ValueFactoryI(serverVersion);
+                communicator()->addValueFactory(factory, "::IceGrid::ServerDescriptor");
+                communicator()->addValueFactory(factory, "::IceGrid::IceBoxDescriptor");
             }
 
             Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, dbContext.encoding);