Salome HOME
For future compatibility with python 3.9.
[modules/yacs.git] / src / runtime / RuntimeSALOME.cxx
index 2980487b2c8a16645ec3fae9283be4aad8ae7c6f..99f57715231a2a5b4b84e12db0a0226586217b13 100644 (file)
+// Copyright (C) 2006-2021  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
+//#define REFCNT
+//
+#ifdef REFCNT
+#define private public
+#define protected public
+#include <omniORB4/CORBA.h>
+#include <omniORB4/internal/typecode.h>
+#include <omniORB4/internal/corbaOrb.h>
+#endif
+
+#include "yacsconfig.h"
+#include "YACS_version.h"
 #include "RuntimeSALOME.hxx"
+#include "SALOMEDispatcher.hxx"
+#include "Proc.hxx"
+#include "TypeCode.hxx"
+#include "WhileLoop.hxx"
+#include "ForLoop.hxx"
+#include "ForEachLoop.hxx"
+#include "SalomeOptimizerLoop.hxx"
+#include "Bloc.hxx"
+#include "InputPort.hxx"
+#include "OutputPort.hxx"
+#include "PresetPorts.hxx"
+#include "InputDataStreamPort.hxx"
+#include "OutputDataStreamPort.hxx"
+#include "Switch.hxx"
+#include "SalomeProc.hxx"
+#include "PyStdout.hxx"
+//Catalog Loaders
+#include "SessionCataLoader.hxx"
+
+//Components
+#include "CORBAComponent.hxx"
+#include "SalomeComponent.hxx"
+#include "SalomeHPComponent.hxx"
+#include "SalomePythonComponent.hxx"
+#include "CppComponent.hxx"
+
+#include "SalomeContainer.hxx"
+#include "CppContainer.hxx"
+#include "SalomeHPContainer.hxx"
+
+//Nodes
 #include "PythonNode.hxx"
 #include "CORBANode.hxx"
 #include "XMLNode.hxx"
 #include "CppNode.hxx"
-#include "TypeConversions.hxx"
+#include "PresetNode.hxx"
+#include "OutNode.hxx"
+#include "StudyNodes.hxx"
+#include "SalomePythonNode.hxx"
+#include "DistributedPythonNode.hxx"
+
+//CORBA proxy ports
 #include "CORBACORBAConv.hxx"
-#include "PythonCORBAConv.hxx"
 #include "CORBAPythonConv.hxx"
+#include "CORBAXMLConv.hxx"
+#include "CORBACppConv.hxx"
+#include "CORBANeutralConv.hxx"
+
+#include "TypeConversions.hxx"
+//Python proxy ports
+#include "PythonCORBAConv.hxx"
+#include "PythonXMLConv.hxx"
+#include "PythonCppConv.hxx"
+#include "PythonNeutralConv.hxx"
+#include "PythonInitConv.hxx"
+
+//Neutral proxy ports
+#include "NeutralCORBAConv.hxx"
+#include "NeutralPythonConv.hxx"
+#include "NeutralXMLConv.hxx"
+#include "NeutralCppConv.hxx"
+#include "NeutralInitConv.hxx"
+
+//C++ proxy ports
+#include "CppCORBAConv.hxx"
+#include "CppPythonConv.hxx"
+#include "CppXMLConv.hxx"
+#include "CppCppConv.hxx"
+#include "CppNeutralConv.hxx"
+
+//XML proxy ports
 #include "XMLCORBAConv.hxx"
+#include "XMLPythonConv.hxx"
+#include "XMLCppConv.hxx"
+#include "XMLNeutralConv.hxx"
+
+//Calcium specific ports
+#include "CalStreamPort.hxx"
+
+#ifdef SALOME_KERNEL
+#include "SALOME_NamingService.hxx"
+#include "SALOME_LifeCycleCORBA.hxx"
+#include "SALOME_NamingService.hxx"
+#include "SALOME_ResourcesManager.hxx"
+#include "SALOME_ContainerManager.hxx"
+#include "SALOMEconfig.h"
+#include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 
+#endif
+  
+#include <libxml/parser.h>
 #include <omniORB4/CORBA.h>
 #include <iostream>
 #include <sstream>
 #include <cassert>
 
+//#define _DEVDEBUG_
+#include "YacsTrace.hxx"
+
 using namespace std;
 using namespace YACS::ENGINE;
 
