Restore without ContainersManager & ContainersManager

diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl
index c68cbb4c9ea3119988a38c79b7292b37d07e8983..ff5deb296cf428e0eed2b0f7aad1a026454cea2a 100644 (file)
--- a/idl/SALOME_Component.idl
+++ b/idl/SALOME_Component.idl
@@ -34,8 +34,6 @@ module Engines
 {
   interface Component ;
 
-  enum ContainerType { UndefinedContainerType , CppContainer , PythonContainer } ;
-
 /*! \brief Interface of the %Container
 
    This interface defines the process of loading and registration
@@ -44,19 +42,14 @@ module Engines
 
   interface Container ;
 
-  typedef sequence<Container> ListOfContainers ;
-
-  typedef sequence<Component> ListOfComponents ;
-
   interface Container
   {
-    void destroy() ;
 /*!
     Initializes the %container with a definite name.
     \param ContainerName Name of the container
     \return an initialized container
 */
-    Container start_impl( in string ContainerName , in Engines::ContainerType aContainerType ) ;
+    Container start_impl( in string ContainerName ) ;
 
 /*!
     Loads into the container a new component, registers it and starts it's CORBA servant.
@@ -81,11 +74,6 @@ module Engines
 */
 
     void ping();
-/*!
-     Determines whether the type of container (C++ or Python).
-*/
-
-    Engines::ContainerType type();
 /*!
    Name of the %container
 */

diff --git a/src/Container/SALOME_ContainerPy.py b/src/Container/SALOME_ContainerPy.py
index 584e64951064b9b1c01ea71241bb7f033fa31064..3b68196b3d3c7d05c3b237558582ebb4ce6f512d 100755 (executable)
--- a/src/Container/SALOME_ContainerPy.py
+++ b/src/Container/SALOME_ContainerPy.py
@@ -112,7 +112,7 @@ class SALOME_ContainerPy_i (Engines__POA.Container):
 
     #-------------------------------------------------------------------------
 
-    def start_impl( self, ContainerName , ContainerType ):
+    def start_impl( self, ContainerName ):
         MESSAGE(  "SALOME_ContainerPy_i::start_impl " + str(ContainerName) )
         myMachine=string.split(os.getenv( "HOST" ),'.')
         theContainer = "/Containers/" + myMachine[0] + "/" + ContainerName
@@ -130,10 +130,7 @@ class SALOME_ContainerPy_i (Engines__POA.Container):
             else :
                 MESSAGE( "SALOME_ContainerPy_i::start_impl " + str(ContainerName) + ".object found" )
             return container
-        if ContainerType == Engines.CppContainer :
-            shstr = "SALOME_Container "
-        else :
-            shstr = "SALOME_ContainerPy.py "
+        shstr = "SALOME_ContainerPy.py "
         shstr += ContainerName
 
         # mpv: fix for SAL4731 - allways create new file to write log of server
@@ -184,15 +181,6 @@ class SALOME_ContainerPy_i (Engines__POA.Container):
         the_command = "import " + nameToRegister + "\n"
         the_command = the_command + "comp_i = " + nameToRegister + "." + nameToRegister
         the_command = the_command + "(self._orb, self._poa, self._this(), self._containerName, instanceName, interfaceName)\n"
-        valdir = dir()
-        print "dir() : ",valdir
-        print "self._orb",self._orb
-        print "self._poa",self._poa
-        print "self._this()",self._this()
-        print "self._containerName",self._containerName
-        print "instanceName",instanceName
-        print "interfaceName",interfaceName
-        print "exec the_command = '",the_command,"' :"
         try :
             exec the_command
             comp_o = comp_i._this()
@@ -220,12 +208,6 @@ class SALOME_ContainerPy_i (Engines__POA.Container):
 
     #-------------------------------------------------------------------------
 
-    def type(self):
-        MESSAGE( "SALOME_ContainerPy_i::type" )
-        return Engines.PythonContainer
-
-    #-------------------------------------------------------------------------
-
     def _get_name(self):
         MESSAGE( "SALOME_ContainerPy_i::_get_name " + self._Name )
         return self._Name