Added support for targets attribute of the application, server and service

    descriptors Ported IcePack fixes (configurable identities).

1 files changed, 0 insertions, 111 deletions

diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 63acd4643f2..6901087a023 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -146,117 +146,6 @@ AdminI::getAllApplicationNames(const Current&) const
     return _database->getAllApplications();
 }
 
-void
-AdminI::addServer(const ApplicationDescriptorPtr& server, const Current&)
-{
-//     if(server->application.empty())
-//     {
-//  	ApplicationDescriptorPtr application = new ApplicationDescriptor();
-//  	application->name = '_' + server->name;
-// 	ApplicationDescriptorHelper helper(_communicator, application);
-// 	helper.addServerTemplate("_" + server->name, server);
-// 	helper.addServer("_" + server->name, variables);
-
-// 	application->servers.push_back(server);
-// 	try
-// 	{
-// 	    _database->addApplicationDescriptor(application);
-// 	}
-// 	catch(const ApplicationExistsException&)
-// 	{
-// 	    ServerExistsException ex;
-// 	    ex.name = server->name;
-// 	    throw ex;
-// 	}
-//     }
-//     else
-//     {
-// 	try
-// 	{
-// 	    ApplicationDescriptorPtr application = _database->getApplicationDescriptor(server->application);
-// 	    application->servers.push_back(server);
-// 	    _database->updateApplicationDescriptor(application);
-// 	}
-// 	catch(const ApplicationNotExistException&)
-// 	{
-// 	    DeploymentException ex;
-// 	    ex.reason = "application `" + server->application + "' doesn't exist";
-// 	    throw ex;
-// 	}
-//     }
-}
-
-void
-AdminI::updateServer(const ApplicationDescriptorPtr& desc, const Current&)
-{
-    //
-    // TODO
-    //
-//     ServerDescriptorPtr server = _database->getServerDescriptor(newServer->name);
-//     try
-//     {
-// 	if(server->application.empty())
-// 	{
-// 	    ApplicationDescriptorPtr application = new ApplicationDescriptor();
-// 	    application->name = '_' + newServer->name;
-// 	    application->servers.push_back(newServer);
-// 	    _database->updateApplicationDescriptor(application);
-// 	}
-// 	else
-// 	{
-// 	    ApplicationDescriptorPtr application = _database->getApplicationDescriptor(server->application);
-// 	    for(ServerDescriptorSeq::iterator p = application->servers.begin(); p != application->servers.end(); ++p)
-// 	    {
-// 		application->servers.erase(p);
-// 		application->servers.push_back(newServer);
-// 	    }
-// 	    _database->updateApplicationDescriptor(application);
-// 	}
-//     }
-//     catch(const ApplicationNotExistException&)
-//     {
-// 	ServerNotExistException ex;
-// 	ex.name = newServer->name;
-// 	throw ex;
-//     }
-
-}
-
-void
-AdminI::removeServer(const string& name, const Current&)
-{
-    //
-    // TODO
-    //
-//     ServerDescriptorPtr server = _database->getServerDescriptor(name);
-//     try
-//     {
-// 	if(server->application.empty())
-// 	{
-// 	    _database->removeApplicationDescriptor('_' + name);
-// 	}
-// 	else
-// 	{
-// 	    ApplicationDescriptorPtr application = _database->getApplicationDescriptor(server->application);
-// 	    for(ServerDescriptorSeq::iterator p = application->servers.begin(); p != application->servers.end(); ++p)
-// 	    {
-// 		if((*p)->name == name)
-// 		{
-// 		    application->servers.erase(p);
-// 		    break;
-// 		}
-// 	    }
-// 	    _database->updateApplicationDescriptor(application);
-// 	}
-//     }
-//     catch(const ApplicationNotExistException&)
-//     {
-// 	ServerNotExistException ex;
-// 	ex.name = name;
-// 	throw ex;
-//     }
-}
-
 InstanceDescriptor
 AdminI::getServerDescriptor(const string& name, const Current&) const
 {