Freeze Evictor facet changes

12 files changed, 1313 insertions, 528 deletions

diff --git a/cpp/src/Freeze/.depend b/cpp/src/Freeze/.depend
index 8812769e424..455887d9a83 100644
--- a/cpp/src/Freeze/.depend
+++ b/cpp/src/Freeze/.depend
@@ -1,13 +1,12 @@
 DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h
-Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h
+Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Freeze/DBException.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h
 EvictorF.o: EvictorF.cpp ../../include/Freeze/EvictorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h
-ObjectRecord.o: ObjectRecord.cpp ../../include/Freeze/ObjectRecord.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h
+EvictorStorage.o: EvictorStorage.cpp ../../include/Freeze/EvictorStorage.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h
 MapI.o: MapI.cpp ../Freeze/MapI.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../Freeze/SharedDbEnv.h
-EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/AbstractMutex.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../Freeze/SharedDbEnv.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h
+EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/AbstractMutex.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../Freeze/SharedDbEnv.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h
 SharedDbEnv.o: SharedDbEnv.cpp ../Freeze/SharedDbEnv.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Thread.h ../../include/Freeze/DBException.h
-IdentityObjectRecordDict.o: IdentityObjectRecordDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h
 DB.cpp: ../../slice/Freeze/DB.ice
 DBException.cpp: ../../slice/Freeze/DBException.ice
-Evictor.cpp: ../../slice/Freeze/Evictor.ice ../../slice/Ice/ObjectAdapterF.ice ../../slice/Ice/ServantLocator.ice ../../slice/Ice/Current.ice ../../slice/Ice/Identity.ice ../../slice/Ice/Facet.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/ObjectRecord.ice
+Evictor.cpp: ../../slice/Freeze/Evictor.ice ../../slice/Ice/ObjectAdapterF.ice ../../slice/Ice/ServantLocator.ice ../../slice/Ice/Current.ice ../../slice/Ice/Identity.ice ../../slice/Ice/Facet.ice ../../slice/Freeze/DBException.ice
 EvictorF.cpp: ../../slice/Freeze/EvictorF.ice
-ObjectRecord.cpp: ../../slice/Freeze/ObjectRecord.ice
+EvictorStorage.cpp: ../../slice/Freeze/EvictorStorage.ice ../../slice/Ice/Identity.ice ../../slice/Ice/Facet.ice
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index 15be3ac13a4..50e019ea5c1 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -14,10 +14,10 @@
 
 #include <Ice/Object.h> // Not included in Ice/Ice.h
 #include <Freeze/EvictorI.h>
-#include <Freeze/IdentityObjectRecordDict.h>
 #include <Freeze/Initialize.h>
 #include <sys/stat.h>
 #include <IceUtil/AbstractMutex.h>
+#include <IceXML/StreamI.h>
 #include <typeinfo>
 
 using namespace std;
@@ -48,7 +48,7 @@ public:
 private:
 
     Dbc* _dbc;
-    Ice::Identity _current;
+    Freeze::EvictorStorageKey _current;
     bool _currentSet;
     CommunicatorPtr _communicator;
     Key _key;
@@ -81,6 +81,89 @@ initializeDbt(vector<Ice::Byte>& v, Dbt& dbt)
     dbt.set_flags(DB_DBT_USERMEM);
 }
 
+inline bool startWith(Key key, Key root)
+{
+    if(root.size() > key.size())
+    {
+	return false;
+    }
+    return memcmp(&root[0], &key[0], root.size()) == 0;
+}
+
+
+//
+// Marshaling/unmarshaling persistent (key, data) pairs
+//
+// TODO: use template functions
+//
+
+void marshalRoot(const EvictorStorageKey& v, Key& bytes, const CommunicatorPtr& communicator)
+{
+    ostringstream ostr;
+    StreamPtr stream = new IceXML::StreamI(communicator, ostr);
+    v.ice_marshal("Key", stream);
+    const string& str = ostr.str();
+
+    //
+    // TODO: fix this!
+    //
+    int index = str.find("</identity>");
+    string root = str.substr(0, index + strlen("</identity>"));
+    
+    bytes.resize(root.size());
+    std::copy(root.begin(), root.end(), bytes.begin());
+}
+
+void marshal(const EvictorStorageKey& v, Key& bytes, const CommunicatorPtr& communicator)
+{
+    ostringstream ostr;
+    StreamPtr stream = new IceXML::StreamI(communicator, ostr);
+    v.ice_marshal("Key", stream);
+    const string& str = ostr.str();
+    // cerr << "Marshalled key == " << str << endl;
+    bytes.resize(str.size());
+    std::copy(str.begin(), str.end(), bytes.begin());
+}
+
+void unmarshal(EvictorStorageKey& v, const Key& bytes, const CommunicatorPtr& communicator)
+{
+    string str;
+    str.append("<data>");
+    str.append(reinterpret_cast<const char*>(&bytes[0]), bytes.size());
+    str.append("</data>");
+    // cerr << "esk to unmarshal == " << str << endl;
+    istringstream istr(str);
+    StreamPtr stream = new IceXML::StreamI(communicator, istr, false);
+    v.ice_unmarshal("Key", stream);
+}
+
+void marshal(const ObjectRecord& v, Value& bytes, const CommunicatorPtr& communicator)
+{
+    std::ostringstream ostr;
+    StreamPtr stream = new IceXML::StreamI(communicator, ostr);
+    stream->marshalFacets(false);
+    v.ice_marshal("Value", stream);
+    const string& str = ostr.str();
+
+    // cerr << "Marshalled object record == " << str << endl;
+
+    bytes.resize(str.size());
+    std::copy(str.begin(), str.end(), bytes.begin());
+}
+
+void unmarshal(ObjectRecord& v, const Value& bytes, const CommunicatorPtr& communicator)
+{
+    string str;
+    str.append("<data>");
+    str.append(reinterpret_cast<const char*>(&bytes[0]), bytes.size());
+    str.append("</data>");
+    // cerr << "object record to unmarshal == " << str << endl;
+    std::istringstream istr(str);
+   
+    StreamPtr stream = new IceXML::StreamI(communicator, istr, false);
+    v.ice_unmarshal("Value", stream);
+}
+
 }
 
 Freeze::EvictorPtr
