Restore without ContainersManager & ContainersManager

diff --git a/bin/orbmodule.py b/bin/orbmodule.py
index 0dabe5a843c5a6d6d6c127929db19e2e42a126b1..50512d985a2928d3b5dbc1cc51243f17c47b969e 100755 (executable)
--- a/bin/orbmodule.py
+++ b/bin/orbmodule.py
@@ -55,7 +55,7 @@ class client:
       print "Searching Naming Service ",
       ncount=0
       delta=0.1
-      while(ncount < 10):
+      while(ncount < 20):
           ncount += 1
           try:
               obj = self.orb.resolve_initial_references("NameService")

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 8a3e0346382cc17dfac3054dbed24a308e50fb96..d2dedf8e66851cef43b5454aa3dfb7e223ab977e 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -427,7 +427,7 @@ def startSalome():
   # Lancement Container C++ local
   #
   if with_container_cpp:
-     ContainerCPPServer().run()
+         ContainerCPPServer().run()
 
          #
          # Attente de la disponibilité du Container C++ local dans le Naming Service
@@ -440,7 +440,7 @@ def startSalome():
   #
 
   if with_container_python:
-     ContainerPYServer().run()
+         ContainerPYServer().run()
 
          #
          # Attente de la disponibilité du Container Python local dans le Naming Service
@@ -454,7 +454,7 @@ def startSalome():
        # Lancement Container Supervision local
        #
 
-        ContainerSUPERVServer().run()
+       ContainerSUPERVServer().run()
        #
        # Attente de la disponibilité du Container Supervision local dans le Naming Service
        #

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index 38c9f77c6abd0b736a23f63da867785027754225..a7f740a43a60dd1134f93cfe888a42631bfce4db 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -106,7 +106,7 @@ LIB_SRC =   \
 BIN = SALOMEDS_Server SALOMEDS_Client
 BIN_SRC = 
 LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl
-BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl ContainersManager.idl
+BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl 
 BIN_CLIENT_IDL = 
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)