Major Freeze update

1 files changed, 15 insertions, 21 deletions

diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 6e0a26a1dfd..2fc4da0e356 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -12,7 +12,7 @@
 //
 // **********************************************************************
 
-#include <Freeze/Application.h>
+#include <Ice/Application.h>
 #include <ContactFactory.h>
 #include <Parser.h>
 
@@ -20,16 +20,19 @@ using namespace std;
 using namespace Ice;
 using namespace Freeze;
 
-class PhoneBookCollocated : public Freeze::Application
+class PhoneBookCollocated : public Ice::Application
 {
 public:
     
-    PhoneBookCollocated(const string& dbEnvName) :
-	Freeze::Application(dbEnvName)
+    PhoneBookCollocated(const string& envName) :
+	_envName(envName)
     {
     }
 
-    virtual int runFreeze(int argc, char* argv[], const DBEnvironmentPtr&);
+    virtual int run(int argc, char* argv[]);
+
+private:
+    const string _envName;
 };
 
 int
@@ -40,27 +43,16 @@ main(int argc, char* argv[])
 }
 
 int
-PhoneBookCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv)
+PhoneBookCollocated::run(int argc, char* argv[])
 {
     PropertiesPtr properties = communicator()->getProperties();
     string value;
-    
-    DBPtr dbPhoneBook = dbEnv->openDB("phonebook", true);
-    DBPtr dbContacts = dbEnv->openDB("contacts", true);
-    
+        
     //
     // Create an Evictor for contacts.
     //
-    PersistenceStrategyPtr strategy;
-    if(properties->getPropertyAsInt("PhoneBook.IdleStrategy") > 0)
-    {
-        strategy = dbContacts->createIdleStrategy();
-    }
-    else
-    {
-        strategy = dbContacts->createEvictionStrategy();
-    }
-    Freeze::EvictorPtr evictor = dbContacts->createEvictor(strategy);
+    Freeze::EvictorPtr evictor = Freeze::createEvictor(communicator(), _envName, "contacts");
+
     Int evictorSize = properties->getPropertyAsInt("PhoneBook.EvictorSize");
     if(evictorSize > 0)
     {
@@ -76,7 +68,9 @@ PhoneBookCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& d
     //
     // Create the phonebook, and add it to the Object Adapter.
     //
-    PhoneBookIPtr phoneBook = new PhoneBookI(dbPhoneBook, evictor);
+    PhoneBookIPtr phoneBook = new PhoneBookI(communicator(), 
+					     _envName, "phonebook",
+					     evictor);
     adapter->add(phoneBook, stringToIdentity("phonebook"));
     
     //