NRI : Update OCAF resources.

diff --git a/Makefile.in b/Makefile.in
index c29f8b11d08f977d6e40700c8c95767acbfe25ea..f337827871c47e996d30152fe3f975d00295a176 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,6 @@ uc_new.png \
 uc_clear.png \
 channel.cfg \
 Plugin \
-Resources \
 SALOMEDS_Resources
 
 BIN_SCRIPT= \

diff --git a/bin/runSalome.in b/bin/runSalome.in
index 0fb4a56d8c938cdc5e66fcd5207dca48274df4d4..114fee6b402f21ddfd4819e1994dd33aa7f153de 100644 (file)
--- a/bin/runSalome.in
+++ b/bin/runSalome.in
@@ -35,21 +35,17 @@ then
   export LD_LIBRARY_PATH=$HOME/Salome/lib/salome:${LD_LIBRARY_PATH}
 fi
 
-#export ORB_ROOT_DIR=/export/home/LGLS/omni
-
-
-#PYVTK_PATH=
-#export PYTHONPATH=${PYTHONPATH}:${SALOME_ROOT_DIR}/idl:${SALOME_ROOT_DIR}/bin:${SALOME_ROOT_DIR}/lib:${PYVTK_PATH}:${EXEC_DIR}
-
-#export MICORC=/dev/null
-
-#cd ${SALOME_ROOT_DIR}/bin
-
-# OCAF
-export CSF_PluginDefaults=${SALOME_ROOT_DIR}/share/salome/resources
-export CSF_ResourcesDefaults=${SALOME_ROOT_DIR}/share/salome/resources
+# Open CASCADE Application Framework - OCAF
+export CSF_PluginDefaults=${KERNEL_ROOT_DIR}/share/salome/resources
+export CSF_SALOMEDS_ResourcesDefaults=${KERNEL_ROOT_DIR}/share/salome/resources
+#export CSF_ResourceVerbose=1
 #export CSF_RepeatServerRequest=10
 
+if test -n $GEOM_ROOT_DIR
+then
+  export CSF_GEOMDS_ResourcesDefaults=${GEOM_ROOT_DIR}/share/salome/resources
+fi
+
 export tmp=/tmp
 
 echo "runSession standalone on ${HOSTNAME}"
@@ -77,7 +73,8 @@ SALOME_ModuleCatalog_Server \
 ${GEOM_ROOT_DIR}/share/salome/resources/GEOMCatalog.xml:\
 ${SUPERV_ROOT_DIR}/share/salome/resources/SUPERVCatalog.xml:\
 ${VISU_ROOT_DIR}/share/salome/resources/VISUCatalog.xml:\
-${MED_ROOT_DIR}/share/salome/resources/MEDCatalog.xml \
+${MED_ROOT_DIR}/share/salome/resources/MEDCatalog.xml:\
+${SMESH_ROOT_DIR}/share/salome/resources/SMESHCatalog.xml \
  -personal ${HOME}/Salome/resources/CatalogModulePersonnel.xml &
 #sleep 2
 

diff --git a/resources/Resources b/resources/Resources
deleted file mode 100644 (file)
index 06f018f..0000000
--- a/resources/Resources
+++ /dev/null
@@ -1,10 +0,0 @@
-formatlist:SALOME_GEOM
-
-SALOME_GEOM.Description: GEOM Document Version 1.0
-SALOME_GEOM.FileExtension: sgd
-SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368
-SALOME_GEOM.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368
-SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368
-SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368
-SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368
-

diff --git a/resources/SALOMEDS_Resources b/resources/SALOMEDS_Resources
index 8aec5d87d81dfd2997ab4717ff3212be4e85ca16..2b8d551052eaebc28e8c0c8cc55d6febab9df672 100644 (file)
--- a/resources/SALOMEDS_Resources
+++ b/resources/SALOMEDS_Resources
@@ -1,6 +1,6 @@
 formatlist:SALOME_STUDY
 
-SALOME_STUDY.Description: Stars Document Version 1.0
+SALOME_STUDY.Description: SALOME Document Version 1.0
 SALOME_STUDY.FileExtension: std
 SALOME_STUDY.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368
 SALOME_STUDY.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368