-
-
-void RuntimeSALOME::setRuntime() // singleton creation (not thread safe!)
+void RuntimeSALOME::setRuntime(long flags, int argc, char* argv[]) // singleton creation (not thread safe!)
 {
-  if (! Runtime::_singleton) Runtime::_singleton = new RuntimeSALOME();
+  if (! Runtime::_singleton)
+    {
+      RuntimeSALOME* r=new RuntimeSALOME(flags, argc, argv);
+      Runtime::_singleton = r;
+      r->initBuiltins();
+    }
+  DEBTRACE("RuntimeSALOME::setRuntime() done !");
 }
 
 RuntimeSALOME* YACS::ENGINE::getSALOMERuntime()
 {
-  assert(Runtime::_singleton);
-  return dynamic_cast< RuntimeSALOME* >(Runtime::_singleton);
+  YASSERT(RuntimeSALOME::getSingleton());
+  return dynamic_cast< RuntimeSALOME* >(RuntimeSALOME::getSingleton());
 }
 
 /**
@@ -37,118 +155,566 @@ RuntimeSALOME* YACS::ENGINE::getSALOMERuntime()
   
 RuntimeSALOME::RuntimeSALOME()
 {
-  _setOfImplementation.insert("Cpp");
-  _setOfImplementation.insert("Python");
-  _setOfImplementation.insert("CORBA");
-  init();
+  YASSERT(0);
 }
 
+void RuntimeSALOME::initBuiltins()
+{
+  //Fill the builtin catalog with nodes specific to the runtime
+  std::map<std::string,TypeCode*>& typeMap=_builtinCatalog->_typeMap;
+  std::map<std::string,Node*>& nodeMap=_builtinCatalog->_nodeMap;
+  std::map<std::string,ComposedNode*>& composednodeMap=_builtinCatalog->_composednodeMap;
+  std::map<std::string,ComponentDefinition*>& componentMap=_builtinCatalog->_componentMap;
+  nodeMap["PyFunction"]=new PyFuncNode("PyFunction");
+  nodeMap["PyScript"]=new PythonNode("PyScript");
+  nodeMap["CORBANode"]=new CORBANode("CORBANode");
+  nodeMap["XmlNode"]=new XmlNode("XmlNode");
+  nodeMap["SalomeNode"]=new SalomeNode("SalomeNode");
+  nodeMap["CppNode"]=new CppNode("CppNode");
+  nodeMap["SalomePythonNode"]=new SalomePythonNode("SalomePythonNode");
+  nodeMap["PresetNode"]=new PresetNode("PresetNode");
+  nodeMap["OutNode"]=new OutNode("OutNode");
+  nodeMap["StudyInNode"]=new StudyInNode("StudyInNode");
+  nodeMap["StudyOutNode"]=new StudyOutNode("StudyOutNode");
+  composednodeMap["OptimizerLoop"]=createOptimizerLoop("OptimizerLoop","","",true);
+  typeMap["dblevec"]= createSequenceTc("dblevec","dblevec",_tc_double);
+  typeMap["intvec"]= createSequenceTc("intvec","intvec",_tc_int);
+  typeMap["stringvec"]= createSequenceTc("stringvec","stringvec",_tc_string);
+  typeMap["boolvec"]= createSequenceTc("boolvec","boolvec",_tc_bool);
+  typeMap["seqdblevec"]= createSequenceTc("seqdblevec","seqdblevec",typeMap["dblevec"]);
+  typeMap["seqintvec"]= createSequenceTc("seqintvec","seqintvec",typeMap["intvec"]);
+  typeMap["seqstringvec"]= createSequenceTc("seqstringvec","seqstringvec",typeMap["stringvec"]);
+  typeMap["seqboolvec"]= createSequenceTc("seqboolvec","seqboolvec",typeMap["boolvec"]);
+  std::list<TypeCodeObjref *> ltc;
+  typeMap["pyobj"]= createInterfaceTc("python:obj:1.0","pyobj",ltc);
+  typeMap["seqpyobj"]= createSequenceTc("seqpyobj","seqpyobj",typeMap["pyobj"]);
+  composednodeMap["Bloc"]=createBloc("Bloc");
+  composednodeMap["Switch"]=createSwitch("Switch");
+  composednodeMap["WhileLoop"]=createWhileLoop("WhileLoop");
+  composednodeMap["ForLoop"]=createForLoop("ForLoop");
+  composednodeMap["ForEachLoop_double"]=createForEachLoop("ForEachLoop_double",Runtime::_tc_double);
+  composednodeMap["ForEachLoop_string"]=createForEachLoop("ForEachLoop_string",Runtime::_tc_string);
+  composednodeMap["ForEachLoop_int"]=createForEachLoop("ForEachLoop_int",Runtime::_tc_int);
+  composednodeMap["ForEachLoop_bool"]=createForEachLoop("ForEachLoop_bool",Runtime::_tc_bool);
+  composednodeMap["ForEachLoop_pyobj"]=createForEachLoop("ForEachLoop_pyobj",typeMap["pyobj"]);;
+  ENGINE::TypeCodeStruct *t = createStructTc("","Engines/dataref");
+  t->addMember("ref",_tc_string);
+  typeMap["dataref"]= t;
+}
 
-void RuntimeSALOME::init()
+RuntimeSALOME::RuntimeSALOME(long flags, int argc, char* argv[])
 {
-  int nbargs = 0; char **args = 0;
-  _orb = CORBA::ORB_init (nbargs, args);
-  CORBA::Object_var obj = _orb->resolve_initial_references("DynAnyFactory");
-  _dynFactory = DynamicAny::DynAnyFactory::_narrow(obj);
+  // If all flags (apart the IsPyExt flags) are unset, force them to true
+  if ((flags - flags & RuntimeSALOME::IsPyExt) == 0)
+    flags += RuntimeSALOME::UseCorba + RuntimeSALOME::UsePython
+          +  RuntimeSALOME::UseCpp + RuntimeSALOME::UseXml;
 
-  PyObject *mainmod ;
-  cerr << "RuntimeSALOME::init" << endl;
-  Py_Initialize();
+  // Salome Nodes implies Corba Nodes
+  if (flags & RuntimeSALOME::UseSalome)
+    flags |= RuntimeSALOME::UseCorba;
 
-  mainmod = PyImport_AddModule("__main__");
-  PyObject *globals;
-  globals = PyModule_GetDict(mainmod);
+  // Corba Nodes implies Python Nodes
+  if (flags & RuntimeSALOME::UseCorba)
+    flags |= RuntimeSALOME::UsePython;
 
-  /* globals is a borrowed reference */
-  Py_INCREF(globals);
-  /* globals is a new reference */
-  
-  _bltins = PyEval_GetBuiltins();  /* borrowed ref */
+  _useCorba = flags & RuntimeSALOME::UseCorba;
+  _usePython = flags & RuntimeSALOME::UsePython;
+  _useCpp = flags & RuntimeSALOME::UseCpp;
+  _useXml = flags & RuntimeSALOME::UseXml;
+
+  /* Init libxml */
+  xmlInitParser();
+
+  if (_useCpp)    _setOfImplementation.insert(CppNode::IMPL_NAME);
+  if (_usePython) _setOfImplementation.insert(PythonNode::IMPL_NAME);
+  if (_useCorba)  _setOfImplementation.insert(CORBANode::IMPL_NAME);
+  if (_useXml)    _setOfImplementation.insert(XmlNode::IMPL_NAME);
+  init(flags, argc, argv);
+}
+
+RuntimeSALOME::~RuntimeSALOME()
+{
+  DEBTRACE("RuntimeSALOME::~RuntimeSALOME");
+  // destroy catalog loader prototypes
+  std::map<std::string, CatalogLoader*>::const_iterator pt;
+  for(pt=_catalogLoaderFactoryMap.begin();pt!=_catalogLoaderFactoryMap.end();pt++)
+    {
+      delete (*pt).second;
+    }
+}
+
+//! CORBA and Python initialization
+/*!
+ *  \param flags contains several bits
+ *            bit0 (ispyext) true when method is called from Python
+ *                           (Python initialization must not be done!)
+ *            bit1 (UsePython) true if python nodes are needed
+ *            bit1 (UseCorba)  true if CORBA nodes are needed
+ *            bit1 (UseXml)    true if python nodes are needed
+ *            bit1 (UseCpp)    true if C++ nodes are needed
+ *            bit1 (UseSalome) true if Salome nodes are needed
+ *  \param argc number of command line arguments (used to initialize the Python interpreter)
+ *  \param argv command line arguments (used to initialize the Python interpreter)
+ *
+ */
+
+void RuntimeSALOME::init(long flags, int argc, char* argv[])
+{
+  bool ispyext = flags & RuntimeSALOME::IsPyExt;
+  if (_useCorba)
+    {
+      PortableServer::POA_var root_poa;
+      PortableServer::POAManager_var pman;
+      CORBA::Object_var obj;
+      int nbargs = 0; char **args = 0;
+      _orb = CORBA::ORB_init (nbargs, args);
+      obj = _orb->resolve_initial_references("RootPOA");
+      root_poa = PortableServer::POA::_narrow(obj);
+      pman = root_poa->the_POAManager();
+      pman->activate();
+
+#ifdef REFCNT
+      DEBTRACE("_orb refCount: " << ((omniOrbORB*)_orb.in())->pd_refCount);
+#endif
+      obj = _orb->resolve_initial_references("DynAnyFactory");
+      _dynFactory = DynamicAny::DynAnyFactory::_narrow(obj);
+    }
+
+  if (_usePython)
+    {
+      DEBTRACE("RuntimeSALOME::init, is python extension = " << ispyext);
+
+      // Initialize Python interpreter in embedded mode
+      if (!Py_IsInitialized())
+        {
+#if PY_VERSION_HEX < 0x02040000 // python version earlier than 2.4.0
+          Py_Initialize(); 
+#else
+          Py_InitializeEx(0); // do not install signal handlers
+#endif
+          if (argc > 0 && argv != NULL)
+            {
+              wchar_t **changed_argv = new wchar_t*[argc];
+              for (int i = 0; i < argc; i++)
+              {
+                changed_argv[i] = Py_DecodeLocale(argv[i], NULL);
+              }
+              PySys_SetArgv(argc, changed_argv);
+            } 
+          else
+            {
+              int pyArgc = 1;
+              char* pyArgv[1];
+              char defaultName[] = "SALOME_YACS_RUNTIME";
+              wchar_t **changed_pyArgv = new wchar_t*[pyArgc];
+              pyArgv[0] = defaultName;
+              for (int i = 0; i < pyArgc; i++)
+              {
+                changed_pyArgv[i] = Py_DecodeLocale(pyArgv[i], NULL);
+              }
+              PySys_SetArgv(pyArgc, changed_pyArgv);
+            }
+#if PY_VERSION_HEX < 0x03070000
+          PyEval_InitThreads(); /* Create (and acquire) the interpreter lock (for threads)*/
+#endif
+          PyEval_SaveThread(); /* Release the thread state */
+          //here we do not have the Global Interpreter Lock
+        }
+
+      PyObject *mainmod,*pyapi,*res ;
+      PyObject *globals;
+      PyGILState_STATE gstate;
+      gstate = PyGILState_Ensure(); // acquire the Global Interpreter Lock
+    
+      mainmod = PyImport_AddModule("__main__");
+      globals = PyModule_GetDict(mainmod);
+      /* globals is a borrowed reference */
   
-  //init section
-  PyObject* omnipy = PyImport_ImportModule((char*)"_omnipy");
-  if (!omnipy)
-    {
-      PyErr_SetString(PyExc_ImportError, (char*)"Cannot import _omnipy");
-      return;
-    }
-  PyObject* pyapi = PyObject_GetAttrString(omnipy, (char*)"API");
-  _api = (omniORBpyAPI*)PyCObject_AsVoidPtr(pyapi);
-  Py_DECREF(pyapi);
-  PyObject *res=PyRun_String("\n"
-                            "import sys\n"
-                            "sys.path.insert(0,'.')\n"
-                            "import CORBA\n"
-                            "from omniORB import any\n"
-                            "orb = CORBA.ORB_init([], CORBA.ORB_ID)\n"
-                            "print sys.getrefcount(orb)\n"
-                            "\n",
-                            Py_file_input,globals,globals );
-  if(res == NULL)
+      if (PyDict_GetItemString(globals, "__builtins__") == NULL) 
+        {
+          PyObject *bimod = PyImport_ImportModule("builtins");
+          if (bimod == NULL || PyDict_SetItemString(globals, "__builtins__", bimod) != 0)
+            Py_FatalError("can't add __builtins__ to __main__");
+          Py_DECREF(bimod);
+        }
+
+      _bltins = PyEval_GetBuiltins();  /* borrowed ref */
+
+      if (_useCorba)
+        {
+
+          //init section
+          _omnipy = PyImport_ImportModule((char*)"_omnipy");
+          if (!_omnipy)
+            {
+              PyErr_Print();
+              PyErr_SetString(PyExc_ImportError, (char*)"Cannot import _omnipy");
+              goto out;
+            }
+          pyapi = PyObject_GetAttrString(_omnipy, (char*)"API");
+          if (!pyapi)
+            {
+              goto out;
+            }
+          _api = (omniORBpyAPI*)PyCapsule_GetPointer(pyapi,"_omnipy.API");
+          Py_DECREF(pyapi);
+
+          res=PyRun_String("\n"
+                           "from math import *\n"
+                           "import sys\n"
+                           "sys.path.insert(0,'.')\n"
+                           "from omniORB import CORBA\n"
+                           "from omniORB import any\n"
+                           "orb = CORBA.ORB_init([], CORBA.ORB_ID)\n"
+                           "#print(sys.getrefcount(orb))\n"
+                           "try:\n"
+                           "  import SALOME\n"
+                           "except:\n"
+                           "  pass\n"
+                           "\n",
+                           Py_file_input,globals,globals );
+          if(res == NULL)
+            {
+              PyErr_Print();
+              goto out;
+            }
+          Py_DECREF(res);
+
+          _pyorb = PyDict_GetItemString(globals,"orb");
+          /* PyDict_GetItemString returns a borrowed reference. There is no need to decref _pyorb */
+
+          PyObject *pyany;
+          pyany = PyDict_GetItemString(globals,"any");
+          /* PyDict_GetItemString returns a borrowed reference. There is no need to decref pyany */
+
+#ifdef REFCNT
+          DEBTRACE("_orb refCount: " << ((omniOrbORB*)_orb.in())->pd_refCount);
+#endif
+        }
+      out:
+        PyGILState_Release(gstate); // Release the Global Interpreter Lock
+    }
+  if (_useCorba)
     {
-      PyErr_Print();
-      return;
+      // initialize the catalogLoaderFactory map with the session one
+      _catalogLoaderFactoryMap["session"]=new SessionCataLoader;
+    }
+}
+
+void RuntimeSALOME::fini()
+{
+  if (_usePython)
+    {
+      PyGILState_STATE gstate = PyGILState_Ensure();
+#ifdef REFCNT
+      DEBTRACE("_orb refCount: " << ((omniOrbORB*)_orb.in())->pd_refCount);
+#endif
+      PyObject *mainmod, *globals;
+      mainmod = PyImport_AddModule("__main__");
+      globals = PyModule_GetDict(mainmod);
+      if (_useCorba)
+        {
+          PyObject* res;
+          res=PyRun_String("orb.destroy()\n"
+                           "\n",
+                           Py_file_input,globals,globals );
+          if(res == NULL)
+            PyErr_Print();
+          else
+            Py_DECREF(res);
+        }
+      std::map<std::string,Node*>& nodeMap=_builtinCatalog->_nodeMap;
+      delete nodeMap["PyFunction"];
+      delete nodeMap["PyScript"];
+      delete nodeMap["SalomePythonNode"];
+      nodeMap.erase("PyFunction");
+      nodeMap.erase("PyScript");
+      nodeMap.erase("SalomePythonNode");
+
+      Py_Finalize();
+#ifdef REFCNT
+      DEBTRACE("_orb refCount: " << ((omniOrbORB*)_orb.in())->pd_refCount);
+#endif
+    }
+  else
+    {
+      if (_useCorba)
+        {
+#ifdef REFCNT
+          DEBTRACE("_orb refCount: " << ((omniOrbORB*)_orb.in())->pd_refCount);
+#endif
+          _orb->destroy();
+        }
+    }
+}
+
+std::vector< std::pair<std::string,int> > RuntimeSALOME::getCatalogOfComputeNodes() const
+{
+  CORBA::ORB_ptr orb(getOrb());
+  SALOME_NamingService namingService;
+  try
+  {
+    namingService.init_orb(orb);
+  }
+  catch(SALOME_Exception& e)
+  {
+    throw Exception("RuntimeSALOME::getCatalogOfComputeNodes : Unable to contact the SALOME Naming Service");
+  }
+  CORBA::Object_var obj(namingService.Resolve(SALOME_ResourcesManager::_ResourcesManagerNameInNS));
+  if(CORBA::is_nil(obj))
+    throw Exception("RuntimeSALOME::getCatalogOfComputeNodes : Unable to access to the resource manager !");
+  Engines::ResourcesManager_var resManager(Engines::ResourcesManager::_narrow(obj));
+  if(CORBA::is_nil(resManager))
+    throw Exception("RuntimeSALOME::getCatalogOfComputeNodes : Internal error ! The entry attached to the res manager in NS does not have right type !");
+  std::vector< std::pair<std::string,int> > ret;
+  Engines::ResourceParameters params;
+  params.name = "";
+  params.hostname = "";
+  params.OS = "";
+  params.nb_proc = 0;
+  params.mem_mb = 0;
+  params.cpu_clock = 0;
+  params.nb_node = 0;
+  params.nb_proc_per_node = 0;
+  params.policy = "";
+  params.can_launch_batch_jobs = false;
+  params.can_run_containers = true;
+  params.componentList.length(0);
+  try
+  {
+    Engines::ResourceList_var resourceList;
+    resourceList = resManager->GetFittingResources(params);
+    ret.reserve(resourceList->length());
+    for(int i = 0; i<resourceList->length(); i++)
+    {
+      const char* resource_name = resourceList[i];
+      std::string std_resource_name = resource_name;
+      Engines::ResourceDefinition_var resource_definition
+                              = resManager->GetResourceDefinition(resource_name);
+      int nb_cores = resource_definition->nb_node *
+                     resource_definition->nb_proc_per_node;
+      ret.push_back(std::pair<std::string,int>(resource_name, nb_cores));
     }
-  Py_DECREF(res);
-  _pyorb = PyDict_GetItemString(globals,"orb");
-  cerr << "refcnt: " << _pyorb->ob_refcnt << endl;
-  PyObject_Print(_pyorb,stdout,Py_PRINT_RAW);
-  cerr << endl;
-  /* pyorb is a borrowed reference */
-  //Py_INCREF(pyorb); pas nécessaire
+  }
+  catch(SALOME::SALOME_Exception& e)
+  {
+    std::string message;
+    message=e.details.text.in();
+    throw Exception(message);
+  }
 
-  PyObject *pyany;
-  pyany = PyDict_GetItemString(globals,"any");
-  cerr << "pyany refcnt: " << pyany->ob_refcnt << endl;
-  /* pyany is a borrowed reference */
+  return ret;
 }
 