@@ -113,7 +196,8 @@ Freeze::EvictorI::EvictorI(const Ice::CommunicatorPtr communicator,
     _dbEnv(0),
     _dbEnvHolder(SharedDbEnv::get(communicator, envName)),
     _trace(0),
-    _noSyncAllowed(false)
+    _noSyncAllowed(false),
+    _generation(0)
 {
     _dbEnv = _dbEnvHolder.get();
     init(envName, dbName, createDb);
@@ -128,7 +212,8 @@ Freeze::EvictorI::EvictorI(const Ice::CommunicatorPtr communicator,
     _communicator(communicator),
     _dbEnv(&dbEnv),
     _trace(0),
-    _noSyncAllowed(false)
+    _noSyncAllowed(false),
+    _generation(0)
 {
     init("Extern", dbName, createDb);
 }
@@ -251,203 +336,472 @@ Freeze::EvictorI::saveNow()
 void
 Freeze::EvictorI::createObject(const Identity& ident, const ObjectPtr& servant)
 {
-    Lock sync(*this);
-
-    if(_deactivated)
-    {
-	throw EvictorDeactivatedException(__FILE__, __LINE__);
-    }
-
-    EvictorMap::iterator p = _evictorMap.find(ident);
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
+    bool triedToLoadElement = false;
 
-    if(p != _evictorMap.end())
+    for(;;)
     {
-	EvictorElementPtr& element = p->second;
-
 	{
-	    IceUtil::Mutex::Lock lockRec(element->mutex);
+	    Lock sync(*this);
 	    
-	    switch(element->status)
+	    if(_deactivated)
 	    {
-		case clean:
+		throw EvictorDeactivatedException(__FILE__, __LINE__);
+	    }
+	    
+	    EvictorMap::iterator p = _evictorMap.find(ident);
+	   
+	    if(p == _evictorMap.end() && triedToLoadElement)
+	    {
+		if(loadedElementGeneration == _generation)
 		{
-		    element->status = modified;
-		    addToModifiedQueue(p, element);
-		    break;
+		    if(loadedElement != 0)
+		    {
+			p = insertElement(0, ident, loadedElement);
+		    }
 		}
-		case created:
-		case modified:
+		else
+		{
+		    loadedElement = 0;
+		    triedToLoadElement = false;
+		}
+	    }
+	    
+	    bool replacing = (p != _evictorMap.end());
+
+	    if(replacing || triedToLoadElement)
+	    {
+		if(replacing)
 		{
+		    EvictorElementPtr& element = p->second;
+		    
 		    //
-		    // Nothing to do.
-		    // No need to push it on the modified queue as a created resp
-		    // modified element is either already on the queue or about 
-		    // to be saved. When saved, it becomes clean.
+		    // Destroy all existing facets
 		    //
-		    break;
-		}  
-		case destroyed:
+		    for(FacetMap::iterator q = element->facets.begin(); q != element->facets.end(); q++)
+		    {
+			destroyFacetImpl(q, q->second);
+		    }
+		}
+		else
 		{
-		    element->status = modified;
 		    //
-		    // No need to push it on the modified queue, as a destroyed element
-		    // is either already on the queue or about to be saved. When saved,
-		    // it becomes dead.
+		    // Let's insert an empty EvitorElement
 		    //
-		    break;
+		    EvictorElementPtr element = new EvictorElement;
+		    
+		    pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element));
+		    assert(pair.second);
+		    
+		    p = pair.first;
+		    element->identity = &p->first;
+		    
+		    _evictorList.push_front(p);
+		    element->position = _evictorList.begin();
 		}
-		case dead:
+		
+		//
+		// Add all the new facets (recursively)
+		//
+		EvictorElementPtr& element = p->second;
+		
+		addFacetImpl(element, servant, FacetPath(), replacing);
+		
+		//
+		// Evict as many elements as necessary.
+		//
+		evict();
+		break; // for(;;)
+	    }
+	    else
+	    {
+		loadedElementGeneration = _generation;
+	    }
+	}
+
+	//
+	// Try to load element and try again
+	//
+	assert(loadedElement == 0);
+	assert(triedToLoadElement == false);
+	loadedElement = load(ident);
+	triedToLoadElement = true;
+    }
+   
+    if(_trace >= 1)
+    {
+	Trace out(_communicator->getLogger(), "Evictor");
+	out << "created \"" << ident << "\"";
+    }
+}
+
+void
+Freeze::EvictorI::addFacet(const Identity& ident, const FacetPath& facetPath, const ObjectPtr& servant)
+{
+    if(facetPath.size() == 0)
+    {
+	throw EmptyFacetPathException(__FILE__, __LINE__);
+    }
+
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
+
+    for(;;)
+    {
+	{
+	    Lock sync(*this);
+	
+	    if(_deactivated)
+	    {
+		throw EvictorDeactivatedException(__FILE__, __LINE__);
+	    }
+	    
+	    EvictorMap::iterator p = _evictorMap.find(ident);
+	    
+	    if(p == _evictorMap.end() && loadedElement != 0)
+	    {
+		//
+		// If generation matches, load element into map
+		//
+		if(loadedElementGeneration == _generation)
 		{
-		    element->status = created;
-		    addToModifiedQueue(p, element);
-		    break;
+		    p = insertElement(0, ident, loadedElement);
 		}
-		default:
+		else
 		{
-		    assert(0);
-		    break;
+		    //
+		    // Discard loaded element
+		    //
+		    loadedElement = 0;
 		}
 	    }
 
-	    element->rec.servant = servant;
+	    if(p != _evictorMap.end())
+	    {
+		EvictorElementPtr& element = p->second;
+		FacetPath parentPath(facetPath);
+		parentPath.pop_back();
+		FacetMap::iterator q = element->facets.find(parentPath);
+		if(q == element->facets.end())
+		{
+		    throw FacetNotExistException(__FILE__, __LINE__);
+		}
+		
+		{
+		    FacetPtr& facet = q->second;
+		    IceUtil::Mutex::Lock lockFacet(facet->mutex);
+		    
+		    if(facet->status == dead || facet->status == destroyed)
+		    {
+			throw FacetNotExistException(__FILE__, __LINE__);
+		    }
+
+		    //
+		    // Throws AlreadyRegisteredException if the facet is already registered
+		    //
+		    facet->rec.servant->ice_addFacet(servant, facetPath[facetPath.size() - 1]);
+		}
+		//
+		// We may need to replace (nested) dead or destroyed facets
+		//
+		addFacetImpl(element, servant, facetPath, true);
+
+		evict();
+
+		break; // for(;;)
+	    }
+	   
+	    loadedElementGeneration = _generation;
 	}
-	_evictorList.erase(element->position);
-	_evictorList.push_front(p);
-	element->position = _evictorList.begin();
-    }
-    else
-    {
-	//
-	// Create a new object
-	//
-	
-	ObjectRecord rec;
-	rec.servant = servant;
-	rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds();
-	rec.stats.lastSaveTime = 0;
-	rec.stats.avgSaveTime = 0;
-	
-	//
-	// Add an Ice object with its servant to the evictor queue.
-	//
-	
-	EvictorElementPtr element = new EvictorElement;
-	element->rec = rec;
-	element->usageCount = 0;
-	element->status = created;
-	
-	pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element));
-	assert(pair.second);
 
-	_evictorList.push_front(pair.first);
-	element->position = _evictorList.begin();
-	
-	addToModifiedQueue(pair.first, element);
+	assert(loadedElement == 0);
 
 	//
-	// Evict as many elements as necessary.
+	// Load object and loop
 	//
-	evict();
-    } 
+	loadedElement = load(ident);
+	if(loadedElement == 0)
+	{
+	    throw ObjectNotExistException(__FILE__, __LINE__);
+	}
+    }
 
-    sync.release();
-      
     if(_trace >= 1)
     {
 	Trace out(_communicator->getLogger(), "Evictor");
-	out << "created \"" << ident << "\"";
+	out << "added facet to \"" << ident << "\"";
     }
 }
 
 void
 Freeze::EvictorI::destroyObject(const Identity& ident)
 {
-    Lock sync(*this);
-    
-    if(_deactivated)
-    {
-	throw EvictorDeactivatedException(__FILE__, __LINE__);
-    }
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
+    bool triedToLoadElement = false;
 
-    EvictorMap::iterator p = _evictorMap.find(ident);
-    if(p != _evictorMap.end())
+    for(;;)
     {
-	EvictorElementPtr& element = p->second;
-
-	IceUtil::Mutex::Lock lockRec(element->mutex);
-	    
-	switch(element->status)
 	{
-	    case clean:
+	    Lock sync(*this);
+	    
+	    if(_deactivated)
 	    {
-		element->status = destroyed;
-		addToModifiedQueue(p, element);
-		break;
+		throw EvictorDeactivatedException(__FILE__, __LINE__);
 	    }
-	    case created:
+	    
+	    EvictorMap::iterator p = _evictorMap.find(ident);
+	   
+	    if(p == _evictorMap.end() && triedToLoadElement)
 	    {
-		element->status = dead;
-		break;
+		if(loadedElementGeneration == _generation)
+		{
+		    if(loadedElement != 0)
+		    {
+			p = insertElement(0, ident, loadedElement);
+		    }
+		}
+		else
+		{
+		    loadedElement = 0;
+		    triedToLoadElement = false;
+		}
 	    }
-	    case modified:
+	    
+	    bool destroying = (p != _evictorMap.end());
+
+	    if(destroying || triedToLoadElement)
 	    {
-		element->status = destroyed;
+		if(destroying)
+		{
+		    EvictorElementPtr& element = p->second;
+		    
+		    //
+		    // Destroy all existing facets
+		    //
+		    for(FacetMap::iterator q = element->facets.begin(); q != element->facets.end(); q++)
+		    {
+			destroyFacetImpl(q, q->second);
+		    }
+		}
+
 		//
-		// Not necessary to push it on the modified queue, as a modified
-		// element is either on the queue already or about to be saved
-		// (at which point it becomes clean)
+		// Evict as many elements as necessary.
 		//
-		break;
+		evict();
+		break; // for(;;)
+	    }
+	    else
+	    {
+		loadedElementGeneration = _generation;
+	    }
+	}
+
+	//
+	// Try to load element and try again
+	//
+	assert(loadedElement == 0);
+	assert(triedToLoadElement == false);
+	loadedElement = load(ident);
+	triedToLoadElement = true;
+    }
+
+    if(_trace >= 1)
+    {
+	Trace out(_communicator->getLogger(), "Evictor");
+	out << "destroyed \"" << ident << "\"";
+    }
+}
+
+void
+Freeze::EvictorI::removeFacet(const Identity& ident, const FacetPath& facetPath)
+{
+    if(facetPath.size() == 0)
+    {
+	throw EmptyFacetPathException(__FILE__, __LINE__);
+    }
+
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
+
+    for(;;)
+    {
+	{
+	    Lock sync(*this);
+	
+	    if(_deactivated)
+	    {
+		throw EvictorDeactivatedException(__FILE__, __LINE__);
 	    }
-	    case destroyed:
-	    case dead:
+	    
+	    EvictorMap::iterator p = _evictorMap.find(ident);
+	    
+	    if(p == _evictorMap.end() && loadedElement != 0)
 	    {
 		//
-		// Nothing to do!
+		// If generation matches, load element into map
 		//
-		break;
+		if(loadedElementGeneration == _generation)
+		{
+		    p = insertElement(0, ident, loadedElement);
+		}
+		else
+		{
+		    //
+		    // Discard loaded element
+		    //
+		    loadedElement = 0;
+		}
 	    }
-	    default:
+
+	    if(p != _evictorMap.end())
 	    {
-		assert(0);
-		break;
+		EvictorElementPtr& element = p->second;
+		FacetPath parentPath(facetPath);
+		parentPath.pop_back();
+		FacetMap::iterator q = element->facets.find(parentPath);
+		if(q == element->facets.end())
+		{
+		    throw FacetNotExistException(__FILE__, __LINE__);
+		}
+		
+		{
+		    FacetPtr& facet = q->second;
+		    IceUtil::Mutex::Lock lockFacet(facet->mutex);
+		    
+		    if(facet->status == dead || facet->status == destroyed)
+		    {
+			throw FacetNotExistException(__FILE__, __LINE__);
+		    }
+
+		    //
+		    // Throws NotRegisteredException if the facet is not registered
+		    //
+		    facet->rec.servant->ice_removeFacet(facetPath[facetPath.size() - 1]);
+		}
+		removeFacetImpl(element->facets, facetPath);
+
+		evict();
+
+		break; // for(;;)
 	    }
+	   
+	    loadedElementGeneration = _generation;
 	}
-    }
-    else
-    {
+
+	assert(loadedElement == 0);
+
 	//
-	// Set a real ObjectRecord in case this object gets recreated
+	// Load object and loop
 	//
-	ObjectRecord rec;
-	rec.servant = 0;
-	rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds();
-	rec.stats.lastSaveTime = 0;
-	rec.stats.avgSaveTime = 0;
+	loadedElement = load(ident);
+	if(loadedElement == 0)
+	{
+	    throw ObjectNotExistException(__FILE__, __LINE__);
+	}
+    }
 
-	EvictorElementPtr element = new EvictorElement;
-	element->rec = rec;
-	element->usageCount = 0;
-	element->status = destroyed;
+    if(_trace >= 1)
+    {
+	Trace out(_communicator->getLogger(), "Evictor");
+	out << "removed facet from \"" << ident << "\"";
+    }
+}
 
