PR: From Antony GEAY : non regression (2.2.x) on launch remote container without...

diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx
index 0415c2141e0f180c7e3f8f2c3c321a30944a947a..c5b7c15e2b59049ff84dd168713f5463494f9aac 100644 (file)
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -70,7 +70,7 @@ int main(int argc, char* argv[])
   //CORBA::ORB_var orb = CORBA::ORB_init( argc , argv ) ;
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
-  CORBA::ORB_ptr orb = init(0 , 0 ) ;
+  CORBA::ORB_ptr orb = init(argc , argv ) ;
          
   //  LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
   INFOS_COMPILATION;

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 992b565f7cf3c48560a185445cf3e9561184be44..46e27dbc4c27e9a2fd66edf8af9fa2ca441cbd7a 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -707,24 +707,8 @@ void SALOME_ResourcesManager::AddOmninamesParams(string& command) const
 
 void SALOME_ResourcesManager::AddOmninamesParams(ofstream& fileStream) const
   {
-    string omniORBcfg( getenv( "OMNIORB_CONFIG" ) ) ;
-    ifstream omniORBfile( omniORBcfg.c_str() ) ;
-    char ORBInitRef[11] ;
-    char egal[3] ;
-    char nameservice[132] ;
-    omniORBfile >> ORBInitRef ;
-    fileStream << "ORBInitRef ";
-    omniORBfile >> egal ;
-    omniORBfile >> nameservice ;
-    omniORBfile.close() ;
-    char * bsn = strchr( nameservice , '\n' ) ;
-
-    if ( bsn )
-      {
-        bsn[ 0 ] = '\0' ;
-      }
-
-    fileStream << nameservice;
+    fileStream << "ORBInitRef NameService=";
+    fileStream << _NS->getIORaddr();
   }
 
 
@@ -870,7 +854,16 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer
     }
 
   else if (resInfo.Protocol == ssh)
-    command = "ssh ";
+    {
+      command = "ssh ";
+      string commandRcp = "scp ";
+      commandRcp += _TmpFileName;
+      commandRcp += " ";
+      commandRcp += machine;
+      commandRcp += ":";
+      commandRcp += _TmpFileName;
+      system(commandRcp.c_str());
+    }
   else
     throw SALOME_Exception("Unknown protocol");