+std::string RuntimeSALOME::getVersion() const
+{
+#ifdef YACS_DEVELOPMENT
+  return CORBA::string_dup(YACS_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(YACS_VERSION_STR);
+#endif
+}
 
-void RuntimeSALOME::fini()
+Proc* RuntimeSALOME::createProc(const std::string& name)
+{
+  return new SalomeProc(name);
+}
+
+TypeCode * RuntimeSALOME::createInterfaceTc(const std::string& id, const std::string& name,
+                                            std::list<TypeCodeObjref *> ltc)
+{
+  std::string myName;
+  if(id == "") myName = "IDL:" + name + ":1.0";
+  else myName = id;
+  return TypeCode::interfaceTc(myName.c_str(),name.c_str(),ltc);
+}
+
+TypeCode * RuntimeSALOME::createSequenceTc(const std::string& id,
+                                           const std::string& name,
+                                           TypeCode *content)
+{
+  return TypeCode::sequenceTc(id.c_str(),name.c_str(),content);
+};
+
+TypeCodeStruct * RuntimeSALOME::createStructTc(const std::string& id, const std::string& name)
+{
+  std::string myName;
+  if(id == "") myName = "IDL:" + name + ":1.0";
+  else myName = id;
+  return (TypeCodeStruct *)TypeCode::structTc(myName.c_str(),name.c_str());
+}
+
+Bloc* RuntimeSALOME::createBloc(const std::string& name)
+{
+  return new Bloc(name);
+}
+
+WhileLoop* RuntimeSALOME::createWhileLoop(const std::string& name)
+{
+  return new WhileLoop(name);
+}
+
+ForLoop* RuntimeSALOME::createForLoop(const std::string& name)
 {
-  cerr << "RuntimeSALOME::fini" << endl;
-  Py_Finalize();
+  return new ForLoop(name);
 }
 
+OptimizerLoop* RuntimeSALOME::createOptimizerLoop(const std::string& name,const std::string& algLib,const std::string& factoryName,
+                                                  bool algInitOnFile, const std::string& kind, Proc * procForTypes)
+{
+  OptimizerLoop * ol = (kind == "base") ? new OptimizerLoop(name,algLib,factoryName,algInitOnFile, true, procForTypes) :
+                                          new SalomeOptimizerLoop(name,algLib,factoryName,algInitOnFile, true, procForTypes);
+  ol->edGetNbOfBranchesPort()->edInit(1);
+  return ol;
+}
+
+DataNode* RuntimeSALOME::createInDataNode(const std::string& kind,const std::string& name)
+{
+  DataNode* node;
+  if(kind == "" )
+    {
+      node = new PresetNode(name);
+      return node;
+    }
+  else if(kind == "study" )
+    {
+      return new StudyInNode(name);
+    }
+  std::string msg="DataNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
 
-ElementaryNode* RuntimeSALOME::createNode(string implementation,
-                                         string name) throw(Exception)
+DataNode* RuntimeSALOME::createOutDataNode(const std::string& kind,const std::string& name)
 {
-  ElementaryNode* node = 0;
-  if (implementation == "Python")
-    node = new PythonNode(name);
-  else if (implementation == "CORBA")
-    node = new CORBANode(name);
-  else if (implementation == "XML")
-    node = new XmlNode(name);
-  else if (implementation == "Cpp")
-    node = new CppNode(name);
-  else 
+  if(kind == "" )
+    {
+      return new OutNode(name);
+    }
+  else if(kind == "study" )
     {
-      string what ="RuntimeSALOME does not handle this implementation: " + implementation;
-      throw Exception(what);
+      return new StudyOutNode(name);
     }
-  return node;
+
+  std::string msg="OutDataNode kind ("+kind+") unknown";
+  throw Exception(msg);
 }
 
-InputPort * RuntimeSALOME::createInputPort(const string& name,
-                                          const string& impl,
-                                          Node * node,
-                                          TypeCode * type)
+InlineFuncNode* RuntimeSALOME::createFuncNode(const std::string& kind,const std::string& name)
 {
-  if(impl == "CPP")
+  InlineFuncNode* node;
+  if(kind == "" || kind == SalomeNode::KIND || kind == PythonNode::KIND)
     {
-      throw Exception("Cannot create InputCppPort ");
+      node = new PyFuncNode(name);
+      return node;
     }
-  else if(impl == "Python")
+  if(kind == DistributedPythonNode::KIND)
+    return new DistributedPythonNode(name);
+  std::string msg="FuncNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+InlineNode* RuntimeSALOME::createScriptNode(const std::string& kind,const std::string& name)
+{
+  InlineNode* node;
+  if(kind == "" || kind == SalomeNode::KIND || kind == PythonNode::KIND)
+    {
+      node = new PythonNode(name);
+      return node;
+    }
+  std::string msg="ScriptNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+ServiceNode* RuntimeSALOME::createRefNode(const std::string& kind,const std::string& name)
+{
+  ServiceNode* node;
+  if(kind == "" || kind == SalomeNode::KIND || kind == CORBANode::KIND)
+    {
+      node = new CORBANode(name);
+      return node;
+    }
+  else if(kind == XmlNode::KIND)
+    {
+      node = new XmlNode(name);
+      return node;
+    }
+  std::string msg="RefNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+ServiceNode* RuntimeSALOME::createCompoNode(const std::string& kind,const std::string& name)
+{
+  ServiceNode* node;
+  if(kind == "" || kind == SalomeNode::KIND )
+    {
+      node=new SalomeNode(name);
+      return node;
+    }
+  else if (kind == CppNode::KIND) 
+    {
+      node = new CppNode(name);
+      return node;
+    }
+  std::string msg="CompoNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+ServiceInlineNode *RuntimeSALOME::createSInlineNode(const std::string& kind, const std::string& name)
+{
+  if(kind == "" || kind == SalomeNode::KIND )
+    return new SalomePythonNode(name);
+  std::string msg="CompoNode kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+ComponentInstance* RuntimeSALOME::createComponentInstance(const std::string& name,
+                                                          const std::string& kind)
+{
+  ComponentInstance* compo;
+  if(kind == "" || kind == SalomeComponent::KIND) 
+    return new SalomeComponent(name);
+  else if(kind == CORBAComponent::KIND)
+    return new CORBAComponent(name);
+  else if(kind == SalomePythonComponent::KIND)
+    return new SalomePythonComponent(name);
+  else if (kind == CppComponent::KIND)
+    return new CppComponent(name);
+  else if (kind == SalomeHPComponent::KIND)
+    return new SalomeHPComponent(name);
+  std::string msg="Component Instance kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+Container *RuntimeSALOME::createContainer(const std::string& kind)
+{
+  if(kind == "" || kind == SalomeContainer::KIND)
+    return new SalomeContainer;
+  if(kind==SalomeHPContainer::KIND)
+    return new SalomeHPContainer;
+  else if (kind == CppContainer::KIND)
+    return new CppContainer;
+  std::string msg="Container kind ("+kind+") unknown";
+  throw Exception(msg);
+}
+
+InputPort * RuntimeSALOME::createInputPort(const std::string& name,
+                                           const std::string& impl,
+                                           Node * node,
+                                           TypeCode * type)
+{
+  if(impl == CppNode::IMPL_NAME)
+    {
+      return new InputCppPort(name, node, type);
+    }
+  else if(impl == PythonNode::IMPL_NAME)
     {
       return new InputPyPort(name, node, type);
     }
-  else if(impl == "CORBA")
+  else if(impl == CORBANode::IMPL_NAME)
     {
       return new InputCorbaPort(name, node, type);
     }
-  else if(impl == "XML")
+  else if(impl == XmlNode::IMPL_NAME)
     {
       return new InputXmlPort(name, node, type);
     }
@@ -156,29 +722,29 @@ InputPort * RuntimeSALOME::createInputPort(const string& name,
     {
       stringstream msg;
       msg << "Cannot create " << impl << " InputPort" ;
-      msg << " ("__FILE__ << ":" << __LINE__ << ")";
+      msg << " (" << __FILE__ << ":" << __LINE__ << ")";
       throw Exception(msg.str());
     }
 }
 
-OutputPort * RuntimeSALOME::createOutputPort(const string& name,
-                                            const string& impl,
-                                            Node * node,
-                                            TypeCode * type)
+OutputPort * RuntimeSALOME::createOutputPort(const std::string& name,
+                                             const std::string& impl,
+                                             Node * node,
+                                             TypeCode * type)
 {
-  if(impl == "CPP")
+  if(impl == CppNode::IMPL_NAME)
     {
-      throw Exception("Cannot create OutputCppPort ");
+      return new OutputCppPort(name, node, type);
     }
-  else if(impl == "Python")
+  else if(impl == PythonNode::IMPL_NAME)
     {
       return new OutputPyPort(name, node, type);
     }
-  else if(impl == "CORBA")
+  else if(impl == CORBANode::IMPL_NAME)
     {
       return new OutputCorbaPort(name, node, type);
     }
-  else if(impl == "XML")
+  else if(impl == XmlNode::IMPL_NAME)
     {
       return new OutputXmlPort(name, node, type);
     }
@@ -186,407 +752,1206 @@ OutputPort * RuntimeSALOME::createOutputPort(const string& name,
     {
       stringstream msg;
       msg << "Cannot create " << impl << " OutputPort" ;
-      msg << " ("__FILE__ << ":" << __LINE__ << ")";
+      msg << " (" << __FILE__ << ":" << __LINE__ << ")";
       throw Exception(msg.str());
     }
 }
 
-InputPort* RuntimeSALOME::adapt(const string& imp_source,
-                               InputPort* source,
-                               const string& impl,
-                               TypeCode * type) throw (ConversionException)
+InputDataStreamPort* RuntimeSALOME::createInputDataStreamPort(const std::string& name,
+                                                              Node *node,TypeCode *type)
+{
+  DEBTRACE("createInputDataStreamPort: " << name << " " << type->shortName());
+  if(type->kind() == Objref && std::string(type->shortName(),7) == "CALCIUM")
+    {
+      return new InputCalStreamPort(name,node,type);
+    }
+  else
+    {
+      return new InputDataStreamPort(name,node,type);
+    }
+}
+
+OutputDataStreamPort* RuntimeSALOME::createOutputDataStreamPort(const std::string& name,
+                                                                Node *node,TypeCode *type)
+{
+  DEBTRACE("createOutputDataStreamPort: " << name << " " << type->shortName());
+  if(type->kind() == Objref && std::string(type->shortName(),7) == "CALCIUM")
+    {
+      return new OutputCalStreamPort(name,node,type);
+    }
+  else
+    {
+      return new OutputDataStreamPort(name,node,type);
+    }
+}
+
+//! Main adapter function : adapt an InputPort to be able to connect it to an OutputPort with a possible different implementation 
+/*!
+ *  \param source : InputPort to be adapted
+ *  \param impl : new implementation (C++, python, CORBA, XML, Neutral)
+ *  \param type : data type provided by the InputPort
+ *  \param init : indicates if the adapted InputPort will be used for initialization (value true) or not (value false)
+ * 
+ * \return : adapted InputPort
+ */
+InputPort* RuntimeSALOME::adapt(InputPort* source,
+                                const std::string& impl,
+                                TypeCode * type,bool init)
 {
-  cerr<<"RuntimeSALOME::adapt(InputPort* source" << endl;
-  if(imp_source == "Python")
+  string imp_source=source->getNode()->getImplementation();
+  if(imp_source == PythonNode::IMPL_NAME)
+    {
+      return adapt((InputPyPort*)source,impl,type,init);
+    }
+  else if(imp_source == CppNode::IMPL_NAME)
+    {
+      return adapt((InputCppPort*)source,impl,type,init);
+    }
+  else if(imp_source == CORBANode::IMPL_NAME)
     {
-      return adapt((InputPyPort*)source,impl,type);
+      return adapt((InputCorbaPort*)source,impl,type,init);
     }
-  else if(imp_source == "CORBA")
+  else if(imp_source == XmlNode::IMPL_NAME)
     {
-      return adapt((InputCorbaPort*)source,impl,type);
+      return adapt((InputXmlPort*)source,impl,type,init);
     }
-  else if(imp_source == "XML")
+  else if(imp_source == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
     {
-      return adapt((InputXmlPort*)source,impl,type);
+      return adaptNeutral(source,impl,type,init);
     }
   else
     {
       stringstream msg;
       msg << "Cannot adapt " << imp_source << " InputPort to " << impl;
-      msg << " ("__FILE__ << ":" << __LINE__ << ")";
+      msg << " (" << __FILE__ << ":" << __LINE__ << ")";
       throw ConversionException(msg.str());
     }
 }
 
-//! Retourne un adaptateur d'un port entrant Xml pour un port sortant dont l'implémentation est donnée par impl
+//! Adapter function for InPropertyPort
 /*!
- *   \param source : input port to adapt to implementation impl and type type
- *   \param impl : output port implementation (C++, Python or Corba)
- *   \param type : le type supporté par le port sortant
- *   \return input port adapté à l'implémentation
+ *  \param source : InPropertyPort to be adapted
+ *  \param impl : new implementation (C++, python, CORBA, XML, Neutral)
+ *  \param type : data type provided by the InPropertyPort
+ *  \param init : indicates if the adapted InPropertyPort will be used for initialization (value true) or not (value false)
+ * 
+ * \return : adapted InputPort
  */
+InputPort* RuntimeSALOME::adapt(InPropertyPort* source,
+                                const std::string& impl,
+                                TypeCode * type,bool init)
+{
+  return adaptNeutral((InputPort *)source,impl,type,init);
+}
 
-InputPort* RuntimeSALOME::adapt(InputXmlPort* source,
-                               const string& impl,
-                               TypeCode * type) throw (ConversionException)
+//! Adapt a Neutral input port to a Corba output port
+/*!
+ *   \param inport : Neutral input port to adapt to Corba type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputCorbaPort
+ */
+InputPort* RuntimeSALOME::adaptNeutralToCorba(InputPort* inport,
+                      TypeCode * type)
 {
-  cerr<<"RuntimeSALOME::adapt(InputXmlPort* source" << endl;
-  if(impl == "CORBA")
+  // BEWARE : using the generic check
+  if(inport->edGetType()->isAdaptable(type))
     {
-      return adaptXmlToCorba(source,type);
+      //the output data is convertible to inport type
+      return new CorbaNeutral(inport);
     }
-  else
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Corba output port with type: " << type->id() ;
+  msg << " to Neutral input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a Neutral input port to a Python output port
+/*!
+ *   \param inport : input port to adapt to Python type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
+ */
+InputPort* RuntimeSALOME::adaptNeutralToPython(InputPort* inport,
+                      TypeCode * type)
+{
+  // BEWARE : using the generic check
+  if(inport->edGetType()->isAdaptable(type))
     {
-      stringstream msg;
-      msg << "Cannot connect InputXmlPort to " << impl << " implementation";
-      msg << " ("__FILE__ << ":" << __LINE__ << ")";
-      throw ConversionException(msg.str());
+      //convertible type
+      return new PyNeutral(inport);
+    }
+  //last chance : an py output that is seq[objref] can be connected to a neutral input objref (P13268)
+  else if(type->kind()==Sequence && type->contentType()->kind()==Objref && inport->edGetType()->kind()==Objref)
+    {
+      return new PyNeutral(inport);
     }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Python output port with type: " << type->id() ;
+  msg << " to Neutral input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a Neutral input port to a Xml output port 
+/*!
+ *   \param inport : input port to adapt to Xml type type
+ *   \param type : output port type
+ *   \return an input port of type InputXmlPort
+ */
+InputPort* RuntimeSALOME::adaptNeutralToXml(InputPort* inport,
+                      TypeCode * type)
+{
+  // BEWARE : using the generic check
+  if(inport->edGetType()->isAdaptable(type))
+    {
+      //convertible type
+      return new XmlNeutral(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Xml output port with type: " << type->id() ;
+  msg << " to Neutral input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant XML pour un port sortant CORBA
+//! Adapt a Neutral input port to a C++ output port 
+/*!
+ *   \param inport : input port to adapt to C++ type type
+ *   \param type : output port type
+ *   \return an input port of type InputCppPort
+ */
+InputPort* RuntimeSALOME::adaptNeutralToCpp(InputPort* inport,
+                      TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptNeutralToCpp(InputPort* inport" );
+  if(isAdaptableNeutralCpp(type,inport->edGetType()))
+    {
+      //convertible type
+      return new CppNeutral(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Cpp output port with type: " << type->id() ;
+  msg << " to Neutral input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a Neutral input port to connect it to an output port with a given implementation
+/*!
+ *   \param source : Neutral input port to adapt to implementation impl and type type
+ *   \param impl : output port implementation (C++, Python, Corba, Xml or Neutral)
+ *   \param type : output port supported type
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return       the adaptated port
+ */
+InputPort* RuntimeSALOME::adaptNeutral(InputPort* source,
+                                       const std::string& impl,
+                                       TypeCode * type,bool init)
+{
+  if(impl == CppNode::IMPL_NAME)
+    {
+      return adaptNeutralToCpp(source,type);
+    }
+  else if(impl == PythonNode::IMPL_NAME)
+    {
+      return adaptNeutralToPython(source,type);
+    }
+  else if(impl == CORBANode::IMPL_NAME)
+    {
+      return adaptNeutralToCorba(source,type);
+    }
+  else if(impl == XmlNode::IMPL_NAME )
+    {
+      return adaptNeutralToXml(source,type);
+    }
+  else if(impl == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
+    {
+      if(init)
+        return new NeutralInit(source);
+      else
+        return new ProxyPort(source);
+    }
+  stringstream msg;
+  msg << "Cannot connect InputPort : unknown implementation " << impl;
+  msg << " (" <<__FILE__ << ":" <<__LINE__ << ")";
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a XML input port to connect it to a CORBA output port 
 /*!
  *   \param inport : input port to adapt to CORBA type type
- *   \param type : le type supporté par le port sortant
- *   \return a InputCorbaPort port
+ *   \param type : type supported by output port
+ *   \return an adaptator port of type InputCorbaPort 
  */
 
 InputPort* RuntimeSALOME::adaptXmlToCorba(InputXmlPort* inport,
-                                         TypeCode * type) throw (ConversionException)
+                                          TypeCode * type)
 {
-  cerr <<"RuntimeSALOME::adaptXmlToCorba(InputXmlPort* inport" << endl;
-  if(isAdaptableXmlCorba(type,inport->type()))
+  if(isAdaptableXmlCorba(type,inport->edGetType()))
     {
-      //les types sont convertibles
+      //output type is convertible to input type
       return new CorbaXml(inport);
     }
-  //les types sont non convertibles
+  //output type is not convertible
   stringstream msg;
-  msg << "Cannot connect InputXmlPort to Corba output port " ;
-  msg << type->id() << " != " << inport->type()->id();
-  msg << " ("__FILE__ << ":" << __LINE__ << ")";
+  msg << "Cannot connect Corba output port with type: " << type->id() ;
+  msg << " to Xml input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
   throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant CORBA pour un port sortant Xml
+//! Adapt a XML input port to a Python output port
 /*!
- *   \param inport : input port to adapt to Xml type type
- *   \param type : le type supporté par le port sortant
- *   \return an input port of Python type InputXmlPort
+ *   \param inport : input port to adapt to Python type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
  */
+InputPort* RuntimeSALOME::adaptXmlToPython(InputXmlPort* inport,
+                      TypeCode * type)
+{
+  if(inport->edGetType()->isAdaptable(type))
+    {
+      //the output data is convertible to inport type
+      return new PyXml(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Python output port with type: " << type->id() ;
+  msg << " to Xml input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
 
-InputPort* RuntimeSALOME::adaptCorbaToXml(InputCorbaPort* inport,
-                                         TypeCode * type) throw (ConversionException)
+//! Adapt a XML input port to a C++ output port
+/*!
+ *   \param inport : input port to adapt to C++ type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
+ */
+InputPort* RuntimeSALOME::adaptXmlToCpp(InputXmlPort* inport,
+                      TypeCode * type)
 {
-  //ATTENTION : on utilise isAdaptableCorbaPyObject (meme fonction)
-  cerr << "RuntimeSALOME::adaptCorbaToXml(InputCorbaPort* inport" << endl;
-  if(isAdaptableCorbaPyObject(type,inport->type()))
+  DEBTRACE("RuntimeSALOME::adaptXmlToCpp(InputPort* inport" );
+  DEBTRACE(type->kind() << "   " << inport->edGetType()->kind() );
+  if(type->isAdaptable(inport->edGetType()))
     {
-      //les types sont convertibles
-      return new XmlCorba(inport);
+      //the output data is convertible to inport type
+      return new CppXml(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Cpp output port with type: " << type->id() ;
+  msg << " to Xml input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a XML input port to a Neutral output port
+/*!
+ *   \param inport : input port to adapt to Neutral type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type Neutralxxxx
+ */
+InputPort* RuntimeSALOME::adaptXmlToNeutral(InputXmlPort* inport,
+                      TypeCode * type)
+{
+  if(inport->edGetType()->isAdaptable(type))
+    {
+      //the output data is convertible to inport type
+      return new NeutralXml(inport);
     }
-  //les types sont non convertibles
+  //non convertible type
   stringstream msg;
-  msg << "Cannot connect InputCorbaPort with OutputXmlPort : " ;
-  msg << __FILE__ << ":" <<__LINE__;
+  msg << "Cannot connect Xml InputPort to OutputNeutralPort : " ;
+  msg << "(" <<__FILE__ << ":" <<__LINE__<< ")";
   throw ConversionException(msg.str());
 }
 
+//! Adapt a XML input port to a Xml output port
+/*!
+ *   \param inport : input port to adapt to Xml type type
+ *   \param type : output port type
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return an adaptated input port of type Xmlxxxx
+ */
+InputPort* RuntimeSALOME::adaptXmlToXml(InputXmlPort* inport,
+                      TypeCode * type,bool init)
+{
+  if(init)
+    return new ProxyPort(inport);
+
+  if(inport->edGetType()->isAdaptable(type))
+    return new ProxyPort(inport);
+
+  stringstream msg;
+  msg << "Cannot connect Xml output port with type: " << type->id() ;
+  msg << " to Xml input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
 
-//! Retourne un adaptateur d'un port entrant CORBA pour un port sortant CORBA
+//! Adapt an Xml input port to an output port which implementation is given by impl
 /*!
- *   \param inport : input port to adapt to CORBA type type
- *   \param type : le type supporté par le port sortant
+ *   \param source : input port to adapt to implementation impl and type type
+ *   \param impl : output port implementation (C++, Python or Corba)
+ *   \param type : output port supported type
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return       the adaptated port
  */
 
+InputPort* RuntimeSALOME::adapt(InputXmlPort* source,
+                                const std::string& impl,
+                                TypeCode * type,bool init)
+{
+  if(impl == CORBANode::IMPL_NAME)
+    {
+      return adaptXmlToCorba(source,type);
+    }
+  else if(impl == PythonNode::IMPL_NAME)
+    {
+      return adaptXmlToPython(source,type);
+    }
+  else if(impl == CppNode::IMPL_NAME)
+    {
+      return adaptXmlToCpp(source,type);
+    }
+  else if(impl == XmlNode::IMPL_NAME )
+    {
+      return adaptXmlToXml(source,type,init);
+    }
+  else if(impl == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
+    {
+      return adaptXmlToNeutral(source,type);
+    }
+  else
+    {
+      stringstream msg;
+      msg << "Cannot connect InputXmlPort to " << impl << " implementation";
+      msg << " (" << __FILE__ << ":" << __LINE__ << ")";
+      throw ConversionException(msg.str());
+    }
+}
+
+
+//! Adapt a CORBA input port to a CORBA output port 
+/*!
+ *   \param inport : input port to adapt to CORBA outport data type
+ *   \param type : outport data type 
+ *   \return an adaptator port of type InputCORBAPort 
+ */
 InputPort* RuntimeSALOME::adaptCorbaToCorba(InputCorbaPort* inport,
-                                           TypeCode * type) throw (ConversionException)
+                                            TypeCode * type)
 {
-  if(type->is_a(inport->type()))
+  if(type->isA(inport->edGetType()))
     {
-      //les types sont compatibles : pas de conversion
-      return inport;
+      //types are compatible : no conversion 
+      //outport data type is more specific than inport required type
+      //so the inport can be used safely 
+      return new ProxyPort(inport);
     }
-  else if(isAdaptableCorbaCorba(type,inport->type()))
+  else if(isAdaptableCorbaCorba(type,inport->edGetType()))
     {
-      //les types sont convertibles
+      //ouport data can be converted to inport data type
       return new CorbaCorba(inport);
     }
-  //les types sont non convertibles
+  //outport data can not be converted
   stringstream msg;
-  msg << "Cannot connect 2 CorbaPort with non convertible types: " ;
-  msg << type->id() << " != " << inport->type()->id();
+  msg << "Cannot connect Corba output port with type: " << type->id() ;
+  msg << " to CORBA input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
   throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant CORBA pour un port sortant Python
+//! Adapt a CORBA input port to a Python output port 
 /*!
  *   \param inport : input port to adapt to Python type type
- *   \param type : le type supporté par le port sortant
- *   \return an input port of Python type InputPyPort
+ *   \param type : outport data type 
+ *   \return an adaptator port of type InputPyPort 
  */
 
 InputPort* RuntimeSALOME::adaptCorbaToPython(InputCorbaPort* inport,
-                                            TypeCode * type) throw (ConversionException)
+                                             TypeCode * type)
 {
-  if(inport->type()->kind() == Double)
+  if(inport->edGetType()->kind() == Double)
+    {
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))return new PyCorbaDouble(inport);
+    }
+  else if(inport->edGetType()->kind() == Int)
+    {
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))return new PyCorbaInt(inport);
+    }
+  else if(inport->edGetType()->kind() == String)
     {
-      if(isAdaptableCorbaPyObject(type,inport->type()))return new PyCorbaDouble(inport);
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))return new PyCorbaString(inport);
     }
-  else if(inport->type()->kind() == Int)
+  else if(inport->edGetType()->kind() == Bool)
     {
-      if(isAdaptableCorbaPyObject(type,inport->type()))return new PyCorbaInt(inport);
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))return new PyCorbaBool(inport);
     }
-  else if(inport->type()->kind() == String)
+  else if(inport->edGetType()->kind() == Objref )
     {
-      if(isAdaptableCorbaPyObject(type,inport->type()))return new PyCorbaString(inport);
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))
+        {
+          return new PyCorbaObjref(inport);
+        }
+      else
+        {
+          stringstream msg;
+          msg << "Cannot connect Python output port with type: " << type->id() ;
+          msg << " to CORBA input port " << inport->getName() << " with incompatible objref type: " << inport->edGetType()->id();
+          msg << " (" << __FILE__ << ":" <<__LINE__ << ")";
+          throw ConversionException(msg.str());
+        }
     }
-  else if(inport->type()->kind() == Objref )
+  else if(inport->edGetType()->kind() == Sequence)
     {
-      if(isAdaptableCorbaPyObject(type,inport->type()))
-       {
-         return new PyCorbaObjref(inport);
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))
+        {
+          return new PyCorbaSequence(inport);
         }
       else
-       {
-         stringstream msg;
-         msg << "Cannot connect InputPyPort : incompatible objref types ";
-         msg << __FILE__ << ":" <<__LINE__;
-         throw ConversionException(msg.str());
+        {
+          stringstream msg;
+          msg << "Cannot convert this sequence type " ;
+          msg << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
         }
     }
-  else if(inport->type()->kind() == Sequence)
+  else if(inport->edGetType()->kind() == YACS::ENGINE::Struct)
     {
-      if(isAdaptableCorbaPyObject(type,inport->type()))
-       {
-         return new PyCorbaSequence(inport);
+      if(isAdaptableCorbaPyObject(type,inport->edGetType()))
+        {
+          return new PyCorbaStruct(inport);
         }
       else
-       {
-         stringstream msg;
-         msg << "Cannot convert this sequence type " ;
-         msg << __FILE__ << ":" <<__LINE__;
-         throw ConversionException(msg.str());
+        {
+          stringstream msg;
+          msg << "Cannot convert this struct type " << type->id() << " to " << inport->edGetType()->id();
+          msg << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
         }
     }
-  // Adaptation not found
+  // Adaptation not possible
   stringstream msg;
-  msg << "Cannot connect InputCorbaPort to Python output " ;
-  msg << __FILE__ << ":" <<__LINE__;
+  msg << "Cannot connect Python output port with type: " << type->id() ;
+  msg << " to CORBA input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
   throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant CORBA pour un port sortant C++
+//! Adapt a CORBA input port to connect it to a XML output port 
+/*!
+ *   \param inport : input port to adapt to Xml type type
+ *   \param type : type supported by output port
+ *   \return an adaptator port of type InputXmlPort 
+ */
+
+InputPort* RuntimeSALOME::adaptCorbaToXml(InputCorbaPort* inport,
+                                          TypeCode * type)
+{
+  // BEWARE : using the generic check
+  if(inport->edGetType()->isAdaptable(type))
+    {
+      //output type is convertible to input type
+      return new XmlCorba(inport);
+    }
+  //output type is not convertible
+  stringstream msg;
+  msg << "Cannot connect Xml output port with type: " << type->id() ;
+  msg << " to Corba input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a CORBA input port to a C++ output port 
 /*!
  *   \param inport : input port to adapt to C++ type type
- *   \param type : le type supporté par le port sortant
+ *   \param type : outport data type 
+ *   \return an adaptator port of type InputCPPPort 
  */
 
 InputPort* RuntimeSALOME::adaptCorbaToCpp(InputCorbaPort* inport,
-                                         TypeCode * type) throw (ConversionException)
+                                          TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCorbaToCpp(InputCorbaPort* inport" );
+  if(isAdaptableCorbaCpp(type,inport->edGetType()))
+    {
+      //output type is convertible to input type
+      return new CppCorba(inport);
+    }
+  //output type is not convertible
+  stringstream msg;
+  msg << "Cannot connect Cpp output port with type: " << type->id() ;
+  msg << " to Corba input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a CORBA input port to a neutral data 
+/*!
+ *   \param inport : InputPort to adapt to Neutral type type
+ *   \param type : outport data type 
+ *   \return an adaptator port of type Neutralxxxx
+ */
+
+InputPort* RuntimeSALOME::adaptCorbaToNeutral(InputCorbaPort* inport,
+                                              TypeCode * type)
 {
-  throw ConversionException("Cannot connect InputCorbaPort to C++ ");
+  if(inport->edGetType()->kind() == Double)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType()))return new NeutralCorbaDouble(inport);
+    }
+  else if(inport->edGetType()->kind() == Int)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType()))return new NeutralCorbaInt(inport);
+    }
+  else if(inport->edGetType()->kind() == String)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType())) return new NeutralCorbaString(inport);
+    }
+  else if(inport->edGetType()->kind() == Bool)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType()))return new NeutralCorbaBool(inport);
+    }
+  else if(inport->edGetType()->kind() == Objref)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType())) return new NeutralCorbaObjref(inport);
+    }
+  else if(inport->edGetType()->kind() == Sequence)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType()))
+        return new NeutralCorbaSequence(inport);
+      else
+        {
+          stringstream msg;
+          msg << "Cannot convert this sequence type " ;
+          msg << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
+        }
+    }
+  else if(inport->edGetType()->kind() == Struct)
+    {
+      if(isAdaptableCorbaNeutral(type,inport->edGetType())) return new NeutralCorbaStruct(inport);
+    }
+
+  // Adaptation not possible
+  stringstream msg;
+  msg << "Cannot connect Neutral output port with type: " << type->id() ;
+  msg << " to Corba input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant CORBA pour un port sortant dont l'implémentation est donnée par impl
+//! Adapt a CORBA input port to an output which implementation and type are given by impl and type
 /*!
  *   \param source : input port to adapt to implementation impl and type type
  *   \param impl : output port implementation (C++, Python or Corba)
- *   \param type : le type supporté par le port sortant
+ *   \param type : outport data type 
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return an adaptator port which type depends on impl
  */
 
 InputPort* RuntimeSALOME::adapt(InputCorbaPort* source,
-                               const string& impl,
-                               TypeCode * type) throw (ConversionException)
+                                const std::string& impl,
+                                TypeCode * type,bool init)
 {
-  cerr<<"RuntimeSALOME::adapt(InputPyPort* source" << endl;
-  if(impl == "CPP")
+  if(impl == CppNode::IMPL_NAME)
     {
       return adaptCorbaToCpp(source,type);
     }
-  else if(impl == "Python")
+  else if(impl == PythonNode::IMPL_NAME)
     {
       return adaptCorbaToPython(source,type);
     }
-  else if(impl == "CORBA")
+  else if(impl == CORBANode::IMPL_NAME)
     {
-      return adaptCorbaToCorba(source,type);
+      if(init)
+        return adaptCorbaToCorba(source,type);
+      else
+        return adaptCorbaToCorba(source,type);
     }
-  else if(impl == "XML")
+  else if(impl == XmlNode::IMPL_NAME )
     {
       return adaptCorbaToXml(source,type);
     }
-   else
+  else if(impl == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
+    {
+      return adaptCorbaToNeutral(source,type);
+    }
+  else
     {
       stringstream msg;
       msg << "Cannot connect InputCorbaPort : unknown implementation " ;
       msg << __FILE__ << ":" <<__LINE__;
       throw ConversionException(msg.str());
     }
-  return source;
 }
 
-//! Retourne un adaptateur d'un port entrant Python pour un port sortant Python
+//! Adapt a Python input port to a Python output port
 /*!
- * Dans ce cas, on ne fait pas de conversion ni de cast (int->double, par ex).
- * On vérifie simplement que la connexion est autorisée.
+ * No need to make conversion or cast. 
+ * Only check, it's possible.
  *   \param inport : InputPort to adapt to Python type type
- *   \param type : le TypeCode supporté par le port sortant
- *   \return       InputPort de type Python (InputPyPort)
+ *   \param type : outport data type 
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return an adaptator port of type InputPyPort 
  */
 
 InputPort* RuntimeSALOME::adaptPythonToPython(InputPyPort* inport,
-                                             TypeCode * type) throw (ConversionException)
+                                              TypeCode * type,bool init)
 {
-  if(isAdaptablePyObjectPyObject(type,inport->type()))
+  if(init)
+    return new PyInit(inport);
+
+  if(isAdaptablePyObjectPyObject(type,inport->edGetType()))
     {
-      //les types sont convertibles
-      //En Python, il n'est pas nécessaire de convertir. La conversion
-      //sera faite à la volée dans l'interpréteur
-      return inport;
+      //output data is convertible to input type
+      //With python, no need to convert. Conversion will be done automatically
+      //by the interpreter
+      return new ProxyPort(inport);
     }
-  //les types sont non convertibles
+  //output data is not convertible to input type
   stringstream msg;
-  msg << "Cannot connect 2 Python Port with non convertible types: " ;
-  msg << type->id() << " != " << inport->type()->id();
+  msg << "Cannot connect Python output port with type: " << type->id() ;
+  msg << " to Python input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
   throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant Python pour un port sortant C++
+//! Adapt a Python input port to a C++ output port
 /*!
- * Pas encore implémenté
  *   \param inport : InputPort to adapt to C++ type type
- *   \param type : le TypeCode supporté par le port sortant
- *   \return       InputPort de type C++ (InputCppPort)
+ *   \param type : outport data type 
+ *   \return an adaptator port of C++ type (InputCppPort)
  */
 
 InputPort* RuntimeSALOME::adaptPythonToCpp(InputPyPort* inport,
-                                          TypeCode * type) throw (ConversionException)
+                                           TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptPythonToCpp(InputPyPort* inport" );
+  if(isAdaptablePyObjectCpp(type,inport->edGetType()))
+    {
+      //output type is convertible to input type
+      return new CppPy(inport);
+    }
+  //output type is not convertible
+  stringstream msg;
+  msg << "Cannot connect Cpp output port with type: " << type->id() ;
+  msg << " to Python input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a Python input port to a Neutral data port
+/*!
+ *   \param inport : InputPort to adapt to Neutral type type
+ *   \param type : outport data type 
+ *   \return an adaptator port of Neutral type (Neutralxxxx)
+ */
+
+InputPort* RuntimeSALOME::adaptPythonToNeutral(InputPyPort* inport,
+                                               TypeCode * type)
 {
-  throw ConversionException("Cannot connect InputPyPort to C++ ");
+  if(inport->edGetType()->kind() == Double)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))return new NeutralPyDouble(inport);
+    }
+  else if(inport->edGetType()->kind() == Int)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))return new NeutralPyInt(inport);
+    }
+  else if(inport->edGetType()->kind() == String)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))return new NeutralPyString(inport);
+    }
+  else if(inport->edGetType()->kind() == Bool)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))return new NeutralPyBool(inport);
+    }
+  else if(inport->edGetType()->kind() == Objref)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))return new NeutralPyObjref(inport);
+    }
+  else if(inport->edGetType()->kind() == Sequence)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType()))
+        return new NeutralPySequence(inport);
+      else
+        {
+          stringstream msg;
+          msg << "Cannot convert this sequence type " ;
+          msg << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
+        }
+    }
+  else if(inport->edGetType()->kind() == Struct)
+    {
+      if(isAdaptablePyObjectNeutral(type,inport->edGetType())) return new NeutralPyStruct(inport);
+    }
+
+  // Adaptation not possible
+  stringstream msg;
+  msg << "Cannot connect Neutral output port with type: " << type->id() ;
+  msg << " to Python input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant Python pour un port sortant Corba
+//! Adapt a Python input port to a Corba output port
 /*!
- * On convertit dans tous les cas
+ * Always convert the data
  *   \param inport : InputPort to adapt to Corba type type
- *   \param type : le TypeCode supporté par le port sortant
- *   \return       InputPort de type Corba (InputCorbaPort)
+ *   \param type : outport data type 
+ *   \return an adaptator port of Corba type (InputCorbaPort)
  */
 
 InputPort* RuntimeSALOME::adaptPythonToCorba(InputPyPort* inport,
-                                            TypeCode * type) throw (ConversionException)
+                                             TypeCode * type)
 {
-  cerr << "RuntimeSALOME::adaptPythonToCorba:" ;
-  cerr << inport->type()->kind() << ":" << type->kind()<< endl;
-
-  if(inport->type()->kind() == Double)
+  if(inport->edGetType()->kind() == Double)
+    {
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))return new CorbaPyDouble(inport);
+    }
+  else if(inport->edGetType()->kind() == Int)
     {
-      if(isAdaptablePyObjectCorba(type,inport->type()))return new CorbaPyDouble(inport);
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))return new CorbaPyInt(inport);
     }