-	pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element));
-	assert(pair.second);
-	element->position = _evictorList.insert(_evictorList.end(), pair.first);
 
-	addToModifiedQueue(pair.first, element);
+void
+Freeze::EvictorI::removeAllFacets(const Identity& ident)
+{
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
 
-	evict();
+    for(;;)
+    {
+	{
+	    Lock sync(*this);
+	
+	    if(_deactivated)
+	    {
+		throw EvictorDeactivatedException(__FILE__, __LINE__);
+	    }
+	    
+	    EvictorMap::iterator p = _evictorMap.find(ident);
+	    
+	    if(p == _evictorMap.end() && loadedElement != 0)
+	    {
+		//
+		// If generation matches, load element into map
+		//
+		if(loadedElementGeneration == _generation)
+		{
+		    p = insertElement(0, ident, loadedElement);
+		}
+		else
+		{
+		    //
+		    // Discard loaded element
+		    //
+		    loadedElement = 0;
+		}
+	    }
+
+	    if(p != _evictorMap.end())
+	    {
+		EvictorElementPtr& element = p->second;
+		
+		{
+		    FacetPtr& facet = element->mainObject;
+		    IceUtil::Mutex::Lock lockFacet(facet->mutex);
+		    
+		    if(facet->status == dead || facet->status == destroyed)
+		    {
+			throw ObjectNotExistException(__FILE__, __LINE__);
+		    }
+		    facet->rec.servant->ice_removeAllFacets();
+		}
+		
+		{
+		    //
+		    // Destroy all facets except main object
+		    //
+		    for(FacetMap::iterator q = element->facets.begin(); q != element->facets.end(); q++)
+		    {
+			if(q->second != element->mainObject)
+			{
+			    destroyFacetImpl(q, q->second);
+			}
+		    }
+		}
+
+		evict();
+
+		break; // for(;;)
+	    }
+	   
+	    loadedElementGeneration = _generation;
+	}
+
+	assert(loadedElement == 0);
+
+	//
+	// Load object and loop
+	//
+	loadedElement = load(ident);
+	if(loadedElement == 0)
+	{
+	    throw ObjectNotExistException(__FILE__, __LINE__);
+	}
     }
-    
-    sync.release();
 
     if(_trace >= 1)
     {
 	Trace out(_communicator->getLogger(), "Evictor");
-	out << "destroyed \"" << ident << "\"";
+	out << "removed all facets from \"" << ident << "\"";
     }
 }
 
+
 void
 Freeze::EvictorI::installServantInitializer(const ServantInitializerPtr& initializer)
 {
@@ -491,8 +845,8 @@ Freeze::EvictorI::hasObject(const Ice::Identity& ident)
     if(p != _evictorMap.end())
     {
 	EvictorElementPtr& element = p->second;
-	IceUtil::Mutex::Lock lockRec(element->mutex);
-	return (element->status != destroyed && element->status != dead);
+	IceUtil::Mutex::Lock lockFacet(element->mainObject->mutex);
+	return (element->mainObject->status != destroyed && element->mainObject->status != dead);
     }
     else
     {
@@ -509,9 +863,10 @@ Freeze::EvictorI::hasObject(const Ice::Identity& ident)
 ObjectPtr
 Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 {
-    ObjectRecord rec;
-    bool objectLoaded = false;
-
+    EvictorElementPtr loadedElement = 0;
+    int loadedElementGeneration = 0;
+    cookie = 0;
+   
     for(;;)
     {
 	EvictorMap::iterator p;
@@ -527,8 +882,21 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 	    assert(!_deactivated);
 	    
 	    p = _evictorMap.find(current.id);
-	    objectFound = (p != _evictorMap.end());
+	   
+	    if(p == _evictorMap.end() && loadedElement != 0)
+	    {
+		if(loadedElementGeneration == _generation)
+		{
+		    p = insertElement(current.adapter, current.id, loadedElement);
+		}
+		else
+		{
+		    loadedElement = 0;
+		}
+	    }
 	    
+	    objectFound = (p != _evictorMap.end());
+
 	    if(objectFound)
 	    {
 		//
@@ -536,58 +904,31 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 		// the evictor list, so that it will be evicted last.
 		//
 		EvictorElementPtr& element = p->second;
-		_evictorList.erase(element->position);
-		_evictorList.push_front(p);
-		element->position = _evictorList.begin();
+		if(element->position != _evictorList.begin())
+		{
+		    _evictorList.erase(element->position);
+		    _evictorList.push_front(p);
+		    element->position = _evictorList.begin();
+		}
+       
 		element->usageCount++;
-		cookie = element;
 
+		FacetMap::iterator q = element->facets.find(current.facet);
+		if(q != element->facets.end())
+		{
+		    cookie = q->second;
+		}
+	
+		evict();
 		//
 		// Later (after releasing the mutex), check that this
 		// object is not dead or destroyed
 		//
 	    }
-	    else if(objectLoaded)
+	    else
 	    {
-		//
-		// Proceed with the object loaded in the previous loop
-		//
-		
-		//
-		// If an initializer is installed, call it now.
-		//
-		if(_initializer)
-		{
-		    _initializer->initialize(current.adapter, current.id, rec.servant);
-		}
-		    
-		//
-		// Add an Ice object with its servant to the evictor queue.
-		//
-		
-		EvictorElementPtr element = new EvictorElement;
-		element->rec = rec;
-		element->usageCount = 1;
-		element->status = clean;
-		
-		pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(
-		    EvictorMap::value_type(current.id, element));
-		assert(pair.second);
-		_evictorList.push_front(pair.first);
-		element->position = _evictorList.begin();
-		
-		cookie = element;
-		
-		//
-		// Evict as many elements as necessary.
-		//
-		evict();
-		
-		return rec.servant;
+		loadedElementGeneration = _generation;
 	    }
-	    //
-	    // Else fall to the after-sync processing
-	    //
 	}
 	
 	if(objectFound)
@@ -603,11 +944,31 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 	    //
 	    // Return servant if object not dead or destroyed
 	    //
+	    if(cookie == 0)
+	    {
+		ObjectPtr result = 0;
+		{
+		    IceUtil::Mutex::Lock lockFacet(element->mainObject->mutex);
+		    if(element->mainObject->status != destroyed && element->mainObject->status != dead)
+		    {
+			result = element->mainObject->rec.servant;
+		    }
+		}
+		if(_trace >= 2)
+		{
+		    Trace out(_communicator->getLogger(), "Evictor");
+		    out << "\"" << current.id << "\" does not have the desired facet";
+		}
+		Lock sync(*this);
+		element->usageCount--;
+		return result;
+	    }
+	    else
 	    {
-		IceUtil::Mutex::Lock lockRec(element->mutex);
-		if(element->status != destroyed && element->status != dead)
+		IceUtil::Mutex::Lock lockFacet(element->mainObject->mutex);
+		if(element->mainObject->status != destroyed && element->mainObject->status != dead)
 		{
-		    return element->rec.servant;
+		    return element->mainObject->rec.servant;
 		}
 	    }
 	
@@ -636,20 +997,9 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 		    << "loading \"" << current.id << "\" from the database";
 	    }
 	    
-	    if(getObject(current.id, rec))
-	    {
-		objectLoaded = true;
-		
-		//
-		// Loop
-		//
-	    }
-	    else
+	    loadedElement = load(current.id);
+	    if(loadedElement == 0)
 	    {
-		//
-		// The Ice object with the given identity does not exist,
-		// client will get an ObjectNotExistException.
-		//
 		return 0;
 	    }
 	}
@@ -661,48 +1011,51 @@ Freeze::EvictorI::finished(const Current& current, const ObjectPtr& servant, con
 {
     assert(servant);
 
-    EvictorElementPtr element = EvictorElementPtr::dynamicCast(cookie);
-    assert(element);
-
-    bool enqueue = false;
-
-    if(current.mode != Nonmutating)
+    if(cookie != 0)
     {
-	IceUtil::Mutex::Lock lockRec(element->mutex);
-
-	if(element->status == clean)
+	FacetPtr facet = FacetPtr::dynamicCast(cookie);
+	assert(facet);
+    
+	bool enqueue = false;
+	
+	if(current.mode != Nonmutating)
 	{
-	    //
-	    // Assume this operation updated the object
-	    // 
-	    element->status = modified;
-	    enqueue = true;
+	    IceUtil::Mutex::Lock lockRec(facet->mutex);
+	    
+	    if(facet->status == clean)
+	    {
+		//
+		// Assume this operation updated the object
+		// 
+		facet->status = modified;
+		enqueue = true;
+	    }
 	}
-    }
-    
-    Lock sync(*this);
-
-    assert(!_deactivated);
-
-    //
-    // Decrease the usage count of the evictor queue element.
-    //
-    assert(element->usageCount >= 1);
-    --element->usageCount;
-
-    if(enqueue)
-    {
-	EvictorMap::iterator p = _evictorMap.find(current.id);
-	assert(p != _evictorMap.end());
 	
-	addToModifiedQueue(p, element);
-    }
-    else
-    {
+	Lock sync(*this);
+	
+	assert(!_deactivated);
+	
 	//
-	// Evict as many elements as necessary.
+	// Decrease the usage count of the evictor queue element.
 	//
-	evict();
+	assert(facet->element->usageCount >= 1);
+	--facet->element->usageCount;
+	
+	if(enqueue)
+	{
+	    FacetMap::iterator q = facet->element->facets.find(current.facet);
+	    assert(q != facet->element->facets.end());
+	    
+	    addToModifiedQueue(q, facet);
+	}
+	else
+	{
+	    //
+	    // Evict as many elements as necessary.
+	    //
+	    evict();
+	}
     }
 }
 
@@ -746,6 +1099,7 @@ Freeze::EvictorI::deactivate(const string&)
 	_db.reset();
 	_dbEnv = 0;
 	_dbEnvHolder = 0;
+	_initializer = 0;
     }
 }
 
