*** empty log message ***

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 6deefa915d363478ab955c03f7e8ec1725d9982f..2038b5f1ed284b285420425ec52e44fbbfa3cffb 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -30,6 +30,7 @@ def killSalome():
    from omniORB import CORBA
    import CosNaming
    import Engines
+   import Resources
    import Containers
    try :
       orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
@@ -436,8 +437,12 @@ def startSalome():
   computerSplitName = theComputer.split('.')
   theComputer = computerSplitName[0]
   
+  import Engines
+  import Resources
+  import Containers
+
   #
-  # Lancement Resources Server
+  # Lancement ResourcesManager Server
   #
 
   ResourcesServer().run()
@@ -446,11 +451,10 @@ def startSalome():
   # Attente de la disponibilité du ResourcesServer dans le Naming Service
   #
 
-  import Resources
   session=clt.waitNS("/Kernel/ResourcesManager",Resources.Manager)
 
   #
-  # Lancement Containers Server
+  # Lancement ContainersManager Server
   #
 
   ContainersServer().run()
@@ -459,8 +463,6 @@ def startSalome():
   # Attente de la disponibilité du ContainersManager dans le Naming Service
   #
 
-  import Containers
-  import Engines
   MyContainersMgr = clt.waitNS("/Kernel/ContainersManager",Containers.Manager)
 
   #

diff --git a/idl/ResourcesManager.idl b/idl/ResourcesManager.idl
index 7c4dbeddf9087f5abd6afd9ef392d6c9abf9c540..5352145ba8dac0f8f152409abfda66df01ccc128 100644 (file)
--- a/idl/ResourcesManager.idl
+++ b/idl/ResourcesManager.idl
@@ -23,6 +23,10 @@
 //  Author : Jean Rahuel
 //  $Header: 
 
+#ifndef _RESOURCESMANAGER_IDL_
+#define _RESOURCESMANAGER_IDL_
+
+#include "SALOME_Component.idl"
 #include "ContainersManager.idl"
 
 module Resources {
@@ -92,3 +96,5 @@ module Resources {
   } ;
 
 } ;
+
+#endif

diff --git a/src/LifeCycleCORBA/LifeCycleCORBA.py b/src/LifeCycleCORBA/LifeCycleCORBA.py
index f1898b253133e0b00c006836790331b084df80d4..0c2ebcc2ad2efc1ac9e678854ee1b81f151894ff 100644 (file)
--- a/src/LifeCycleCORBA/LifeCycleCORBA.py
+++ b/src/LifeCycleCORBA/LifeCycleCORBA.py
@@ -32,12 +32,11 @@ import time
 from omniORB import CORBA
 import CosNaming
 import Engines
-import SALOME_ModuleCatalog
+import Resources
+import Containers
 
 from SALOME_utilities import *
 
-import Resources
-import Containers
 
 class LifeCycleCORBA:
     _orb = None