summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/Server.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-02-12 11:37:32 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-02-12 11:37:32 +0100
commit99eb61e99f9c19d24e1d753b391358120a1b045a (patch)
tree18bb6fb75bce20bac5260de85b2acd34682c636f /cpp/src/IcePatch2/Server.cpp
parentFixed ICE-5209: fixed version to 3.5.0 (diff)
downloadice-99eb61e99f9c19d24e1d753b391358120a1b045a.tar.bz2
ice-99eb61e99f9c19d24e1d753b391358120a1b045a.tar.xz
ice-99eb61e99f9c19d24e1d753b391358120a1b045a.zip
Fixed ICE-5223: Removed deprecated admin interfaces
Diffstat (limited to 'cpp/src/IcePatch2/Server.cpp')
-rw-r--r--cpp/src/IcePatch2/Server.cpp38
1 files changed, 0 insertions, 38 deletions
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;
}