@@ -754,7 +1108,7 @@ Freeze::EvictorI::run()
 {
     for(;;)
     {
-    	deque<EvictorMap::iterator> allObjects;
+    	deque<FacetMap::iterator> allObjects;
 	size_t saveNowThreadsSize = 0;
 
 	{
@@ -807,12 +1161,6 @@ Freeze::EvictorI::run()
     
 	const size_t size = allObjects.size();
     
-	//
-	// Usage count release
-	//
-	deque<EvictorElementPtr> releaseAfterStreaming;
-	deque<EvictorElementPtr> releaseAfterCommit;
-	
 	deque<StreamedObject> streamedObjectQueue;
 	
 	Long saveStart = IceUtil::Time::now().toMilliSeconds();
@@ -822,31 +1170,24 @@ Freeze::EvictorI::run()
 	//
 	for(size_t i = 0; i < size; i++)
 	{
-	    EvictorElementPtr& element = allObjects[i]->second;
+	    FacetPtr& facet = allObjects[i]->second;
 	    
-	    IceUtil::Mutex::Lock lockRec(element->mutex);
-	    ObjectRecord& rec = element->rec;
+	    IceUtil::Mutex::Lock lockFacet(facet->mutex);
+	    ObjectRecord& rec = facet->rec;
 	    
 	    bool streamIt = true;
-	    Ice::Byte status = element->status;
+	    Ice::Byte status = facet->status;
 	    switch(status)
 	    {
 		case created:
-		{
-		    element->status = clean;
-		    releaseAfterCommit.push_back(element);
-		    break;
-		}   
 		case modified:
 		{
-		    element->status = clean;
-		    releaseAfterStreaming.push_back(element);
+		    facet->status = clean;
 		    break;
-		}
+		}   
 		case destroyed:
 		{
-		    element->status = dead;
-		    releaseAfterCommit.push_back(element);
+		    facet->status = dead;
 		    break;
 		}   
 		default:
@@ -855,7 +1196,6 @@ Freeze::EvictorI::run()
 		    // Nothing to do (could be a duplicate)
 		    //
 		    streamIt = false;
-		    releaseAfterStreaming.push_back(element);
 		    break;
 		}
 	    }
@@ -865,7 +1205,11 @@ Freeze::EvictorI::run()
 		size_t index = streamedObjectQueue.size();
 		streamedObjectQueue.resize(index + 1);
 		StreamedObject& obj = streamedObjectQueue[index];
-		IdentityObjectRecordDictKeyCodec::write(allObjects[i]->first, obj.key, _communicator);
+		EvictorStorageKey esk;
+		esk.identity.name = facet->element->identity->name;
+		esk.identity.category = facet->element->identity->category;
+		esk.facet = allObjects[i]->first;
+		marshal(esk, obj.key, _communicator);
 		obj.status = status;
 		if(status != destroyed)
 		{
@@ -893,19 +1237,6 @@ Freeze::EvictorI::run()
 	    }    
 	}
 	
-	allObjects.clear();
-	
-	if(releaseAfterStreaming.size() > 0)
-	{
-	    Lock sync(*this);
-	    for(deque<EvictorElementPtr>::iterator q = releaseAfterStreaming.begin();
-		q != releaseAfterStreaming.end(); q++)
-	    {    
-		(*q)->usageCount--;
-	    }
-	    releaseAfterStreaming.clear();
-	}	    
-	
 	//
 	// Now let's save all these streamed objects to disk using a transaction
 	//
@@ -937,42 +1268,38 @@ Freeze::EvictorI::run()
 			for(size_t i = 0; i < txSize; i++)
 			{
 			    StreamedObject& obj = streamedObjectQueue[i];
-			    if(obj.status == destroyed)
+
+			    switch(obj.status)
 			    {
-				//
-				// May not exist in the database
-				//
-				
-				Dbt dbKey;
-				initializeDbt(obj.key, dbKey);
-				int err = _db->del(tx, &dbKey, 0);
-				if(err != 0 && err != DB_NOTFOUND)
+				case created:
+				case modified:
 				{
-				    //
-				    // Bug in Freeze
-				    //
-				    throw DBException(__FILE__, __LINE__);
+				    Dbt dbKey;
+				    Dbt dbValue;
+				    initializeDbt(obj.key, dbKey);
+				    initializeDbt(obj.value, dbValue);
+				    u_int32_t flags = (obj.status == created) ? DB_NOOVERWRITE : 0;
+				    int err = _db->put(tx, &dbKey, &dbValue, flags);
+				    if(err != 0)
+				    {
+					throw DBException(__FILE__, __LINE__);
+				    }
+				    break;
 				}
-				
-			    }
-			    else
-			    {
-				//
-				// We can't use NOOVERWRITE as some 'created' objects may
-				// actually be already in the database
-				//
-				
-				Dbt dbKey;
-				Dbt dbValue;
-				initializeDbt(obj.key, dbKey);
-				initializeDbt(obj.value, dbValue);
-				int err = _db->put(tx, &dbKey, &dbValue, 0);
-				if(err != 0)
+				case destroyed:
+				{
+				    Dbt dbKey;
+				    initializeDbt(obj.key, dbKey);
+				    int err = _db->del(tx, &dbKey, 0);
+				    if(err != 0)
+				    {
+					throw DBException(__FILE__, __LINE__);
+				    }
+				    break;
+				}   
+				default:
 				{
-				    //
-				    // Bug in Freeze
-				    //
-				    throw DBException(__FILE__, __LINE__);
+				    assert(0);
 				}
 			    }
 			}
@@ -1012,12 +1339,15 @@ Freeze::EvictorI::run()
 	{
 	    Lock sync(*this);
 	    
-	    for(deque<EvictorElementPtr>::iterator q = releaseAfterCommit.begin();
-		q != releaseAfterCommit.end(); q++)
+	    _generation++;
+
+	    for(deque<FacetMap::iterator>::iterator q = allObjects.begin();
+		q != allObjects.end(); q++)
 	    {
-		(*q)->usageCount--;
+		(*q)->second->element->usageCount--;
 	    }
-	    releaseAfterCommit.clear();
+	    allObjects.clear();
+	    evict();
 	    
 	    if(saveNowThreadsSize > 0)
 	    {
@@ -1082,8 +1412,11 @@ Freeze::EvictorI::evict()
 bool
 Freeze::EvictorI::dbHasObject(const Ice::Identity& ident)
 {
-    Key key;
-    IdentityObjectRecordDictKeyCodec::write(ident, key, _communicator);
+    EvictorStorageKey esk;
+    esk.identity = ident;
+    
+    Key key;    
+    marshal(esk, key, _communicator);
     Dbt dbKey;
     initializeDbt(key, dbKey);
     
@@ -1128,124 +1461,545 @@ Freeze::EvictorI::dbHasObject(const Ice::Identity& ident)
     }
 }
 
-bool
-Freeze::EvictorI::getObject(const Ice::Identity& ident, ObjectRecord& rec)
+
+void
+Freeze::EvictorI::addToModifiedQueue(const Freeze::EvictorI::FacetMap::iterator& q,
+				     const Freeze::EvictorI::FacetPtr& facet)
 {
-    Key key;
-    IdentityObjectRecordDictKeyCodec::write(ident, key, _communicator);
-    Dbt dbKey;
-    initializeDbt(key, dbKey);
+    facet->element->usageCount++;
+    _modifiedQueue.push_back(q);
+    
+    if(_saveSizeTrigger >= 0 && static_cast<Int>(_modifiedQueue.size()) >= _saveSizeTrigger)
+    {
+	notifyAll();
+    }
+}
+
+void
+Freeze::EvictorI::saveNowNoSync()
+{
+    IceUtil::ThreadControl myself;
+
+    _saveNowThreads.push_back(myself);
+    notifyAll();
+    do
+    {
+	wait();
+    } while(find(_saveNowThreads.begin(), _saveNowThreads.end(), myself) != _saveNowThreads.end());
+}
+
+void
+Freeze::EvictorI::writeObjectRecordToValue(Long saveStart, ObjectRecord& rec, Value& value)
+{
+    //
+    // Update stats first
+    //
+    Statistics& stats = rec.stats;
+    Long diff = saveStart - (stats.creationTime + stats.lastSaveTime);
+    if(stats.lastSaveTime == 0)
+    {
+	stats.lastSaveTime = diff;
+	stats.avgSaveTime = diff;
+    }
+    else
+    {
+	stats.lastSaveTime = saveStart - stats.creationTime;
+	stats.avgSaveTime = static_cast<Long>(stats.avgSaveTime * 0.95 + diff * 0.05);
+    }
+    
+    marshal(rec, value, _communicator);
+}
+
+
+Freeze::EvictorI::EvictorElementPtr
+Freeze::EvictorI::load(const Identity& ident)
+{
+    Key root;
+    EvictorStorageKey esk;
+    esk.identity = ident;
+    marshalRoot(esk, root, _communicator);
+    
+    const size_t defaultKeySize = 1024;
+    Key key(root);
+    key.reserve(defaultKeySize);
 
     const size_t defaultValueSize = 1024;
     Value value(defaultValueSize);
 
-    Dbt dbValue;
-    initializeDbt(value, dbValue);
+    EvictorElementPtr result;
 
     for(;;)
     {
+	result = new EvictorElement;
+
+	Dbc* dbc = 0;
+	int rs = 0;
+
 	try
 	{
-	    int err = _db->get(0, &dbKey, &dbValue, 0);
+	    //
+	    // Open cursor
+	    //
+	    _db->cursor(0, &dbc, 0);
+
+	    key.resize(key.capacity());
+	    Dbt dbKey;
+	    initializeDbt(key, dbKey);
 	    
-	    if(err == 0)
-	    {
-		value.resize(dbValue.get_size());
-		IdentityObjectRecordDictValueCodec::read(rec, value, _communicator);
-		return true;
-	    }
-	    else if(err == DB_NOTFOUND)
-	    {
-		return false;
-	    }
-	    else
+	    value.resize(value.capacity());
+	    Dbt dbValue;
+	    initializeDbt(value, dbValue);
+
+	    //
+	    // Get first pair
+	    //
+	    for(;;)
 	    {
-		assert(0);
-		throw DBException(__FILE__, __LINE__);
+		try
+		{
+		    rs = dbc->get(&dbKey, &dbValue, DB_SET_RANGE);
+
+		    if(rs == 0)
+		    {
+			key.resize(dbKey.get_size());
+			value.resize(dbValue.get_size());
+		    }
+		    
+		    if(rs != 0 || !startWith(key, root))
+		    {
+			dbc->close();
+
+			if(_trace >= 2)
+			{
+			    Trace out(_communicator->getLogger(), "Evictor");
+			    out << "could not find \"" << ident << "\" in the database";
+			}
+			return 0;
+		    }
+		    
+		    break;
+		}
+		catch(const ::DbMemoryException dx)
+		{
+		    bool resized = false;
+		    if(dbKey.get_size() > dbKey.get_ulen())
+		    {
+			key.resize(dbKey.get_size());
+			initializeDbt(key, dbKey);
+			resized = true;
+		    }
+		   
+		    if(dbValue.get_size() > dbValue.get_ulen())
+		    {
+			value.resize(dbValue.get_size());
+			initializeDbt(value, dbValue);
+			resized = true;
+		    }
+
+		    if(!resized)
+		    {
+			//
+			// Real problem
+			//
+			DBException ex(__FILE__, __LINE__);
+			ex.message = dx.what();
+			throw ex;
+		    }
+		}
 	    }
-	}
-	catch(const ::DbMemoryException dx)
-	{
-	    if(dbValue.get_size() > dbValue.get_ulen())
+
+	    do
 	    {
 		//
-		// Let's resize value
+		// Unmarshal key and data and insert it into result's facet map
 		//
-		value.resize(dbValue.get_size());
+		EvictorStorageKey esk;
+		unmarshal(esk, key, _communicator);
+
+	
+		if(_trace >= 3)
+		{
+		    Trace out(_communicator->getLogger(), "Evictor");
+		    out << "reading facet identity = \"" << esk.identity << "\" ";
+		    if(esk.facet.size() == 0)
+		    {
+			out << "(main object)";
+		    }
+		    else
+		    {
+			out << "facet = \"";
+			for(size_t i = 0; i < esk.facet.size(); i++)
+			{
+			    out << esk.facet[i];
+			    if(i != esk.facet.size() - 1)
+			    {
+				out << ".";
+			    }
+			    else
+			    {
+				out << "\"";
+			    }
+			}
+		    }
+		}
+       
+		FacetPtr facet = new Facet(result.get());
+		facet->status = clean;
+		unmarshal(facet->rec, value, _communicator);
+	
+		pair<FacetMap::iterator, bool> pair = result->facets.insert(FacetMap::value_type(esk.facet, facet));
+		assert(pair.second);
+
+		if(esk.facet.size() == 0)
+		{
+		    result->mainObject = facet;
+		}
+		
+		key.resize(key.capacity());
+		Dbt dbKey;
+		initializeDbt(key, dbKey);
+		
+		value.resize(value.capacity());
+		Dbt dbValue;
 		initializeDbt(value, dbValue);
-	    }
-	    else
-	    {
-		//
-		// Real problem
+
 		//
-		DBException ex(__FILE__, __LINE__);
-		ex.message = dx.what();
-		throw ex;
-	    }
+		// Next facet
+		//					    
+		for(;;)
+		{
+		    try
+		    {
+			rs = dbc->get(&dbKey, &dbValue, DB_NEXT);
+			if(rs == 0)
+			{
+			    key.resize(dbKey.get_size());
+			    value.resize(dbValue.get_size());
+			}
+			break; // for(;;)
+		    }
+		    catch(const ::DbMemoryException dx)
+		    {
+			bool resized = false;
+			if(dbKey.get_size() > dbKey.get_ulen())
+			{
+			    key.resize(dbKey.get_size());
+			    initializeDbt(key, dbKey);
+			    resized = true;
+			}
+			
+			if(dbValue.get_size() > dbValue.get_ulen())
+			{
+			    value.resize(dbValue.get_size());
+			    initializeDbt(value, dbValue);
+			    resized = true;
+			}
+			
+			if(!resized)
+			{
+			    //
+			    // Real problem
+			    //
+			    DBException ex(__FILE__, __LINE__);
+			    ex.message = dx.what();
+			    throw ex;
+			}
+		    }
+		}
+	    } while(rs == 0 && startWith(key, root));
+
+	    dbc->close();
+	    break; // for (;;)
+	       
 	}
 	catch(const ::DbDeadlockException&)
 	{
+	    if(dbc != 0)
+	    {
+		try
+		{
+		    dbc->close();
+		}
+		catch(...)
+		{
+		}
+	    }
+	    
 	    //
-	    // Ignored, try again
+	    // Try again
 	    //
 	}
 	catch(const ::DbException& dx)
 	{
+	    if(dbc != 0)
+	    {
+		try
+		{
+		    dbc->close();
+		}
+		catch(...)
+		{
+		}
+	    }
 	    DBException ex(__FILE__, __LINE__);
 	    ex.message = dx.what();
 	    throw ex;
 	}
+	catch(...)
+	{
+	    try
+	    {
+		dbc->close();
+	    }
+	    catch(...)
+	    {
+	    }
+	    throw;
+	}
+    }
+
+    //
+    // Let's fix-up the facets tree in result
+    //
+    for(FacetMap::iterator q = result->facets.begin(); q != result->facets.end(); q++)
+    {
+	const FacetPath& facetPath = q->first;
+
+	if(facetPath.size() > 0)
+	{
+	    FacetPath parent(facetPath);
+	    parent.pop_back();
+	    FacetMap::iterator r = result->facets.find(parent);
+	    if(r == result->facets.end())
+	    {
+		// 
+		// TODO: log warning for this orphan facet
+		//
+		assert(0);
+	    }
+	    else
+	    {
+		r->second->rec.servant->ice_addFacet(q->second->rec.servant, facetPath[facetPath.size() - 1]); 
+	    }
+	}
     }
+    return result;
 }
 
-void
-Freeze::EvictorI::addToModifiedQueue(const Freeze::EvictorI::EvictorMap::iterator& p,
-				     const Freeze::EvictorI::EvictorElementPtr& element)
+
+
+Freeze::EvictorI::EvictorMap::iterator
+Freeze::EvictorI::insertElement(const ObjectAdapterPtr& adapter, const Identity& ident, const EvictorElementPtr& element)
 {
-    element->usageCount++;
-    _modifiedQueue.push_back(p);
-    
-    if(_saveSizeTrigger >= 0 && static_cast<Int>(_modifiedQueue.size()) >= _saveSizeTrigger)
+    if(_initializer)
     {
-	notifyAll();
+	_initializer->initialize(adapter, ident, element->mainObject->rec.servant);
     }
+
+    pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element));
+    assert(pair.second);
+    EvictorMap::iterator p = pair.first;
+    element->identity = &p->first;
+
+    _evictorList.push_front(p);
+    element->position = _evictorList.begin();
+
+    return p;
 }
 
