]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Fix for NPAL14147 : Remove a lot of trace at launching.
authormkr <mkr@opencascade.com>
Tue, 23 Jan 2007 06:15:49 +0000 (06:15 +0000)
committermkr <mkr@opencascade.com>
Tue, 23 Jan 2007 06:15:49 +0000 (06:15 +0000)
src/Session/SALOME_Session_Server.cxx
src/Session/Session_ServerLauncher.cxx
src/Session/Session_ServerThread.cxx

index 8ae2b1d7254b3aa57fb569ac468579b9915dbad1..8ae6b7d2f6927065fe710a29f06371b1f452684a 100755 (executable)
@@ -425,7 +425,7 @@ int main( int argc, char **argv )
 
     PortableServer::POAManager_var pman = poa->the_POAManager();
     pman->activate() ;
-    INFOS( "pman->activate()" );
+    MESSAGE( "pman->activate()" );
 
     _NS = new SALOME_NamingService( orb );
 
@@ -499,7 +499,7 @@ int main( int argc, char **argv )
       SALOME::Session_var session = SALOME::Session::_narrow( obj ) ;
       ASSERT ( ! CORBA::is_nil( session ) );
       // ...create GUI launcher
-      INFOS( "Session activated, Launch IAPP..." );
+      MESSAGE( "Session activated, Launch IAPP..." );
       guiThread = new GetInterfaceThread( session );
     }
 
@@ -518,7 +518,7 @@ int main( int argc, char **argv )
       aGUISession = new SALOME_Session();
 
       // Load SalomeApp dynamic library
-      INFOS( "creation SUIT_Application" );
+      MESSAGE( "creation SUIT_Application" );
       SUIT_Application* aGUIApp = aGUISession->startApplication( "SalomeApp", 0, 0 );
       if ( aGUIApp )
       {
index d4b05541603a2f89849f7704f4e7d963badcc743..32b124f5944cbce2d3c981497a19050441d62013 100755 (executable)
@@ -193,7 +193,7 @@ void Session_ServerLauncher::ActivateAll()
        argv[i+1] = _argv[(*itServ)._firstArg + i];
     }
 
-    std::cout << "*** activating [" << argc << "] : " << argv[0] << std::endl;
+    MESSAGE("*** activating [" << argc << "] : " << argv[0]);
 
     Session_ServerThread* aServerThread
       = new Session_ServerThread(argc, argv, _orb,_root_poa);
@@ -203,7 +203,7 @@ void Session_ServerLauncher::ActivateAll()
   }
 
   // Always launch Session Server
-  std::cout << "*** activating [ SESSION ] " << std::endl;
+  MESSAGE("*** activating [ SESSION ] ");
 
   int argc=1;
   char** argv = new char*[argc];
index d9ef4f806902ba74c26c36a56cdaf4c6bbf6aedf..8e972b0418988d42107af7ceb4ff515113a857f6 100755 (executable)
@@ -177,7 +177,7 @@ void Session_ServerThread::ActivateModuleCatalog(int argc,
 {
   try
     {
-      INFOS("ModuleCatalog thread started");
+      MESSAGE("ModuleCatalog thread started");
       // allocation on heap to allow destruction by POA
 
       SALOME_ModuleCatalogImpl* Catalogue_i
@@ -216,7 +216,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc,
 {
   try
     {
-      INFOS("SALOMEDS thread started");
+      MESSAGE("SALOMEDS thread started");
       // We allocate the objects on the heap.  Since these are reference
       // counted objects, they will be deleted by the POA when they are no
       // longer needed.    
@@ -247,7 +247,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc,
 void Session_ServerThread::ActivateRegistry(int argc,
                                            char ** argv)
 {
-  INFOS("Registry thread started");
+  MESSAGE("Registry thread started");
   SCRUTE(argc); 
   if( argc<3 )
     {
@@ -337,7 +337,7 @@ void Session_ServerThread::ActivateContainer(int argc,
 {
   try
     {
-      INFOS("Container thread started");
+      MESSAGE("Container thread started");
 
       // get or create the child POA
 
@@ -349,7 +349,7 @@ void Session_ServerThread::ActivateContainer(int argc,
        }
       catch (PortableServer::POA::AdapterNonExistent&)
        {
-         INFOS("factory_poa does not exists, create...");
+         MESSAGE("factory_poa does not exists, create...");
          // define policy objects     
          PortableServer::ImplicitActivationPolicy_var implicitActivation =
            _root_poa->create_implicit_activation_policy(
@@ -420,10 +420,10 @@ void Session_ServerThread::ActivateEngine(int /*argc*/, char ** /*argv*/)
 {
     try
       {
-       INFOS("SalomeApp_Engine thread started");
+       MESSAGE("SalomeApp_Engine thread started");
        SalomeApp_Engine_i* anEngine = new SalomeApp_Engine_i();
        /*PortableServer::ObjectId_var id = */_root_poa->activate_object( anEngine );
-       INFOS("poa->activate_object( SalomeApp_Engine )");
+       MESSAGE("poa->activate_object( SalomeApp_Engine )");
       
        CORBA::Object_ptr obj = anEngine->_this();
        _NS->Register( obj ,"/SalomeAppEngine");
@@ -476,12 +476,12 @@ void Session_SessionThread::ActivateSession(int argc,
 {
     try
       {
-       INFOS("Session thread started");
+       MESSAGE("Session thread started");
        SALOME_Session_i * mySALOME_Session
          = new SALOME_Session_i(argc, argv, _orb, _root_poa, _GUIMutex, _GUILauncher) ;
        PortableServer::ObjectId_var mySALOME_Sessionid
          = _root_poa->activate_object(mySALOME_Session);
-       INFOS("poa->activate_object(mySALOME_Session)");
+       MESSAGE("poa->activate_object(mySALOME_Session)");
       
        CORBA::Object_var obj = mySALOME_Session->_this();
        CORBA::String_var sior(_orb->object_to_string(obj));