CCAR: update from BR_Dev_For_4_0 branch

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 89cd91071b3ec7a8c51e1ea83c97a5522f32051b..2cf221ead1dccb7c38ec13edeb8139534495a3c7 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -62,6 +62,7 @@ dist_salomescript_SCRIPTS=\
        launchSalome.py \
        nameserver.py \
         server.py \
+       waitNS.sh \
        waitNS.py \
        waitContainers.py \
        shutdownSalome.py

diff --git a/bin/setenv.py b/bin/setenv.py
index 5ee55b7d929a7f1d163df9a0c584b88105e5c718..7e1b93d80e610343a6f2831560e9423e49a365a0 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -158,10 +158,8 @@ def set_env(args, modules_list, modules_root_dir):
     
     python_version="python%d.%d" % sys.version_info[0:2]
     modules_root_dir_list = []
-    os.putenv('SALOME_BATCH','0')
-    if args["batch"] :
-        os.putenv('SALOME_BATCH','1')
-    print 'SALOME_BATCH :',os.getenv('SALOME_BATCH')
+    if os.getenv('SALOME_BATCH') == None:
+      os.putenv('SALOME_BATCH','0')
     if args["gui"] :
         modules_list = modules_list[:] + ["GUI"] 
     modules_list = modules_list[:] + ["KERNEL"] 

diff --git a/bin/waitNS.sh b/bin/waitNS.sh
new file mode 100755 (executable)
index 0000000..6039779
--- /dev/null
+++ b/bin/waitNS.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+status=1
+while [ $status -ne 0 ]; do
+  ls $HOME/$APPLI/.omniORB_last.cfg >& /dev/null
+  status=$?
+  sleep 1
+  echo -n "#"
+done
+portNumber=`grep InitRef $HOME/$APPLI/.omniORB_last.cfg | grep -v grep | awk 'BEGIN{FS=":"}{print $NF}'`
+status=1
+while [ $status -ne 0 ]; do
+  ps -efw | grep $USER | grep omniNames | grep -v grep | grep $portNumber
+  status=$?
+  sleep 1
+  echo -n "="
+done
+./runSession waitNS.py
\ No newline at end of file

diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl
index 08aea29fc669d1ac0c81e61979e7f0d4a2fd843d..f3139b6ecf37474a7587a437e721d3e6e25f91c4 100644 (file)
--- a/idl/SALOME_Component.idl
+++ b/idl/SALOME_Component.idl
@@ -135,7 +135,7 @@ module Engines
     /*!
       Shutdown the Container process.
     */
-    oneway void Shutdown();
+    void Shutdown();
 
     /*!
       Returns the hostname of the container

diff --git a/idl/SALOME_ContainerManager.idl b/idl/SALOME_ContainerManager.idl
index 5013b402d94beb73f5f03b535342dc5684a78b5b..c53d27a9c7bc658cebf00b4a231d11e6efe42462 100644 (file)
--- a/idl/SALOME_ContainerManager.idl
+++ b/idl/SALOME_ContainerManager.idl
@@ -85,6 +85,8 @@ struct MachineParameters
 
     void Shutdown();
 
+    long getPID();
+
   } ;
   
 /*! \brief Interface of the %containerManager
@@ -115,12 +117,8 @@ struct MachineParameters
                             in ResPolicy policy,
                             in CompoList componentList );
 
-    oneway void ShutdownWithExit();
-
     void ShutdownContainers();
 
-    long getPID();
-
   } ;
   
 /*! \brief Interface of the %resourcesManager