+
 void
-Freeze::EvictorI::saveNowNoSync()
+Freeze::EvictorI::addFacetImpl(EvictorElementPtr& element, const ObjectPtr& servant, const FacetPath& facetPath, bool replacing)
 {
-    IceUtil::ThreadControl myself;
+    FacetMap& facets = element->facets;
 
-    _saveNowThreads.push_back(myself);
-    notifyAll();
-    do
+    bool insertIt = true;
+
+    if(replacing)
     {
-	wait();
-    } while(find(_saveNowThreads.begin(), _saveNowThreads.end(), myself) != _saveNowThreads.end());
+	FacetMap::iterator q = facets.find(facetPath);
+	
+	if(q != facets.end())
+	{
+	    FacetPtr& facet = q->second;
+
+	    {
+		IceUtil::Mutex::Lock lockFacet(facet->mutex);
+		
+		switch(facet->status)
+		{
+		    case clean:
+		    {
+			facet->status = modified;
+			addToModifiedQueue(q, facet);
+			break;
+		    }
+		    case created:
+		    case modified:
+		    {
+			//
+			// Nothing to do.
+			// No need to push it on the modified queue as a created resp
+			// modified facet is either already on the queue or about 
+			// to be saved. When saved, it becomes clean.
+			//
+			break;
+		    }  
+		    case destroyed:
+		    {
+			facet->status = modified;
+			//
+			// No need to push it on the modified queue, as a destroyed facet
+			// is either already on the queue or about to be saved. When saved,
+			// it becomes dead.
+			//
+			break;
+		    }
+		    case dead:
+		    {
+			facet->status = created;
+			addToModifiedQueue(q, facet);
+			break;
+		    }
+		    default:
+		    {
+			assert(0);
+			break;
+		    }
+		}
+		facet->rec.servant = servant;
+		insertIt = false;
+	    }
+	}
+    }
+
+    if(insertIt)
+    {
+	FacetPtr facet = new Facet(element.get());
+	facet->status = created;
+
+	ObjectRecord& rec = facet->rec;
+	rec.servant = servant;
+	rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds();
+	rec.stats.lastSaveTime = 0;
+	rec.stats.avgSaveTime = 0;
+
+	pair<FacetMap::iterator, bool> insertResult = facets.insert(FacetMap::value_type(facetPath, facet));
+	assert(insertResult.second);
+	if(facetPath.size() == 0)
+	{
+	    element->mainObject = facet;
+	}
+	addToModifiedQueue(insertResult.first, facet);
+    }
+
+    
+    if(servant != 0)
+    {
+	//
+	// Add servant's facets
+	//
+	vector<string> facetList = servant->ice_facets();
+	for(vector<string>::iterator r = facetList.begin(); r != facetList.end(); r++)
+	{
+	    FacetPath newFacetPath(facetPath);
+	    newFacetPath.push_back(*r);
+	    addFacetImpl(element, servant->ice_findFacet(*r), newFacetPath, replacing);  
+	}
+    }
 }
 
