diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-09-28 11:05:44 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-09-28 11:05:44 -0230 |
| commit | 7d20430028f05cc26c412465176a75ce4ea5af9e (patch) | |
| tree | 593695acf366f7e3a7081d15af8f474683ce4af7 /cpp/src/IceGrid/Database.h | |
| parent | Removed unused __checkTwoway(const char*) from Proxy (diff) | |
| download | ice-7d20430028f05cc26c412465176a75ce4ea5af9e.tar.bz2 ice-7d20430028f05cc26c412465176a75ce4ea5af9e.tar.xz ice-7d20430028f05cc26c412465176a75ce4ea5af9e.zip | |
Bug 3231 - alternative storage for IceGrid and IceStorm
Diffstat (limited to 'cpp/src/IceGrid/Database.h')
| -rw-r--r-- | cpp/src/IceGrid/Database.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index 26aff92bda3..ae8723e5145 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -12,13 +12,9 @@ #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> -#include <Freeze/ConnectionF.h> #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> #include <IceGrid/Internal.h> -#include <IceGrid/StringApplicationInfoDict.h> -#include <IceGrid/IdentityObjectInfoDict.h> -#include <IceGrid/StringAdapterInfoDict.h> #include <IceGrid/ServerCache.h> #include <IceGrid/NodeCache.h> #include <IceGrid/ReplicaCache.h> @@ -26,6 +22,7 @@ #include <IceGrid/AllocatableObjectCache.h> #include <IceGrid/AdapterCache.h> #include <IceGrid/Topics.h> +#include <IceGrid/DatabaseCache.h> namespace IceGrid { @@ -182,11 +179,7 @@ private: AdapterObserverTopicPtr _adapterObserverTopic; ObjectObserverTopicPtr _objectObserverTopic; - Freeze::ConnectionPtr _connection; - StringApplicationInfoDict _applications; - StringAdapterInfoDict _adapters; - IdentityObjectInfoDict _objects; - IdentityObjectInfoDict _internalObjects; + DatabaseCachePtr _databaseCache; AdminSessionI* _lock; std::string _lockUserId; |