remove salome in tool path

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68ff208118a09f34d55303b731fe64ac738f85dc..d1f2b5a22e10577003e85e2bb372bda648862226 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,9 +40,10 @@ endif(NOT PYTHONINTERP_FOUND)
 set(ADAO_SCRIPT_PYTHON "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
 set(ADAO_SCRIPT_PYTHON_SALOME "${ADAO_SCRIPT_PYTHON}/salome")
 set(ADAO_LIB "lib/salome")
-set(ADAO_RES "share/salome/resources/adao")
-set(ADAO_BIN "bin/salome")
-set(ADAO_BIN_TEST "bin/salome/test")
+set(ADAO_RES "share/resources/adao")
+set(ADAO_RES_SALOME "share/salome/resources/adao")
+set(ADAO_BIN "bin")
+set(ADAO_BIN_TEST "bin/test")
 
 set(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
 if(EXISTS ${CONFIGURATION_ROOT_DIR})

diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py
index 2a914d71806bc968c11a080cfb256b2fe758cf08..b22e5946b5ab0a6a2c555113c9cc39b5d78b6496 100644 (file)
--- a/bin/AdaoYacsSchemaCreator.py
+++ b/bin/AdaoYacsSchemaCreator.py
@@ -31,8 +31,8 @@ logging.basicConfig(level=logging.WARNING, format='%(levelname)-8s %(message)s')
 logging.debug("-- Starting AdaoYacsSchemaCreator --")
 
 # Check some basics variables
-if "ADAO_ROOT_DIR" not in os.environ:
-    logging.fatal("You have to define ADAO_ROOT_DIR")
+if "ADAO_ENGINE_ROOT_DIR" not in os.environ:
+    logging.fatal("You have to define ADAO_ENGINE_ROOT_DIR")
     sys.exit(1)
 
 try:

diff --git a/bin/qtEficas_adao_study.py.in b/bin/qtEficas_adao_study.py.in
index c405979a93bf233b83d6e416f55c167dafee7514..6f97f4104260561194c8c08990d1aeddcaa7aa23 100644 (file)
--- a/bin/qtEficas_adao_study.py.in
+++ b/bin/qtEficas_adao_study.py.in
@@ -30,7 +30,7 @@ import sys
 # Configuration de l'installation
 INSTALLDIR = "@EFICAS_DIR@"
 sys.path.insert(0,INSTALLDIR)
-ADAO_INSTALL_DIR = "@PYTHON_SITE@/salome/adao/daEficas"
+ADAO_INSTALL_DIR = "@PYTHON_SITE@/adao/daEficas"
 sys.path.insert(0,ADAO_INSTALL_DIR)
 
 # Configuration

diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index 1a46962c5c93e0e37bc9376690269b912555fe31..ba7534364db7872b99dd9dec440d9aab6c7ccfd4 100644 (file)
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -19,7 +19,7 @@
 # Author: Anthony Geay, anthony.geay@edf.fr, EDF R&D
 
 set(DOCLANG en)
-set(DOC_DESTINATION "share/doc/salome/gui/ADAO/${DOCLANG}")
+set(DOC_DESTINATION "share/doc/gui/ADAO/${DOCLANG}")
 
 file(GLOB_RECURSE BEAUTIFUL_PNGS "${CMAKE_SOURCE_DIR}/doc/${DOCLANG}/*.png")
 install(FILES ${BEAUTIFUL_PNGS} DESTINATION ${ADAO_RES})

diff --git a/doc/en/advanced.rst b/doc/en/advanced.rst
index d4e31fa5494b3d43e17741ee556934f38f9d63d6..1a9adafbf27de74eed0257292733d06a04a45ba1 100644 (file)
--- a/doc/en/advanced.rst
+++ b/doc/en/advanced.rst
@@ -120,7 +120,7 @@ following Shell script::
     else
       SALOMEDIR="<SALOME main installation directory>"
       $SALOMEDIR/salome start -k -t
-      $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py $USERFILE.py $USERFILE.xml"
+      $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/AdaoYacsSchemaCreator.py $USERFILE.py $USERFILE.xml"
       $SALOMEDIR/salome shell -- "driver $USERFILE.xml"
       $SALOMEDIR/salome shell killSalome.py
       rm -f $USERFILE.xml

diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
index 5e8476ef897fd4c987f5290d480b0dfaaaf54f3d..06adef6ba86c94865fb906736cb0315851d35f59 100644 (file)
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -19,7 +19,7 @@
 # Author: Anthony Geay, anthony.geay@edf.fr, EDF R&D
 
 set(DOCLANG fr)
-set(DOC_DESTINATION "share/doc/salome/gui/ADAO/${DOCLANG}")
+set(DOC_DESTINATION "share/doc/gui/ADAO/${DOCLANG}")
 
 file(GLOB_RECURSE BEAUTIFUL_PNGS "${CMAKE_SOURCE_DIR}/doc/${DOCLANG}/*.png")
 install(FILES ${BEAUTIFUL_PNGS} DESTINATION ${ADAO_RES})

diff --git a/doc/fr/advanced.rst b/doc/fr/advanced.rst
index c3b056f64bca9b95c4ef62b83517c84081d6d535..d61052f7d0e6589258e20e77dcb1d63f361f1eab 100644 (file)
--- a/doc/fr/advanced.rst
+++ b/doc/fr/advanced.rst
@@ -126,7 +126,7 @@ SALOME>``, il suffit d'enregistrer le script de commandes Shell suivant::
     else
       SALOMEDIR="<Répertoire principal d'installation de SALOME>"
       $SALOMEDIR/salome start -k -t
-      $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py $USERFILE.py $USERFILE.xml"
+      $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/AdaoYacsSchemaCreator.py $USERFILE.py $USERFILE.xml"
       $SALOMEDIR/salome shell -- "driver $USERFILE.xml"
       $SALOMEDIR/salome shell killSalome.py
       rm -f $USERFILE.xml

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index efa70f472459405b51d5ffad836f0db1e514a479..96444294eb605cb5aac2d269dab195abeac0f3d1 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -64,7 +64,7 @@ set(EXAMPLES_FILES_TO_INSTALL
   daSalome/test010_ADAO_Simple_AdjointTest.py
   )
 
-install(FILES ${EXAMPLES_FILES_TO_INSTALL} DESTINATION "share/salome/adao_examples/daSalome")
+install(FILES ${EXAMPLES_FILES_TO_INSTALL} DESTINATION "share/adao_examples/daSalome")
 
 SALOME_CONFIGURE_FILE(daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in ADAO_Case.comm)
 
@@ -81,4 +81,4 @@ set(SKELETON_FILES_TO_INSTALL
   daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py
   )
 
-install(FILES ${SKELETON_FILES_TO_INSTALL} DESTINATION "share/salome/adao_examples/daSkeletons/External_data_definition_by_scripts")
+install(FILES ${SKELETON_FILES_TO_INSTALL} DESTINATION "share/adao_examples/daSkeletons/External_data_definition_by_scripts")

diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
index 6aa71852ab6c359b41c1075f5b1fe8ad7e721a42..7ab0c5a32d4cabcf90706c633975ea442f9f39b6 100644 (file)
--- a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
+++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
+                   StudyRepertory='@prefix@/share/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
                    Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',

diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
index 76ec3aa66591411c82316c2bf4af2dc9aafa8f28..09792ad2ded4c5efc695e8f97b8938a4c54b9fc9 100644 (file)
--- a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
@@ -37,7 +37,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy

diff --git a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
index 04e4f70c81b4c100ea0b95c679f74f5a69c95474..e6fa6fb204676a9030ba941192d99374d9d72e5b 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
+++ b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
+                   StudyRepertory='@prefix@/share/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
                    Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',

diff --git a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
index ee7b68fceb364d82a035bd325e865b4493f57759..803a1bf949b7628878988e5a54ed2e54a47cbe00 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
+++ b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
@@ -37,7 +37,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy

diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
index d4393708cae6b583936c0d738faac2474b5d6c4c..761c96bc6bee49383ad3ef0c98a0b7a65da3be80 100644 (file)
--- a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
+++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
+                   StudyRepertory='@prefix@/share/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='Blue',),
                    Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',

diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
index e164ff89832ca2a6c1267f752e3ccad88f49618d..6d3dcd98a5339d99a26885b39f469b0ee02a5e75 100644 (file)
--- a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
@@ -37,7 +37,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy

diff --git a/examples/daSalome/test005_ADAO_Operators.comm.in b/examples/daSalome/test005_ADAO_Operators.comm.in
index 06b365cee102323b98f64fa160b95909c5127fc0..45ceacb817d4e2c329e652ba47f2731d661d01ae 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.comm.in
+++ b/examples/daSalome/test005_ADAO_Operators.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
+                   StudyRepertory='@prefix@/share/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
                    Background=_F(Stored=1,
                                  INPUT_TYPE='Vector',

diff --git a/examples/daSalome/test005_ADAO_Operators.py.in b/examples/daSalome/test005_ADAO_Operators.py.in
index abd80e772b0fc576d6e3207a3db61bc0dd5f53e5..641a7558cd6e32d395bb270a1a85f79fe9bae799 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.py.in
+++ b/examples/daSalome/test005_ADAO_Operators.py.in
@@ -47,7 +47,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy

diff --git a/examples/daSalome/test006_Observers.comm.in b/examples/daSalome/test006_Observers.comm.in
index cb9790776822593f48971cd95f2d38852e68fbdf..976f34bc99dbf3189ad4a5302b17ef6bd9b93aa2 100644 (file)
--- a/examples/daSalome/test006_Observers.comm.in
+++ b/examples/daSalome/test006_Observers.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='test_observers',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
+                   StudyRepertory='@prefix@/share/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',
                                           Parameters='Dict',
                                           data=_F(FROM='Script',

diff --git a/examples/daSalome/test006_Observers.py.in b/examples/daSalome/test006_Observers.py.in
index fb7aaaf32be86a91ac983eb7b758c20c4ab983fe..b27603c49ce1e93ad0da1cdafe7ea016b2b6395f 100644 (file)
--- a/examples/daSalome/test006_Observers.py.in
+++ b/examples/daSalome/test006_Observers.py.in
@@ -48,7 +48,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in
index 0cb2e122807241ab70f1fbf760b3aa54b5c206f1..bc02c7824d9f6d718e660e1973a7211c5993757a 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in
+++ b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in
@@ -1,6 +1,6 @@
 
 ASSIMILATION_STUDY(StudyName='ADAO skeleton case',
-                   StudyRepertory='@prefix@/share/salome/adao_examples/daSkeletons/External_data_definition_by_scripts',
+                   StudyRepertory='@prefix@/share/adao_examples/daSkeletons/External_data_definition_by_scripts',
                    AlgorithmParameters=_F(Algorithm='3DVAR',
                                        Parameters='Dict',
                                        data=_F(FROM='Script',

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.py.in b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.py.in
index 223111bdd5e305e4a6cc5eef89cbd60998fca235..23d94457b26d8a4525814130980320c19bc0903d 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.py.in
+++ b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.py.in
@@ -52,7 +52,7 @@ outputvariables_config = {}
 outputvariables_config['Order'] = ['adao_default']
 outputvariables_config['adao_default'] = -1
 study_config['OutputVariables'] = outputvariables_config
-study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSkeletons/External_data_definition_by_scripts'
+study_config['Repertory'] = '@prefix@/share/adao_examples/daSkeletons/External_data_definition_by_scripts'
 Analysis_config = {}
 Analysis_config['From'] = 'Script'
 Analysis_config['Data'] = 'Script_UserPostAnalysis.py'

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 7961ad3c4eb8bf9ec2dd876b670bf0835cd3a3fd..8b590edf19368788d25b2447c2a1fa0d3edb53c8 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -19,7 +19,7 @@
 # Author: Anthony Geay, anthony.geay@edf.fr, EDF R&D
 
 if(ADAO_SALOME_MODULE)
-  install(FILES SalomeApp.xml ADAOCatalog.xml DESTINATION ${ADAO_RES})
+  install(FILES SalomeApp.xml ADAOCatalog.xml DESTINATION ${ADAO_RES_SALOME})
 else(ADAO_SALOME_MODULE)
   install(FILES ADAOSchemaCatalog.xml DESTINATION ${ADAO_RES})
 endif(ADAO_SALOME_MODULE)

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 9ec56107a2424e09ecb1f9bbc879077114482679..f7c2917eb9be0656988aa21542bd0826bff08df9 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -32,10 +32,10 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="ADAO" value="${ADAO_ENGINE_ROOT_DIR}/share/salome/resources/adao"/>
+    <parameter name="ADAO" value="${ADAO_ENGINE_ROOT_DIR}/share/resources/adao"/>
   </section>
   <section name="adao_help">
-    <parameter name="User's Guide/%1 module/(EN) User's Guide"           value="${ADAO_ENGINE_ROOT_DIR}/share/doc/salome/gui/ADAO/en/index.html"/>
-    <parameter name="User's Guide/%1 module/(FR) Guide de l'utilisateur" value="${ADAO_ENGINE_ROOT_DIR}/share/doc/salome/gui/ADAO/fr/index.html"/>
+    <parameter name="User's Guide/%1 module/(EN) User's Guide"           value="${ADAO_ENGINE_ROOT_DIR}/share/doc/gui/ADAO/en/index.html"/>
+    <parameter name="User's Guide/%1 module/(FR) Guide de l'utilisateur" value="${ADAO_ENGINE_ROOT_DIR}/share/doc/gui/ADAO/fr/index.html"/>
   </section>
 </document>

diff --git a/src/daEficas/prefs_ADAO.py.in b/src/daEficas/prefs_ADAO.py.in
index e52a33b39a6455e9fdd2841ae1323f92e50e8c93..108d1b6a27af340ccb814ce3d0802e6b3b1fc4a4 100644 (file)
--- a/src/daEficas/prefs_ADAO.py.in
+++ b/src/daEficas/prefs_ADAO.py.in
@@ -62,7 +62,7 @@ if sys.version.split()[0] < '3':
 # Indique la langue du catalogue utilisee pour les chaines d'aide : fr ou ang
 # lang = 'fr'
 # Traduction des labels de boutons ou autres
-translatorFichier = os.environ["ADAO_ROOT_DIR"] + "/share/salome/resources/adao/adao" # Ce nom sera complete par EFICAS avec _<LANG>.qm
+translatorFichier = os.environ["ADAO_ROOT_DIR"] + "/share/resources/adao/adao" # Ce nom sera complete par EFICAS avec _<LANG>.qm
 #
 # Pilotage des sous-fenetres d'EFICAS
 closeAutreCommande = True

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index 82afbff48209abfe3ea0e4908165220db911aff5..54c1f4fd678e16a75cf9449d7a5713593eb930da 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -87,7 +87,7 @@ class AdaoCase:
       return "Please add ADAO_ENGINE_ROOT_DIR to your environnement."
 
     adao_path = os.environ["ADAO_ENGINE_ROOT_DIR"]
-    adao_exe = adao_path + "/bin/salome/AdaoYacsSchemaCreator.py"
+    adao_exe = adao_path + "/bin/AdaoYacsSchemaCreator.py"
     args = ["python", adao_exe, filename, self.yacs_filename]
     p = subprocess.Popen(args)
     (stdoutdata, stderrdata) = p.communicate()

diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py
index 09e79f6f56f4514fc2fba9bfa13a7a04616c0dae..b940789030b88a03cc6e5600cab05eb0babc19bb 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/methods.py
+++ b/src/daSalome/daYacsSchemaCreator/methods.py
@@ -56,7 +56,7 @@ def create_yacs_proc(study_config):
   l.registerProcCataLoader()
   runtime = pilot.getRuntime()
   try:
-    catalogAd = runtime.loadCatalog("proc", os.environ["ADAO_ENGINE_ROOT_DIR"] + "/share/salome/resources/adao/ADAOSchemaCatalog.xml")
+    catalogAd = runtime.loadCatalog("proc", os.environ["ADAO_ENGINE_ROOT_DIR"] + "/share/resources/adao/ADAOSchemaCatalog.xml")
     runtime.addCatalog(catalogAd)
   except:
     raise ValueError("Exception in loading ADAO YACS Schema catalog")