+
 void
-Freeze::EvictorI::writeObjectRecordToValue(Long saveStart, ObjectRecord& rec, Value& value)
+Freeze::EvictorI::removeFacetImpl(FacetMap& facets, const FacetPath& facetPath)
 {
+    FacetMap::iterator q = facets.find(facetPath);
+    Ice::ObjectPtr servant = 0; 
+
+    if(q != facets.end())
+    {
+	servant = destroyFacetImpl(q, q->second);
+    }
     //
-    // Update stats first
+    // else should we raise an exception?
     //
-    Statistics& stats = rec.stats;
-    Long diff = saveStart - (stats.creationTime + stats.lastSaveTime);
-    if(stats.lastSaveTime == 0)
+
+    if(servant != 0)
     {
-	stats.lastSaveTime = diff;
-	stats.avgSaveTime = diff;
+	//
+	// Remove servant's facets
+	//
+	vector<string> facetList = servant->ice_facets();
+	for(vector<string>::iterator r = facetList.begin(); r != facetList.end(); r++)
+	{
+	    FacetPath newFacetPath(facetPath);
+	    newFacetPath.push_back(*r);
+	    removeFacetImpl(facets, newFacetPath);  
+	}
     }
-    else
+}
+
+
+Ice::ObjectPtr
+Freeze::EvictorI::destroyFacetImpl(Freeze::EvictorI::FacetMap::iterator& q, const Freeze::EvictorI::FacetPtr& facet)
+{
+    IceUtil::Mutex::Lock lockFacet(facet->mutex);
+    switch(facet->status)
     {
-	stats.lastSaveTime = saveStart - stats.creationTime;
-	stats.avgSaveTime = static_cast<Long>(stats.avgSaveTime * 0.95 + diff * 0.05);
+	case clean:
+	{
+	    facet->status = destroyed;
+	    addToModifiedQueue(q, facet);
+	    break;
+	}
+	case created:
+	{
+	    facet->status = dead;
+	    break;
+	}
+	case modified:
+	{
+	    facet->status = destroyed;
+	    //
+	    // Not necessary to push it on the modified queue, as a modified
+	    // element is either on the queue already or about to be saved
+	    // (at which point it becomes clean)
+	    //
+	    break;
+	}
+	case destroyed:
+	case dead:
+	{
+	    //
+	    // Nothing to do!
+	    //
+	    break;
+	}
+	default:
+	{
+	    assert(0);
+	    break;
+	}
     }
-    IdentityObjectRecordDictValueCodec::write(rec, value, _communicator);
+    return facet->rec.servant;
 }
 
+Freeze::EvictorI::Facet::Facet(EvictorElement* elt) :
+    status(dead),
+    element(elt)
+{
+}
+
+Freeze::EvictorI::EvictorElement::EvictorElement() :
+    usageCount(0),
+    identity(0),
+    mainObject(0)
+{
+}
+
+Freeze::EvictorI::EvictorElement::~EvictorElement()
+{
+}
 
 Freeze::EvictorIteratorI::EvictorIteratorI(Db& db, const CommunicatorPtr& communicator) :
     _dbc(0),
@@ -1286,14 +2040,7 @@ Freeze::EvictorIteratorI::hasNext()
 	return true;
     }
     else
