Remove deprecated container "FactoryServerPy".

diff --git a/bin/runPYHELLO.py b/bin/runPYHELLO.py
index 4e5aa4005eb6610a1ead73bec48b0a656529daf2..cc5157c605d44c5780d2e246e397e17c4a80f24c 100755 (executable)
--- a/bin/runPYHELLO.py
+++ b/bin/runPYHELLO.py
@@ -30,7 +30,7 @@ def test(clt):
    import LifeCycleCORBA 
    lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb)
    import PYHELLO_ORB
-   pyhello = lcc.FindOrLoadComponent("FactoryServerPy", "PYHELLO")
+   pyhello = lcc.FindOrLoadComponent("FactoryServer", "PYHELLO")
    return pyhello
 
 #
@@ -51,4 +51,4 @@ if __name__ == "__main__":
      session=clt.waitNS("/Kernel/Session")
      catalog=clt.waitNS("/Kernel/ModulCatalog")
      import socket
-     container =  clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServerPy")
+     container =  clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServer")

diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py
index 29cca24bf70dd88ee73ba1b2e67770c617fe73d5..d65efd58c48997c96e3be3a73b7318b668c8bca3 100644 (file)
--- a/src/PYHELLO/PYHELLO.py
+++ b/src/PYHELLO/PYHELLO.py
@@ -112,7 +112,7 @@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen,
             abuffer += [ "import salome" ]
             abuffer += [ "import PYHELLO_ORB" ]
             abuffer += [ "" ]
-            abuffer += [ "pyhello = salome.lcc.FindOrLoadComponent( 'FactoryServerPy', '%s' )" % moduleName() ]
+            abuffer += [ "pyhello = salome.lcc.FindOrLoadComponent( 'FactoryServer', '%s' )" % moduleName() ]
             abuffer += [ "" ]
             abuffer += [ "pyhello.createObject( '%s')" % name for name in names ]
             abuffer += [ "" ]

diff --git a/src/PYHELLO/PYHELLO_utils.py b/src/PYHELLO/PYHELLO_utils.py
index 94d47d2656a6d6f7ff1f398abbbb2a95d5ad60df..c5246ec1678c3f09b1ce9c1c992668c41c89a997 100644 (file)
--- a/src/PYHELLO/PYHELLO_utils.py
+++ b/src/PYHELLO/PYHELLO_utils.py
@@ -124,7 +124,7 @@ __engine__ = None
 def getEngine():
     global __engine__
     if __engine__ is None:
-        __engine__ = getLCC().FindOrLoadComponent( "FactoryServerPy", moduleName() )
+        __engine__ = getLCC().FindOrLoadComponent( "FactoryServer", moduleName() )
         pass
     return __engine__