Improved observers, refactored topic manager and initialization Added

    icegridadmin commands to examine the registries

1 files changed, 168 insertions, 0 deletions

diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
new file mode 100644
index 00000000000..2950507069b
--- /dev/null
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -0,0 +1,168 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Glacier2/PermissionsVerifier.h>
+#include <IceGrid/WellKnownObjectsManager.h>
+#include <IceGrid/Database.h>
+
+using namespace std;
+using namespace IceGrid;
+
+WellKnownObjectsManager::WellKnownObjectsManager(const DatabasePtr& database) : 
+    _database(database),
+    _initialized(false)
+{
+}
+
+void
+WellKnownObjectsManager::add(const Ice::ObjectPrx& proxy, const string& type)
+{
+    assert(!_initialized);
+    ObjectInfo info;
+    info.type = type;
+    info.proxy = proxy;
+    _wellKnownObjects.push_back(info);
+}
+
+void
+WellKnownObjectsManager::addEndpoint(const string& name, const Ice::ObjectPrx& proxy)
+{
+    _endpoints.insert(make_pair(name, proxy));
+}
+
+void
+WellKnownObjectsManager::finish()
+{
+    Lock sync(*this);
+    _initialized = true;
+}
+
+void
+WellKnownObjectsManager::registerAll(const ReplicaSessionPrx& session)
+{
+    if(!initialized())
+    {
+	return;
+    }
+
+    assert(session);
+
+    //
+    // If initialized, the endpoints and well known objects are immutable.
+    //
+    session->setEndpoints(_endpoints);
+    session->registerWellKnownObjects(_wellKnownObjects);
+}
+
+void
+WellKnownObjectsManager::registerAll()
+{
+    if(!initialized())
+    {
+	return;
+    }
+
+    //
+    // If initialized, the endpoints and well known objects are immutable.
+    //
+    updateReplicatedWellKnownObjects();
+    registerWellKnownObjects(_wellKnownObjects);
+}
+
+void
+WellKnownObjectsManager::registerWellKnownObjects(const ObjectInfoSeq& objects)
+{
+    _database->addOrUpdateObjectsInDatabase(objects);
+}
+
+void
+WellKnownObjectsManager::unregisterWellKnownObjects(const ObjectInfoSeq& objects)
+{
+    _database->removeObjectsInDatabase(objects);
+}
+
+void
+WellKnownObjectsManager::updateReplicatedWellKnownObjects()
+{
+    if(!initialized())
+    {
+	return;
+    }
+
+    //
+    // Update replicated objects.
+    //
+    Ice::Identity id;
+    id.category = _database->getInstanceName();
+    ObjectInfo info;
+    ObjectInfoSeq objects;
+
+    Ice::ObjectPrx replicatedClientProxy = _database->getReplicatedEndpoints("Client", _endpoints["Client"]);
+
+    id.name = "Query";
+    info.type = Query::ice_staticId();
+    info.proxy = replicatedClientProxy->ice_identity(id);
+    objects.push_back(info);
+
+    id.name = "Locator";
+    info.type = Ice::Locator::ice_staticId();
+    info.proxy = replicatedClientProxy->ice_identity(id);
+    objects.push_back(info);
+
+    Ice::ObjectPrx replicatedSessionManagerProxy = _database->getReplicatedEndpoints("SessionManager", 
+										     _endpoints["SessionManager"]);
+    
+    id.name = "SessionManager";
+    info.type = Glacier2::SessionManager::ice_staticId();
+    info.proxy = replicatedSessionManagerProxy->ice_identity(id);
+    objects.push_back(info);
+
+    id.name = "SSLSessionManager";
+    info.type = Glacier2::SessionManager::ice_staticId();
+    info.proxy = replicatedSessionManagerProxy->ice_identity(id);
+    objects.push_back(info);
+
+    id.name = "AdminSessionManager";
+    info.type = Glacier2::SessionManager::ice_staticId();
+    info.proxy = replicatedSessionManagerProxy->ice_identity(id);
+    objects.push_back(info);
+
+    id.name = "AdminSSLSessionManager";
+    info.type = Glacier2::SessionManager::ice_staticId();
+    info.proxy = replicatedSessionManagerProxy->ice_identity(id);
+    objects.push_back(info);
+
+    Ice::ObjectPrx replicatedInternalProxy = _database->getReplicatedEndpoints("Internal", _endpoints["Internal"]);
+
+    id.name = "NullPermissionsVerifier";
+    info.type = Glacier2::PermissionsVerifier::ice_staticId();
+    info.proxy = replicatedInternalProxy->ice_identity(id);
+    objects.push_back(info);
+
+    id.name = "NullSSLPermissionsVerifier";
+    info.type = Glacier2::SSLPermissionsVerifier::ice_staticId();
+    info.proxy = replicatedInternalProxy->ice_identity(id);
+    objects.push_back(info);
+
+    _database->addOrUpdateObjectsInDatabase(objects);
+}
+
+bool
+WellKnownObjectsManager::initialized() const
+{
+    Lock sync(*this);
+    return _initialized;
+}
+
+Ice::ObjectPrx
+WellKnownObjectsManager::getEndpoints(const string& name)
+{
+    Lock sync(*this);
+    return _endpoints[name];
+}