From: rahuel <rahuel@opencascade.com>
Date: Fri, 19 Mar 2004 15:38:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=195565b8845a405ed49c61b9c1ac28e6b1ebb85e;p=modules%2Fkernel.git

*** empty log message ***
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 6deefa915..2038b5f1e 100755
--- 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 7c4dbeddf..5352145ba 100644
--- 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 f1898b253..0c2ebcc2a 100644
--- 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