-  else if(inport->type()->kind() == Int)
+  else if(inport->edGetType()->kind() == String)
     {
-      if(isAdaptablePyObjectCorba(type,inport->type()))return new CorbaPyInt(inport);
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))return new CorbaPyString(inport);
     }
-  else if(inport->type()->kind() == String)
+  else if(inport->edGetType()->kind() == Bool)
     {
-      if(isAdaptablePyObjectCorba(type,inport->type()))return new CorbaPyString(inport);
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))return new CorbaPyBool(inport);
     }
-  else if(inport->type()->kind() == Objref)
+  else if(inport->edGetType()->kind() == Objref)
     {
-      if(isAdaptablePyObjectCorba(type,inport->type()))
-       {
-         return new CorbaPyObjref(inport);
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))
+        {
+          return new CorbaPyObjref(inport);
         }
       else
-       {
-         stringstream msg;
-         msg << "Cannot connect InputCorbaPort : incompatible objref types ";
-         msg << __FILE__ << ":" <<__LINE__;
-         throw ConversionException(msg.str());
+        {
+          stringstream msg;
+          msg << "Cannot connect InputCorbaPort : incompatible objref types " << type->id() << " " << inport->edGetType()->id();
+          msg << " " << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
         }
     }
-  else if(inport->type()->kind() == Sequence)
+  else if(inport->edGetType()->kind() == Sequence)
     {
-      if(isAdaptablePyObjectCorba(type,inport->type()))
-       {
-         return new CorbaPySequence(inport);
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))
+        {
+          return new CorbaPySequence(inport);
         }
       else
