Python container is obsolete

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index 7f32f419a3d87c45b2b67fefac2619d2fdbdc389..e8f091e0d30ec05c44292cd985dbb6ab7a555d76 100644 (file)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -300,7 +300,7 @@ MMGT_REENTRANT=1
     <parameter name="modules"    value="%s"/>
     <parameter name="pyModules"  value=""/>
     <parameter name="embedded"   value="SalomeAppEngine,study,cppContainer,registry,moduleCatalog"/>
-    <parameter name="standalone" value="pyContainer"/>
+    <parameter name="standalone" value=""/>
   </section>
 </document>
 """

diff --git a/bin/runSalome b/bin/runSalome
index 1662d3fe0b30124376ae7459e98c0ef8ec0081c0..5252aee03505bac7b5a803f155b3b342738025e6 100755 (executable)
--- a/bin/runSalome
+++ b/bin/runSalome
@@ -51,24 +51,23 @@ ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/
 #     - parameters for launching are taken from SalomeApp.xml;
 #     - if the config file does not exist, it is created with default values.
 #
+#  $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=GEOM,SMESH,VISU,MED --embedded=registry,study,moduleCatalog --standalone=cppContainer --xterm --killall
 #
-#  $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=GEOM,SMESH,VISU,MED --embedded=registry,study,moduleCatalog,cppContainer --standalone=pyContainer --xterm --killall
+#     - parameters from command line supersede those from SalomeApp.xml
 #
-#     parameters from command line supersede those from SalomeApp.xml
-#
-# Some CORBA servers can be launched in the SALOME_Session_Server's process
-# (embedded = same process) or in a separate process (standalone):
-# --> registry,study,moduleCatalog,cppContainer
-# Other CORBA servers could only be launched in separate process (standalone):
-# --> pyContainer
+#     Some CORBA servers can be launched in the SALOME_Session_Server's process
+#     (embedded = same process) or in a separate process (standalone).
+#     In above example, Registry, Study and Module Catalog servers are started
+#     in the embedded mode; default C++ container (FactoryServer) is started in
+#     the standalone mode.
 #
 # $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome -h
-#    help
+#
+#    - print help on the runSalome command
 # -----------------------------------------------------------------------------
 #
-# l'option -i permet de garder l'interpreteur python ouvert :
-# par defaut, les differents serveurs ouvrent des fenêtres xterm
-# (cf. runSalome.py)
-# le serveur Logger n'est pas obligatoire (commenté dans runSalome.py)
+# The -i option starts Python interpreter after launching SALOME session
+# (see runSalome.py script).
+# Logger server is optional.
 #
 # -----------------------------------------------------------------------------

diff --git a/bin/runSalome.py b/bin/runSalome.py
index fef35cf21c81d3db71d4ae6159b63aecb606404b..62252e6e2c8671ded5e51b14ffcc1e76f5f9c883 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -614,11 +614,6 @@ def startSalome(args, modules_list, modules_root_dir):
         else:
           clt.waitNSPID("/Containers/" + theComputer + "/FactoryServer",myServer.PID)
 
-    #
-    # Launch local Python Container (FactoryServerPy),
-    # and wait until it is registered in naming service
-    #
-
     if 'pyContainer' in args['standalone']:
         raise Exception('Python containers no longer supported')
 

diff --git a/doc/README.cluster-CCRT b/doc/README.cluster-CCRT
index 9b7ac4fc633581f97fb0ab19adc36a4b6667bdab..13821d469d5421847c1b204ec73302743bf3ecd1 100644 (file)
--- a/doc/README.cluster-CCRT
+++ b/doc/README.cluster-CCRT
@@ -46,20 +46,20 @@ Examples
 Sans IHM sans execution de script python (for interactive testing and developping) :
 ---------------------------------------------
 
-runSalome --terminal --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
 Sans IHM avec execution de script(s) python :
 ---------------------------------------------
 
-runSalome --terminal=CALCULATOR_TEST --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM,CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM,CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 after the import of CALCULATOR_TEST, killall will be executed.
 
 
@@ -72,7 +72,7 @@ Create a shell file "runSalome.batch" with for example :
 #BSUB -n 10
 #BSUB -o runSalome.log%J
 #BSUB -c 0:10
-runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall
 exit
 
 Queue for execution that file (here runSalome.batch) :

diff --git a/doc/salome/running_salome.dox b/doc/salome/running_salome.dox
index d6713a3364e201dc771e122c3d56e6de0aa415d8..cf1a9ab70e9f360c04cf0a573a45317b5b2dc3c0 100644 (file)
--- a/doc/salome/running_salome.dox
+++ b/doc/salome/running_salome.dox
@@ -80,15 +80,14 @@ The servers open in separate terminal window and log messages are displayed in t
   <code>-e=registry,study,moduleCatalog,cppContainer</code>
 
 Run listed %SALOME servers in the GUI embedded mode (default value is
-<code>registry,study,moduleCatalog,cppContainer</code>). Note that logger,
-pyContainer, and supervContainer servers cannot be embedded to
-GUI. Note, that this option implies running %SALOME in GUI mode (\c -g
+<code>registry,study,moduleCatalog,cppContainer</code>). Note that logger
+server cannot be embedded to GUI. Note, that this option implies running %SALOME in GUI mode (\c -g
 option); in terminal mode all servers are running in standalone mode.
 
-- <code>--standalone=registry,study,moduleCatalog,cppContainer,pyContainer,supervContainer</code> or
-  <code>-s=registry,study,moduleCatalog,cppContainer,pyContainer,supervContainer</code>
+- <code>--standalone=registry,study,moduleCatalog,cppContainerr</code> or
+  <code>-s=registry,study,moduleCatalog,cppContainer</code>
 
-Standalone CORBA servers (default: <code>pyContainer,supervContainer</code>).
+Standalone CORBA servers (default: none).
 
 - \c --portkill or \c -p