2 files changed, 0 insertions, 84 deletions

diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 4f3f3d9b399..62f06688f4d 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -25,26 +25,6 @@ using namespace Glacier2;
 namespace Glacier2
 {
 
-class AdminI : public Admin
-{
-public:
-    
-    AdminI(const CommunicatorPtr& communicator) :
-        _communicator(communicator)
-    {
-    }
-
-    virtual void
-    shutdown(const Current&)
-    {
-        _communicator->shutdown();
-    }
-
-private:
-
-    const CommunicatorPtr _communicator;
-};
-
 class RouterService : public Service
 {
 public:
@@ -171,17 +151,6 @@ Glacier2::RouterService::start(int argc, char* argv[], int& status)
         serverAdapter = communicator()->createObjectAdapter("Glacier2.Server");
     }
 
-    //
-    // Initialize the admin object adapter only if admin endpoints
-    // are defined.
-    //
-    const string adminEndpointsProperty = "Glacier2.Admin.Endpoints";
-    ObjectAdapterPtr adminAdapter;
-    if(!properties->getProperty(adminEndpointsProperty).empty())
-    {
-        adminAdapter = communicator()->createObjectAdapter("Glacier2.Admin");
-    }
-
     string instanceName = properties->getPropertyWithDefault("Glacier2.InstanceName", "Glacier2");
 
     //
@@ -502,17 +471,6 @@ Glacier2::RouterService::start(int argc, char* argv[], int& status)
     {
         _instance->getObserver()->setObserverUpdater(_sessionRouter);
     }
-    
-    //
-    // If we have an admin adapter, we add an admin object.
-    //
-    if(adminAdapter)
-    {
-        Identity adminId;
-        adminId.category = instanceName;
-        adminId.name = "admin";
-        adminAdapter->add(new AdminI(communicator()), adminId);
-    }
 
     //
     // Everything ok, let's go.
@@ -524,10 +482,6 @@ Glacier2::RouterService::start(int argc, char* argv[], int& status)
         {
             serverAdapter->activate();
         }
-        if(adminAdapter)
-        {
-            adminAdapter->activate();
-        }
     }
     catch(const std::exception& ex)
     {
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 7b86713a4a9..202287ebcae 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -21,26 +21,6 @@ using namespace IcePatch2;
 namespace IcePatch2
 {
 
-class AdminI : public Admin
-{
-public:
-    
-    AdminI(const CommunicatorPtr& communicator) :
-        _communicator(communicator)
-    {
-    }
-
-    virtual void
-    shutdown(const Current&)
-    {
-        _communicator->shutdown();
-    }
-
-private:
-
-    const CommunicatorPtr _communicator;
-};
-
 class PatcherService : public Service
 {
 public:
@@ -153,12 +133,6 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status)
     }
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("IcePatch2");
 
-    ObjectAdapterPtr adminAdapter;
-    if(!properties->getProperty("IcePatch2.Admin.Endpoints").empty())
-    {
-        adminAdapter = communicator()->createObjectAdapter("IcePatch2.Admin");
-    }
-
     const string instanceNameProperty = "IcePatch2.InstanceName";
     string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IcePatch2");
 
@@ -167,19 +141,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status)
     id.name = "server";
     adapter->add(new FileServerI(dataDir, infoSeq), id);
 
-    if(adminAdapter)
-    {
-        Identity adminId;
-        adminId.category = instanceName;
-        adminId.name = "admin";
-        adminAdapter->add(new AdminI(communicator()), adminId);
-    }
-
     adapter->activate();
-    if(adminAdapter)
-    {
-        adminAdapter->activate();
-    }
 
     return true;
 }