-       {
-         stringstream msg;
-         msg << "Cannot convert this sequence type " ;
-         msg << __FILE__ << ":" <<__LINE__;
-         throw ConversionException(msg.str());
+        {
+          stringstream msg;
+          msg << "Cannot convert this sequence type " ;
+          msg << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
         }
     }
-  // Adaptation not found
+  else if(inport->edGetType()->kind() == YACS::ENGINE::Struct)
+    {
+      if(isAdaptablePyObjectCorba(type,inport->edGetType()))
+        {
+          return new CorbaPyStruct(inport);
+        }
+      else
+        {
+          stringstream msg;
+          msg << "Cannot convert this struct type " << type->id() << " to " << inport->edGetType()->id();
+          msg << " " << __FILE__ << ":" <<__LINE__;
+          throw ConversionException(msg.str());
+        }
+    }
+  // Adaptation not possible
   stringstream msg;
-  msg << "Cannot connect InputPyPort to Corba output " ;
-  msg <<  __FILE__ << ":" << __LINE__;
+  msg << "Cannot connect Corba output port with type: " << type->id() ;
+  msg << " to Python input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg << " ("__FILE__ << ":" << __LINE__ << ")";
+#endif
   throw ConversionException(msg.str());
 }
 
-//! Retourne un adaptateur d'un port entrant Python pour un port sortant dont l'implémentation est donnée par impl
+//! Adapt a Python input port to a Xml output port 
+/*!
+ *   \param inport : input port to adapt to Xml type type
+ *   \param type : output port type
+ *   \return an input port of type InputXmlPort
+ */
+
+InputPort* RuntimeSALOME::adaptPythonToXml(InputPyPort* inport,
+                                          TypeCode * type)
+{
+  // BEWARE : using the generic check
+  if(inport->edGetType()->isAdaptable(type))
+    {
+      //convertible type
+      return new XmlPython(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Xml output port with type: " << type->id() ;
+  msg << " to Python input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a Python input port to an output port with a given implementation
 /*!
  *   \param source : input port to adapt to implementation impl and type type
  *   \param impl : output port implementation (C++, Python or Corba)
- *   \param type : le type supporté par le port sortant
- *   \return input port adapté à l'implémentation
+ *   \param type : output port type
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return     adaptated input port
  */
 
 InputPort* RuntimeSALOME::adapt(InputPyPort* source,
-                               const string& impl,
-                               TypeCode * type) throw (ConversionException)
+                                const std::string& impl,
+                                TypeCode * type,bool init)
 {
-  cerr<<"RuntimeSALOME::adapt(InputPyPort* source" << endl;
-  if(impl == "CPP")
+  if(impl == CppNode::IMPL_NAME)
     {
       return adaptPythonToCpp(source,type);
     }
-  else if(impl == "Python")
+  else if(impl == PythonNode::IMPL_NAME)
     {
-      return adaptPythonToPython(source,type);
+      return adaptPythonToPython(source,type,init);
     }
-  else if(impl == "CORBA")
+  else if(impl == CORBANode::IMPL_NAME)
     {
       return adaptPythonToCorba(source,type);
     }
+  else if(impl == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
+    {
+      return adaptPythonToNeutral(source,type);
+    }
+  else if(impl == XmlNode::IMPL_NAME)
+    {
+      return adaptPythonToXml(source,type);
+    }
   else
     {
-      throw ConversionException("Cannot connect InputPyPort : unknown implementation  ");
+      stringstream msg;
+      msg << "Cannot connect InputPyPort : unknown implementation " << impl;
+      msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+      throw ConversionException(msg.str());
+    }
+}
+
+
+//! Adapt a C++ input port to connect it to a CORBA output port
+/*!
+ *   \param inport : input port to adapt to CORBA type type
+ *   \param type : type supported by output port
+ *   \return an adaptator port of type InputCorbaPort
+ */
+
+InputPort* RuntimeSALOME::adaptCppToCorba(InputCppPort* inport,
+                                          TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCppToCorba(InputCppPort* inport)");
+  if(isAdaptableCppCorba(type,inport->edGetType()))
+    {
+      //output type is convertible to input type
+      return new CorbaCpp(inport);
+    }
+  //output type is not convertible
+  stringstream msg;
+  msg << "Cannot connect Corba output port with type: " << type->id() ;
+  msg << " to Cpp input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a C++ input port to a Python output port
+/*!
+ *   \param inport : input port to adapt to Python type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
+ */
+InputPort* RuntimeSALOME::adaptCppToPython(InputCppPort* inport,
+                      TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCppToPython(InputCppPort* inport)");
+  if(isAdaptableCppPyObject(type,inport->edGetType()))
+    {
+      //output type is convertible to input type
+      return new PyCpp(inport);
+    }
+  //output type is not convertible
+  stringstream msg;
+  msg << "Cannot connect Python output port with type: " << type->id() ;
+  msg << " to Cpp input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a C++ input port to a C++ output port
+/*!
+ *   \param inport : input port to adapt to C++ type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
+ */
+InputPort* RuntimeSALOME::adaptCppToCpp(InputCppPort* inport,
+                      TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCppToCpp(InputPort* inport" );
+  DEBTRACE(type->kind() << "   " << inport->edGetType()->kind() );
+  if(type->isAdaptable(inport->edGetType()))
+    {
+      //the output data is convertible to inport type
+      return new CppCpp(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Cpp output port with type: " << type->id() ;
+  msg << " to Cpp input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+//! Adapt a C++ input port to a Neutral output port
+/*!
+ *   \param inport : input port to adapt to C++ type type
+ *   \param type : output port type
+ *   \return an adaptated input port of type InputPyPort
+ */
+InputPort* RuntimeSALOME::adaptCppToNeutral(InputCppPort* inport,
+                      TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCppToNeutral(InputPort* inport" );
+  DEBTRACE(type->kind() << "   " << inport->edGetType()->kind() );
+  if(type->isAdaptable(inport->edGetType()))
+    {
+      //the output data is convertible to inport type
+      return new NeutralCpp(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Neutral output port with type: " << type->id() ;
+  msg << " to Cpp input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+  throw ConversionException(msg.str());
+}
+
+InputPort* RuntimeSALOME::adaptCppToXml(InputCppPort* inport,
+                      TypeCode * type)
+{
+  DEBTRACE("RuntimeSALOME::adaptCppToXml(InputCppPort* inport" );
+  if(isAdaptableCppXml(type,inport->edGetType()))
+    {
+      //convertible type
+      return new XmlCpp(inport);
+    }
+  //non convertible type
+  stringstream msg;
+  msg << "Cannot connect Xml output port with type: " << type->id() ;
+  msg << " to Cpp input port " << inport->getName() << " with type: " << inport->edGetType()->id();
+#ifdef _DEVDEBUG_
+  msg <<  " ("<<__FILE__ << ":" << __LINE__<<")";
+#endif
+   throw ConversionException(msg.str());
+}
+
+//! Adapt a C++ input port to connect it to an output port with a given implementation
+/*!
+ *   \param source : input port to adapt to implementation impl and type type
+ *   \param impl : output port implementation (C++, Python or Corba)
+ *   \param type : output port supported type
+ *   \param init : if init is true the proxy port will be used in initialization of input port (needs value check)
+ *   \return       the adaptated port
+ */
+
+InputPort* RuntimeSALOME::adapt(InputCppPort* source,
+                                const std::string& impl,
+                                TypeCode * type,bool init)
+{
+  DEBTRACE("RuntimeSALOME::adapt(InputCppPort* source)");
+  if(impl == CORBANode::IMPL_NAME)
+    {
+      return adaptCppToCorba(source,type);
+    }
+  else if(impl == PythonNode::IMPL_NAME)
+    {
+      return adaptCppToPython(source,type);
+    }
+  else if(impl == XmlNode::IMPL_NAME)
+    {
+      return adaptCppToXml(source,type);
+    }
+  else if(impl == CppNode::IMPL_NAME)
+    {
+      return adaptCppToCpp(source, type);
+    }
+  else if(impl == Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME)
+    {
+      return adaptCppToNeutral(source, type);
+    }
+  else
+    {
+      stringstream msg;
+      msg << "Cannot connect InputCppPort to " << impl << " implementation";
+      msg << " (" << __FILE__ << ":" << __LINE__ << ")";
+      throw ConversionException(msg.str());
     }
 }
 
 // bool RuntimeSALOME::isCompatible(const OutputPort* outputPort, 
-//                              const InputPort*  inputPort)
+//                               const InputPort*  inputPort)
 // {
 //   bool result=true;
 //   return result;
 // }
 
-CORBA::ORB_ptr RuntimeSALOME::getOrb()
+CORBA::ORB_ptr RuntimeSALOME::getOrb() const
 {
   return _orb;
 }
 
-PyObject * RuntimeSALOME::getPyOrb()
+PyObject * RuntimeSALOME::getPyOrb() const
 {
   return _pyorb;
 }
 
-PyObject * RuntimeSALOME::getBuiltins()
+PyObject * RuntimeSALOME::getBuiltins() const
 {
   return _bltins;
 }
 
-DynamicAny::DynAnyFactory_ptr RuntimeSALOME::getDynFactory()
+DynamicAny::DynAnyFactory_ptr RuntimeSALOME::getDynFactory() const
 {
   return _dynFactory;
 }
 
+PyObject * RuntimeSALOME::get_omnipy()
+{
+  return _omnipy;
+}
+
 omniORBpyAPI* RuntimeSALOME::getApi()
 {
   return _api;
 }
 
+void* RuntimeSALOME::convertNeutral(TypeCode * type, Any *data)
+{
+  if(data)
+    return (void *)convertNeutralPyObject(type,data);
+  else
+    {
+      Py_INCREF(Py_None);
+      return (void *)Py_None;
+    }
+}
+
+std::string RuntimeSALOME::convertNeutralAsString(TypeCode * type, Any *data)
+{
+  PyObject* ob;
+  if(data)
+    {
+      // The call to PyGILState_Ensure was moved here because there was also
+      // a crash when calling convertNeutralPyObject with a sequence of pyobj.
+      // see also the comment below.
+      PyGILState_STATE gstate = PyGILState_Ensure();
+      ob=convertNeutralPyObject(type,data);
+      std::string s=convertPyObjectToString(ob);
+
+      // Note (Renaud Barate, 8 jan 2013): With Python 2.7, this call to Py_DECREF causes a crash
+      // (SIGSEGV) when ob is a sequence and the call is not protected with the global interpreter
+      // lock. I thus added the call to PyGILState_Ensure / PyGILState_Release. It worked fine in
+      // Python 2.6 without this call. If anyone finds the real reason of this bug and another fix,
+      // feel free to change this code.
+      //PyGILState_STATE gstate = PyGILState_Ensure();
+      Py_DECREF(ob);
+      PyGILState_Release(gstate);
+      return s;
+    }
+  else
+    {
+      return "None";
+    }
+}
+
+std::string RuntimeSALOME::convertPyObjectToString(PyObject* ob)
+{
+  return YACS::ENGINE::convertPyObjectToString(ob);
+}
+
+PyObject* RuntimeSALOME::convertStringToPyObject(const std::string& s)
+{
+  PyObject *mainmod;
+  PyObject *globals;
+  PyObject* ob;
+  PyGILState_STATE gstate = PyGILState_Ensure();
+  mainmod = PyImport_AddModule("__main__");
+  globals = PyModule_GetDict(mainmod);
+  PyObject* d = PyDict_New();
+  //PyDict_SetItemString(d, "__builtins__", PyEval_GetBuiltins());
+  ob= PyRun_String( s.c_str(), Py_eval_input, globals, d);
+  Py_DECREF(d);
+  if(ob==NULL)
+    {
+      //exception
+      std::string error;
+      PyObject* new_stderr = newPyStdOut(error);
+      PySys_SetObject((char *)"stderr", new_stderr);
+      PyErr_Print();
+      PySys_SetObject((char *)"stderr", PySys_GetObject((char *)"__stderr__"));
+      Py_DECREF(new_stderr);
+      PyGILState_Release(gstate);
+      throw Exception(error);
+    }
+  PyGILState_Release(gstate);
+  return ob;
+}