-    {
-	if(_key.size() < _key.capacity())
-	{
-	    _key.resize(_key.capacity());
-	}
-	Dbt dbKey;
-	initializeDbt(_key, dbKey);
-	
+    {	
 	//
 	// Keep 0 length since we're not interested in the data
 	//
@@ -1302,14 +2049,29 @@ Freeze::EvictorIteratorI::hasNext()
 	
 	for(;;)
 	{
+	    if(_key.size() < _key.capacity())
+	    {
+		_key.resize(_key.capacity());
+	    }
+
+	    Dbt dbKey;
+	    initializeDbt(_key, dbKey);
+
 	    try
 	    {
 		if(_dbc->get(&dbKey, &dbValue, DB_NEXT) == 0)
 		{
 		    _key.resize(dbKey.get_size());
-		    IdentityObjectRecordDictKeyCodec::read(_current, _key, _communicator);
-		    _currentSet = true;
-		    return true;
+		    unmarshal(_current, _key, _communicator);
+		    
+		    if(_current.facet.size() == 0)
+		    {
+			_currentSet = true;
+			return true;
+		    }
+		    //
+		    // Otherwise loop
+		    //
 		}
 		else
 		{
@@ -1358,7 +2120,7 @@ Freeze::EvictorIteratorI::next()
     if(hasNext())
     {
 	_currentSet = false;
-	return _current;
+	return _current.identity;
     }
     else
     {
@@ -1417,3 +2179,10 @@ Freeze::IteratorDestroyedException::ice_print(ostream& out) const
     Exception::ice_print(out);
     out << ":\niterator destroyed";
 }
+
+void
+Freeze::EmptyFacetPathException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nempty facet path";
+}
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 0f4a312edc8..39ee7ff1294 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -18,8 +18,9 @@
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <Freeze/Evictor.h>
-#include <Freeze/IdentityObjectRecordDict.h>
 #include <Freeze/SharedDbEnv.h>
+#include <Freeze/EvictorStorage.h>
+#include <Freeze/DB.h>
 #include <list>
 #include <vector>
 #include <deque>
@@ -43,7 +44,11 @@ public:
     virtual void saveNow();
     
     virtual void createObject(const Ice::Identity&, const Ice::ObjectPtr&);
+    virtual void addFacet(const Ice::Identity&, const Ice::FacetPath&, const Ice::ObjectPtr&);
+    
     virtual void destroyObject(const Ice::Identity&);
+    virtual void removeFacet(const Ice::Identity&, const Ice::FacetPath&);
+    virtual void removeAllFacets(const Ice::Identity&);
 
     virtual void installServantInitializer(const ServantInitializerPtr&);
     virtual EvictorIteratorPtr getIterator();
@@ -66,26 +71,30 @@ public:
     typedef IceUtil::Handle<EvictorElement> EvictorElementPtr;
     typedef std::map<Ice::Identity, EvictorElementPtr> EvictorMap;
 
-    struct EvictorElement : public Ice::LocalObject
+    struct Facet : public Ice::LocalObject
     {
-	//
-	// WARNING: status and rec are protected by mutex
-	// while position and usageCount are protected by the Evictor mutex.
-	// To avoid memory-tearing issues on platforms with aggressive 
-	// memory optimizations such as Alpha/Tru64, it is essential to put 
-	// them in different quadwords (64 bit).
-	//
+	Facet(EvictorElement*);
+
 	IceUtil::Mutex mutex;
 	Ice::Byte status;  
-	ObjectRecord rec;    // 64 bit alignment
+	ObjectRecord rec; // 64 bit alignment
+	EvictorElement* const element;
+    };
+    typedef IceUtil::Handle<Facet> FacetPtr;
+    typedef std::map<Ice::FacetPath, FacetPtr> FacetMap;
+    
+    struct EvictorElement : public IceUtil::Shared
+    {
+	EvictorElement();
+	~EvictorElement();
+	
 	std::list<EvictorMap::iterator>::iterator position;
 	int usageCount;
+	FacetMap facets;
+	const Ice::Identity* identity;
+	FacetPtr mainObject;
     };
 
-private:
-
-    void init(const std::string& envName, const std::string& dbName, bool createDb);
-
 #if defined(_MSC_VER) && (_MSC_VER <= 1200)
 
     enum 
@@ -127,11 +136,22 @@ private:
 
 #endif
 
+private:
+
+    void init(const std::string& envName, const std::string& dbName, bool createDb);
+
     void evict();
     bool dbHasObject(const Ice::Identity&);
     bool getObject(const Ice::Identity&, ObjectRecord&);
-    void addToModifiedQueue(const EvictorMap::iterator&, const EvictorElementPtr&);
+    void addToModifiedQueue(const FacetMap::iterator&, const FacetPtr&);
     void saveNowNoSync();
+
+    EvictorElementPtr load(const Ice::Identity&);
+    EvictorMap::iterator insertElement(const Ice::ObjectAdapterPtr&, const Ice::Identity&, const EvictorElementPtr&);
+
+    void addFacetImpl(EvictorElementPtr&, const Ice::ObjectPtr&, const Ice::FacetPath&, bool);
+    void removeFacetImpl(FacetMap&,  const Ice::FacetPath&);
+    Ice::ObjectPtr destroyFacetImpl(FacetMap::iterator&, const FacetPtr& facet);
     
     inline void writeObjectRecordToValue(Ice::Long, ObjectRecord&, Value&);
 
@@ -149,11 +169,12 @@ private:
     //
     // The _modifiedQueue contains a queue of all modified objects
     // Each element in the queue "owns" a usage count, to ensure the
-    // pointed element remains in the map.
+    // element containing the pointed element remains in the evictor
+    // map.
     //
     // Note: relies on the stability of iterators in a std::map
     //
-    std::deque<EvictorMap::iterator> _modifiedQueue;
+    std::deque<FacetMap::iterator> _modifiedQueue;
 
     bool _deactivated;
   
@@ -175,6 +196,20 @@ private:
     Ice::Int _saveSizeTrigger;
     IceUtil::Time _savePeriod;
     IceUtil::Time _lastSave;
+
+    //
+    // _generation is incremented after committing changes
+    // to disk, when releasing the usage count of the element
+    // that contains the created/modified/destroyed facets. 
+    // Like the usage count, it is protected by the Evictor mutex.
+    //
+    // It is used to detect updates when loading an element and its
+    // facets without holding the Evictor mutex. If the generation
+    // is the same before the loading and later when the Evictor
+    // mutex is locked again, and the map still does not contain 
+    // this element, then the loaded value is current.
+    //
+    int _generation;
 };
 
 }
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index bc8f250edfd..8b0414c4cbc 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -24,11 +24,10 @@ TARGETS		= $(libdir)/$(LIBFILENAME) $(libdir)/$(SONAME) $(libdir)/$(LIBNAME)
 OBJS		= DBException.o \
 		  Evictor.o \
 		  EvictorF.o \
-		  ObjectRecord.o \
+		  EvictorStorage.o \
 	  	  MapI.o \
 		  EvictorI.o \
-                  SharedDbEnv.o \
-		  IdentityObjectRecordDict.o
+                  SharedDbEnv.o
 
 SRCS		= $(OBJS:.o=.cpp)
 
@@ -36,13 +35,11 @@ SLICE_SRCS	= $(SDIR)/DB.ice \
                   $(SDIR)/DBException.ice \
 		  $(SDIR)/Evictor.ice \
 		  $(SDIR)/EvictorF.ice \
-		  $(SDIR)/ObjectRecord.ice
+		  $(SDIR)/EvictorStorage.ice
 
 HDIR		= $(includedir)/Freeze
 SDIR		= $(slicedir)/Freeze
 
-SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir Freeze $(ICECPPFLAGS)
-
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) 
@@ -60,14 +57,6 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
 	ln -s $(SONAME) $@
 
-../Freeze/IdentityObjectRecordDict.h IdentityObjectRecordDict.cpp: $(SLICE2FREEZE)
-	rm -f IdentityObjectRecordDict.h IdentityObjectRecordDict.cpp
-	$(SLICE2FREEZECMD) --dict Freeze::IdentityObjectRecordDict,Ice::Identity,Freeze::ObjectRecord \
-	    IdentityObjectRecordDict $(slicedir)/Ice/Identity.ice $(slicedir)/Freeze/ObjectRecord.ice
-
-clean::
-	rm -f IdentityObjectRecordDict.h IdentityObjectRecordDict.cpp
-
 install:: all
 	$(INSTALL_LIBRARY) $(libdir)/$(LIBFILENAME) $(install_libdir)
 	rm -f $(install_libdir)/$(SONAME)
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index de40b5865cd..63dcbd12a8c 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -122,15 +122,11 @@ SOURCE=.\EvictorI.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IdentityObjectRecordDict.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\MapI.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectRecord.cpp

+SOURCE=.\EvictorStorage.cpp

 # End Source File

 # Begin Source File

 

@@ -178,10 +174,6 @@ SOURCE=..\..\include\Freeze\Freeze.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IdentityObjectRecordDict.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\Freeze\Initialize.h

 # End Source File

 # Begin Source File

@@ -190,7 +182,7 @@ SOURCE=..\..\include\Freeze\Map.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Freeze\ObjectRecord.h

+SOURCE=..\..\include\Freeze\EvictorStorage.h

 # End Source File

 # Begin Source File

 

@@ -372,80 +364,41 @@ InputPath=..\..\slice\Freeze\EvictorF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\Identity.ice

-

-!IF  "$(CFG)" == "Freeze - Win32 Release"

-

-USERDEP__IDENT="..\..\bin\slice2freeze.exe"	"..\..\lib\slice.lib"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\Identity.ice

-

-BuildCmds= \

-	..\..\bin\slice2freeze.exe --ice --include-dir Freeze -I../../slice --dict Freeze::IdentityObjectRecordDict,Ice::Identity,Freeze::ObjectRecord IdentityObjectRecordDict ../../slice/Ice/Identity.ice ../../slice/Freeze/ObjectRecord.ice

-

-"IdentityObjectRecordDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"IdentityObjectRecordDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "Freeze - Win32 Debug"

-

-USERDEP__IDENT="..\..\bin\slice2freeze.exe"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\Identity.ice

-

-BuildCmds= \

-	..\..\bin\slice2freeze.exe --ice --include-dir Freeze -I../../slice --dict Freeze::IdentityObjectRecordDict,Ice::Identity,Freeze::ObjectRecord IdentityObjectRecordDict ../../slice/Ice/Identity.ice ../../slice/Freeze/ObjectRecord.ice

-

-"IdentityObjectRecordDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"IdentityObjectRecordDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\Freeze\ObjectRecord.ice

+SOURCE=..\..\slice\Freeze\EvictorStorage.ice

 

 !IF  "$(CFG)" == "Freeze - Win32 Release"

 

-USERDEP__OBJEC="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__EVICTOR="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Freeze\ObjectRecord.ice

+InputPath=..\..\slice\Freeze\EvictorStorage.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/ObjectRecord.ice \

-	move ObjectRecord.h ..\..\include\Freeze \

+	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/EvictorStorage.ice \

+	move EvictorStorage.h ..\..\include\Freeze \

 	

 

-"..\..\include\Freeze\ObjectRecord.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Freeze\EvictorStorage.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"ObjectRecord.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"EvictorStorage.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "Freeze - Win32 Debug"

 

-USERDEP__OBJEC="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__EVICTOR="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Freeze\ObjectRecord.ice

+InputPath=..\..\slice\Freeze\EvictorStorage.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/ObjectRecord.ice \

-	move ObjectRecord.h ..\..\include\Freeze \

+	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/EvictorStorage.ice \

+	move EvictorStorage.h ..\..\include\Freeze \

 	

 

-"..\..\include\Freeze\ObjectRecord.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Freeze\EvictorStorage.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"ObjectRecord.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"EvictorStorage.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 61a559ca70e..cb0207eaf4a 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -266,17 +266,26 @@ Ice::Object::__read(BasicStream* __is, bool __rid)
 }
 
 void
-Ice::Object::__marshal(const ::Ice::StreamPtr& __os) const
+Ice::Object::__marshal(const ::Ice::StreamPtr& __os, bool __marshalFacets) const
 {
-    IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
-
-    __os->startWriteDictionary("ice:facets", static_cast<Int>(_activeFacetMap.size()));
-    for(map<string, ObjectPtr>::const_iterator p = _activeFacetMap.begin(); p != _activeFacetMap.end(); ++p)
+    if(__marshalFacets)
+    {
+	IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
+	
+	__os->startWriteDictionary("ice:facets", static_cast<Int>(_activeFacetMap.size()));
+	for(map<string, ObjectPtr>::const_iterator p = _activeFacetMap.begin(); p != _activeFacetMap.end(); ++p)
+	{
+	    __os->startWriteDictionaryElement();
+	    __os->writeString("ice:key", p->first);
+	   
+	    __os->writeObject("ice:value", p->second);
+	       
+	    __os->endWriteDictionaryElement();
+	}
+    }
+    else
     {
-	__os->startWriteDictionaryElement();
-	__os->writeString("ice:key", p->first);
-	__os->writeObject("ice:value", p->second);
-	__os->endWriteDictionaryElement();
+	__os->startWriteDictionary("ice:facets", 0);
     }
     __os->endWriteDictionary();
 }
@@ -377,6 +386,40 @@ Ice::Object::ice_removeFacet(const string& name)
     return result;
 }
 
