From b08bee66f5d5898d957548ad0b45bf6336803b42 Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Wed, 16 Jan 2008 08:25:40 +0000
Subject: [PATCH] CCAR: update from BR_Dev_For_4_0 branch

---
 bin/Makefile.am                 |  1 +
 bin/setenv.py                   |  6 ++----
 bin/waitNS.sh                   | 17 +++++++++++++++++
 idl/SALOME_Component.idl        |  2 +-
 idl/SALOME_ContainerManager.idl |  6 ++----
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100755 bin/waitNS.sh

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 89cd91071..2cf221ead 100644
--- 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 5ee55b7d9..7e1b93d80 100755
--- 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
index 000000000..603977956
--- /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 08aea29fc..f3139b6ec 100644
--- 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 5013b402d..c53d27a9c 100644
--- 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
-- 
2.39.2