diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-10-18 13:52:25 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-10-18 13:52:25 +0000 |
| commit | 27cb5b1e6cfa9e23de49f2287795b91e83a74ce2 (patch) | |
| tree | f1417e8715d9d61dde6176c2c86c58b071486553 /cpp/src/IceGrid/RegistryI.h | |
| parent | Changed STLPORT_HOME to USE_STLPORT (diff) | |
| download | ice-27cb5b1e6cfa9e23de49f2287795b91e83a74ce2.tar.bz2 ice-27cb5b1e6cfa9e23de49f2287795b91e83a74ce2.tar.xz ice-27cb5b1e6cfa9e23de49f2287795b91e83a74ce2.zip | |
Added IceGrid::Locator interface, more replication tests.
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 9dd9580ae99..1a16488aa1e 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -12,6 +12,7 @@ #include <IceGrid/Registry.h> #include <IceGrid/Query.h> +#include <IceGrid/Locator.h> #include <IceGrid/Internal.h> #include <IceGrid/PlatformInfo.h> #include <IceGrid/ReplicaSessionManager.h> @@ -71,23 +72,23 @@ public: private: - Ice::LocatorPrx setupLocator(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, - const Ice::ObjectAdapterPtr&); - void setupQuery(const Ice::ObjectAdapterPtr&); - void setupRegistry(const Ice::ObjectAdapterPtr&); + LocatorPrx setupLocator(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, + const RegistryPrx&, const QueryPrx&); + QueryPrx setupQuery(const Ice::ObjectAdapterPtr&); + RegistryPrx setupRegistry(const Ice::ObjectAdapterPtr&); InternalRegistryPrx setupInternalRegistry(const Ice::ObjectAdapterPtr&); void setupNullPermissionsVerifier(const Ice::ObjectAdapterPtr&); bool setupUserAccountMapper(const Ice::ObjectAdapterPtr&); - void setupClientSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const Ice::LocatorPrx&, + void setupClientSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const LocatorPrx&, bool); - void setupAdminSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const Ice::LocatorPrx&, + void setupAdminSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const LocatorPrx&, bool); void setupThreadPool(const Ice::PropertiesPtr&, const std::string&, int, int = 0); - Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const Ice::ObjectAdapterPtr&, const Ice::LocatorPrx&, + Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const Ice::ObjectAdapterPtr&, const LocatorPrx&, const std::string&, const std::string&, bool); - Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const Ice::LocatorPrx&, const std::string&, bool); + Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const LocatorPrx&, const std::string&, bool); Glacier2::SSLInfo getSSLInfo(const Ice::ConnectionPtr&, std::string&); NodePrxSeq registerReplicas(const InternalRegistryPrx&, const InternalRegistryPrxSeq&, const NodePrxSeq&); |