+ObjectPtr
+Ice::Object::ice_updateFacet(const ObjectPtr& facet, const string& name)
+{
+    IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
+
+    ObjectPtr result;
+
+    map<string, ObjectPtr>::iterator p = _activeFacetMap.end();
+    if(_activeFacetMapHint != _activeFacetMap.end())
+    {
+	if(_activeFacetMapHint->first == name)
+	{
+	    p = _activeFacetMapHint;
+	}
+    }
+    
+    if(p == _activeFacetMap.end())
+    {
+	p = _activeFacetMap.find(name);
+	if(p == _activeFacetMap.end())
+	{
+	    NotRegisteredException ex(__FILE__, __LINE__);
+	    ex.kindOfObject = _kindOfObject;
+	    ex.id = name;
+	    throw ex;
+	}
+    }
+    assert(p != _activeFacetMap.end());
+    
+    result = p->second;
+    p->second = facet;
+    return result;
+}
+
 void
 Ice::Object::ice_removeAllFacets()
 {
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 9ce488900b0..3884f532634 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -269,7 +269,8 @@ static const string freezeProps[] =
 {
     "Trace.DB",
     "Trace.Evictor",
-    "Evictor.*"
+    "Evictor.*",
+    "db.*" // Temporary
 };
 
 struct PropertyValues
diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend
index 766d6a62b5c..bb284c32db0 100644
--- a/cpp/src/IcePack/.depend
+++ b/cpp/src/IcePack/.depend
@@ -8,18 +8,18 @@ Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../
 Internal.o: Internal.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h
 TraceLevels.o: TraceLevels.cpp ../../include/Ice/Properties.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../IcePack/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h
 ComponentBuilder.o: ComponentBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h
-NodeInfo.o: NodeInfo.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeInfo.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h
+NodeInfo.o: NodeInfo.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeInfo.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h
 NodeI.o: NodeI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h
 ServiceBuilder.o: ServiceBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServiceBuilder.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h ../IcePack/NodeInfo.h ../IcePack/ServerBuilder.h
-ServerBuilder.o: ServerBuilder.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/ServiceBuilder.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h
-ServerI.o: ServerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerI.h ../../include/Freeze/EvictorF.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h
-ServerAdapterI.o: ServerAdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerAdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h
-ServerFactory.o: ServerFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/ServerI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerAdapterI.h ../IcePack/TraceLevels.h
-ServerDeployerI.o: ServerDeployerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerDeployerI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/ServerBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/TraceLevels.h
+ServerBuilder.o: ServerBuilder.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/ServiceBuilder.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h
+ServerI.o: ServerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerI.h ../../include/Freeze/EvictorF.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h
+ServerAdapterI.o: ServerAdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerAdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h
+ServerFactory.o: ServerFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/ServerI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerAdapterI.h ../IcePack/TraceLevels.h
+ServerDeployerI.o: ServerDeployerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerDeployerI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../IcePack/ServerBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/TraceLevels.h
 Activator.o: Activator.cpp ../IcePack/Activator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IcePack/Internal.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h
 ActivatorI.o: ActivatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/TraceLevels.h
 WaitQueue.o: WaitQueue.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h
-Registry.o: Registry.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/AdapterFactory.h ../IcePack/ServerRegistryI.h ../IcePack/StringObjectProxyDict.h ../IcePack/AdapterRegistryI.h ../IcePack/ObjectRegistryI.h ../IcePack/IdentityObjectDescDict.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/NodeRegistryI.h ../IcePack/LocatorI.h ../../include/Ice/Locator.h ../IcePack/LocatorRegistryI.h ../IcePack/AdminI.h ../IcePack/QueryI.h ../../include/IcePack/Query.h ../IcePack/TraceLevels.h
+Registry.o: Registry.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/AdapterFactory.h ../IcePack/ServerRegistryI.h ../IcePack/StringObjectProxyDict.h ../IcePack/AdapterRegistryI.h ../IcePack/ObjectRegistryI.h ../IcePack/IdentityObjectDescDict.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/NodeRegistryI.h ../IcePack/LocatorI.h ../../include/Ice/Locator.h ../IcePack/LocatorRegistryI.h ../IcePack/AdminI.h ../IcePack/QueryI.h ../../include/IcePack/Query.h ../IcePack/TraceLevels.h
 ObjectRegistryI.o: ObjectRegistryI.cpp ../IcePack/ObjectRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/IdentityObjectDescDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/TraceLevels.h
 AdapterRegistryI.o: AdapterRegistryI.cpp ../IcePack/AdapterRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h
 ServerRegistryI.o: ServerRegistryI.cpp ../IcePack/ServerRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h
@@ -30,12 +30,12 @@ IdentityObjectDescDict.o: IdentityObjectDescDict.cpp ../../include/IceXML/Stream
 LocatorI.o: LocatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h
 LocatorRegistryI.o: LocatorRegistryI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorRegistryI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h
 ApplicationBuilder.o: ApplicationBuilder.cpp ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h
-AdapterFactory.o: AdapterFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/AdapterFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/TraceLevels.h
+AdapterFactory.o: AdapterFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/AdapterFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/TraceLevels.h
 AdapterI.o: AdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/TraceLevels.h
 AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdminI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h
 QueryI.o: QueryI.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/QueryI.h ../../include/IcePack/Query.h
-IcePackNode.o: IcePackNode.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/CtrlCHandler.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../IcePack/AdapterFactory.h ../IcePack/ServerDeployerI.h ../IcePack/NodeInfo.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/NodeI.h ../IcePack/TraceLevels.h ../IcePack/Registry.h ../../include/Ice/Xerces.h
-IcePackRegistry.o: IcePackRegistry.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../../include/Ice/Xerces.h
+IcePackNode.o: IcePackNode.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/CtrlCHandler.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../IcePack/AdapterFactory.h ../IcePack/ServerDeployerI.h ../IcePack/NodeInfo.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/NodeI.h ../IcePack/TraceLevels.h ../IcePack/Registry.h ../../include/Ice/Xerces.h
+IcePackRegistry.o: IcePackRegistry.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../../include/Ice/Xerces.h
 Admin.cpp: ../../slice/IcePack/Admin.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/IcePack/Exception.ice
 Exception.cpp: ../../slice/IcePack/Exception.ice
 Query.cpp: ../../slice/IcePack/Query.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Exception.ice
diff --git a/cpp/src/IceXML/StreamI.cpp b/cpp/src/IceXML/StreamI.cpp
index 715d249a820..163ef795b4e 100644
--- a/cpp/src/IceXML/StreamI.cpp
+++ b/cpp/src/IceXML/StreamI.cpp
@@ -197,7 +197,8 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::ostrea
     _os(os),
     _level(0),
     _nextId(0),
-    _dump(false)
+    _dump(false),
+    _marshalFacets(true)
 {
 }
 
@@ -205,7 +206,8 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::istrea
     _communicator(communicator),
     _input(0),
     _nextId(0),
-    _dump(false)
+    _dump(false),
+    _marshalFacets(true)
 {
     //
     // Read the contents of the stream into memory.
@@ -1247,6 +1249,12 @@ IceXML::StreamI::readObject(const string& name, const string& signatureType, con
 }
 
 void
+IceXML::StreamI::marshalFacets(bool setting)
+{
+    _marshalFacets = setting;
+}
+
+void
 IceXML::StreamI::startWrite(const string& element)
 {
     _os << se(element);
@@ -1383,7 +1391,7 @@ IceXML::StreamI::writeObjectData(const string& name, const string& id, const Ice
     startWrite(os.str());
     if(obj)
     {
-	obj->__marshal(this);
+	obj->__marshal(this, _marshalFacets);
     }
     endWrite();
 }
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 5fd71262f4e..7ec8e902650 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2392,7 +2392,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	H << nl << "virtual void __read(::IceInternal::BasicStream*, bool = true);";
 
 	H << sp;
-	H << nl << "virtual void __marshal(const ::Ice::StreamPtr&) const;";
+	H << nl << "virtual void __marshal(const ::Ice::StreamPtr&, bool) const;";
 	H << nl << "virtual void __unmarshal(const ::Ice::StreamPtr&);";
 	
 	H << sp;
@@ -2430,9 +2430,9 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
 	C << sp;
 	C << nl << "void" << nl << scoped.substr(2)
-          << "::__marshal(const ::Ice::StreamPtr& __os) const";
+          << "::__marshal(const ::Ice::StreamPtr& __os, bool __marshalFacets) const";
 	C << sb;
-	emitClassBase(base, "__os", "__marshal");
+	emitClassBase(base, "__os, __marshalFacets", "__marshal");
 	writeGenericMarshalCode(C, memberList, 0);
 	C << eb;
 	
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index c1ab8aae4d7..dc3137a9dd3 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -196,8 +196,8 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         //
         // encode
         //
-        out << sp << nl << "public static byte[]" << nl << "encode" << keyValue
-            << "Impl(Object o, Ice.Communicator communicator)";
+        out << sp << nl << "public byte[]" << nl << "encode" << keyValue
+            << "(Object o, Ice.Communicator communicator)";
         out << sb;
         out << nl << "assert(o instanceof " << typeS << ");";
         if(_binary)
@@ -239,17 +239,11 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         }
         out << eb;
 
-	out << sp << nl << "public byte[]" << nl << "encode" << keyValue
-            << "(Object o, Ice.Communicator communicator)";
-        out << sb;
-        out << nl << "return encode" << keyValue << "Impl(o, communicator);";
-	out << eb;
-
         //
         // decode
         //
-        out << sp << nl << "public static Object" << nl << "decode" << keyValue
-            << "Impl(byte[] b, Ice.Communicator communicator)";
+        out << sp << nl << "public Object" << nl << "decode" << keyValue
+            << "(byte[] b, Ice.Communicator communicator)";
         out << sb;
         if(_binary)
         {
@@ -396,12 +390,6 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
             out << eb;
         }
         out << eb;
-
-	out << sp << nl << "public Object" << nl << "decode" << keyValue
-            << "(byte[] b, Ice.Communicator communicator)";
-        out << sb;
-        out << nl << "return decode" << keyValue << "Impl(b, communicator);";
-	out << eb;
     }
 
     if(!_binary)
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 6372c2b5a38..eb26d6921d2 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1375,9 +1375,9 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
         out << nl << "super.__read(__is, true);";
         out << eb;
 
-        out << sp << nl << "public void" << nl << "__marshal(Ice.Stream __os)";
+        out << sp << nl << "public void" << nl << "__marshal(Ice.Stream __os, boolean __marshalFacets)";
         out << sb;
-        out << nl << "super.__marshal(__os);"; // Base must come first (due to schema rules).
+        out << nl << "super.__marshal(__os, __marshalFacets);"; // Base must come first (due to schema rules).
         iter = 0;
         for(d = members.begin(); d != members.end(); ++d)
         {