NRI : Rename Catalog according to rule (KERNELCatalog).

diff --git a/Makefile.in b/Makefile.in
index f337827871c47e996d30152fe3f975d00295a176..4cedeabbf0b20c618c4287f244b6af75217a9d37 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ RESOURCES_FILES = \
 back.xpm \
 cascade.png \
 CatalogDataType.xml \
-CatalogModuleGeneral.xml \
+KERNELCatalog.xml \
 CatalogRessources.xml \
 close.png \
 config \

diff --git a/bin/runSalome.in b/bin/runSalome.in
index 114fee6b402f21ddfd4819e1994dd33aa7f153de..d1a3d4bde0c5085a2e54837d7e408f23aa261dec 100644 (file)
--- a/bin/runSalome.in
+++ b/bin/runSalome.in
@@ -69,7 +69,7 @@ SALOMEDS_Server&
 
 echo "Starting SALOME_ModuleCatalog_Server -common ${SALOME_ROOT_DIR}/share/salome/resources/CatalogModuleGeneral.xml -personal ${HOME}/Salome/resources/CatalogModulePersonnel.xml"
 SALOME_ModuleCatalog_Server \
- -common ${SALOME_ROOT_DIR}/share/salome/resources/CatalogModuleGeneral.xml:\
+ -common ${KERNEL_ROOT_DIR}/share/salome/resources/KERNELCatalog.xml:\
 ${GEOM_ROOT_DIR}/share/salome/resources/GEOMCatalog.xml:\
 ${SUPERV_ROOT_DIR}/share/salome/resources/SUPERVCatalog.xml:\
 ${VISU_ROOT_DIR}/share/salome/resources/VISUCatalog.xml:\

diff --git a/resources/CatalogModuleGeneral.xml b/resources/CatalogModuleGeneral.xml
deleted file mode 100644 (file)
index d0f4b0d..0000000
--- a/resources/CatalogModuleGeneral.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='us-ascii' ?>
- 
-<!-- XML component catalog -->
-<begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Component list -->
-<component-list>
-       <component>
-               <!-- Component identification -->
-               <component-name>Salome</component-name>
-               <component-username>Salome</component-username>
-               <component-type>Other</component-type>
-               <component-author>NRI</component-author>
-               <component-version> 1.0</component-version>
-               <component-comment>GUI Neutral Context</component-comment>
-               <component-multistudy>1</component-multistudy>
-
-       <constraint>hostname = muna</constraint>
-       </component>
-</component-list>
-</begin-catalog>

diff --git a/resources/KERNELCatalog.xml b/resources/KERNELCatalog.xml
new file mode 100644 (file)
index 0000000..b704919
--- /dev/null
+++ b/resources/KERNELCatalog.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+ 
+<!-- XML component catalog -->
+<begin-catalog>
+
+<!-- Path prefix information -->
+
+<path-prefix-list>
+</path-prefix-list>
+
+<!-- Component list -->
+<component-list>
+       <component>
+               <!-- Component identification -->
+               <component-name>KERNEL</component-name>
+               <component-username>Salome</component-username>
+               <component-type>Other</component-type>
+               <component-author>NRI</component-author>
+               <component-version> 1.0</component-version>
+               <component-comment>GUI Neutral Context</component-comment>
+               <component-multistudy>1</component-multistudy>
+
+       <constraint>hostname = muna</constraint>
+       </component>
+</component-list>
+</begin-catalog>