ContainerManager servant no longer activated in Session_server process.

diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 6b9f4b92e456c4fa0d5533524d721f5874e55881..769f04d1b215ee1cb3968fd180ea0b9756b60be1 100644 (file)
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -181,16 +181,6 @@ void Session_ServerLauncher::CheckArgs()
 
 void Session_ServerLauncher::ActivateAll()
 {
-  
-  // Always launch ContainerManager
-
-  char** argv = new char* [1];
-  argv[0] = "ContainerManager";
-  Session_SessionThread* aServerThread2
-    = new Session_SessionThread(1, argv, _orb,_root_poa,_GUIMutex,_ServerLaunch);
-  _serverThreads.push_front(aServerThread2);
-
-  aServerThread2->Init();
 
   list<ServArg>::iterator itServ;
   for (itServ = _argServToLaunch.begin(); itServ !=_argServToLaunch.end(); itServ++)
@@ -216,7 +206,7 @@ void Session_ServerLauncher::ActivateAll()
   // Always launch Session Server
 
   int argc=1;
-  argv = new char*[argc];
+  char **argv = new char*[argc];
   argv[0] = "Session";
   Session_SessionThread* aServerThread
     = new Session_SessionThread(argc, argv, _orb,_root_poa,_GUIMutex,_ServerLaunch);

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index eef03249457867bbb792435ebb5ce34a080036ba..bb135235c0cff5c3a72ba02be5179192c7957ede 100644 (file)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -33,7 +33,6 @@
 #include "Session_ServerThread.hxx"
 
 #include "SALOME_Container_i.hxx"
-#include "SALOME_ContainerManager.hxx"
 #include "SALOMEDS_StudyManager_i.hxx"
 #include "SALOME_ModuleCatalog_impl.hxx"
 #include "RegistryService.hxx"
@@ -51,13 +50,12 @@
 
 using namespace std;
 
-const int Session_ServerThread::NB_SRV_TYP = 6;
+const int Session_ServerThread::NB_SRV_TYP = 5;
 const char* Session_ServerThread::_serverTypes[NB_SRV_TYP] = {"Container",
                                                              "ModuleCatalog",
                                                              "Registry",
                                                              "SALOMEDS",
-                                                             "Session",
-                                                              "ContainerManager"};
+                                                             "Session"};
 
 //=============================================================================
 /*! 
@@ -158,12 +156,6 @@ void Session_ServerThread::Init()
              ActivateSession(_argc, _argv);
              break;
            }
-         case 5: // Container Manager
-           {
-             NamingService_WaitForServerReadiness(_NS,"");
-             ActivateContainerManager(_argc, _argv);
-             break;
-           }
          default:
            {
              ASSERT(0);
@@ -333,44 +325,6 @@ void Session_ServerThread::ActivateRegistry(int argc,
  */
 //=============================================================================
 
-void Session_ServerThread::ActivateContainerManager(int argc,
-                                            char ** argv)
-{
-  try
-    {
-      PortableServer::POA_var root_poa=PortableServer::POA::_the_root_poa();
-      cout << "ActivateContainerManager ......!!!! " << endl;
-      SALOME_ContainerManager * myContainer 
-       = new SALOME_ContainerManager(_orb);
-    }
-  catch(CORBA::SystemException&)
-    {
-      INFOS("Caught CORBA::SystemException.");
-    }
-  catch(PortableServer::POA::WrongPolicy&)
-    {
-      INFOS("Caught CORBA::WrongPolicyException.");
-    }
-  catch(PortableServer::POA::ServantAlreadyActive&)
-    {
-      INFOS("Caught CORBA::ServantAlreadyActiveException");
-    }
-  catch(CORBA::Exception&)
-    {
-      INFOS("Caught CORBA::Exception.");
-    }
-  catch(...)
-    {
-      INFOS("Caught unknown exception.");
-    }
-}
-
-//=============================================================================
-/*! 
- *  
- */
-//=============================================================================
-
 void Session_ServerThread::ActivateContainer(int argc,
                                             char ** argv)
 {