From 5454ffd87e542e09f14742d20b0b1b5b718846be Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 22 Jan 2015 17:06:20 +0300
Subject: [PATCH] Minor correction to avoid "unknown type Object" warning from
 ModuleCatalog at YACS activation.

---
 resources/SMESHCatalog.xml.in | 342 +++++++++++++++++-----------------
 1 file changed, 172 insertions(+), 170 deletions(-)

diff --git a/resources/SMESHCatalog.xml.in b/resources/SMESHCatalog.xml.in
index cf89dd5c2..940ff02e9 100644
--- a/resources/SMESHCatalog.xml.in
+++ b/resources/SMESHCatalog.xml.in
@@ -25,175 +25,177 @@
  
 <!-- XML component catalog -->
 <begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<type-list>
-  <objref name="SMESH_Mesh" id="IDL:SMESH/SMESH_Mesh:1.0"/>
-  <objref name="SMESH_Hypothesis" id="IDL:SMESH/SMESH_Hypothesis:1.0"/>
-</type-list>
-
-<!-- Component list -->
-<component-list>
-	<component>
-		<!-- Component identification -->
-		<component-name>SMESH</component-name>
-		<component-username>Mesh</component-username>
-		<component-type>MESH</component-type>
-		<component-author>NRI</component-author>
-		<component-version>@SALOMESMESH_VERSION@</component-version>
-		<component-comment>Mesh component</component-comment>
-		<component-multistudy>1</component-multistudy>
-		<component-icone>ModuleMesh.png</component-icone>
-		<component-impltype>1</component-impltype>
-
-            <component-interface-list>
-                <component-interface-name>SMESH</component-interface-name>
-                <component-interface-comment></component-interface-comment>
-                <component-service-list>
-                    <component-service>
-                        <service-name>CreateHypothesis</service-name>
-                        <service-author></service-author>
-                        <service-version></service-version>
-                        <service-comment></service-comment>
-                        <service-by-default>1</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-type>string</inParameter-type>
-                                <inParameter-name>anHyp</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-name>studyId</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-			    <outParameter>
-                                <outParameter-type>SMESH_Hypothesis</outParameter-type>
-                                <outParameter-name>aHyp</outParameter-name>
-                                <outParameter-comment></outParameter-comment>
-			    </outParameter>
-			</outParameter-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>Init</service-name>
-                        <service-author></service-author>
-                        <service-version></service-version>
-                        <service-comment></service-comment>
-                        <service-by-default>1</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-type>GEOM_Gen</inParameter-type>
-                                <inParameter-name>geomEngine</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-name>studyId</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>GEOM_Shape</inParameter-type>
-                                <inParameter-name>aShape</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-			    <outParameter>
-				<outParameter-type>SMESH_Mesh</outParameter-type>
-				<outParameter-name>aMesh</outParameter-name>
-				<outParameter-comment></outParameter-comment>
-			    </outParameter>
-			</outParameter-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>Compute</service-name>
-                        <service-author></service-author>
-                        <service-version></service-version>
-                        <service-comment></service-comment>
-                        <service-by-default>1</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-type>SMESH_Mesh</inParameter-type>
-                                <inParameter-name>aMesh</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>GEOM_Shape</inParameter-type>
-                                <inParameter-name>aSubShape</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-type>boolean</outParameter-type>
-                                <outParameter-name>res</outParameter-name>
-                                <outParameter-comment>Result</outParameter-comment>
-                            </outParameter>
-			</outParameter-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>IsReadyToCompute</service-name>
-                        <service-author></service-author>
-                        <service-version></service-version>
-                        <service-comment></service-comment>
-                        <service-by-default>1</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-type>SMESH_Mesh</inParameter-type>
-                                <inParameter-name>aMesh</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>GEOM_Shape</inParameter-type>
-                                <inParameter-name>aSubShape</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                                <outParameter-type>boolean</outParameter-type>
-                                <outParameter-name>res</outParameter-name>
-                                <outParameter-comment>Result</outParameter-comment>
-			</outParameter-list>
-                    </component-service>
-                </component-service-list>
-                <component-interface-name>SMESH_Mesh</component-interface-name>
-                <component-interface-comment></component-interface-comment>
-                <component-service-list>
-                    <component-service>
-                        <service-name>AddHypothesis</service-name>
-                        <service-author></service-author>
-                        <service-version></service-version>
-                        <service-comment></service-comment>
-                        <service-by-default>1</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-type>GEOM_Shape</inParameter-type>
-                                <inParameter-name>aSubShape</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-type>SMESH_Hypothesis</inParameter-type>
-                                <inParameter-name>aHyp</inParameter-name>
-                                <inParameter-comment></inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-type>boolean</outParameter-type>
-                                <outParameter-name>res</outParameter-name>
-                                <outParameter-comment>Result</outParameter-comment>
-                            </outParameter>
-			</outParameter-list>
-                    </component-service>
-                </component-service-list>
-            </component-interface-list>
-	<constraint>hostname = localhost</constraint>
-	</component>
+  
+  <!-- Path prefix information -->
+  <path-prefix-list>
+  </path-prefix-list>
+  
+  <!-- SMESH data types  -->
+  <type-list>
+    <objref name="SMESH/SMESH_Mesh" id="IDL:SMESH/SMESH_Mesh:1.0"/>
+    <objref name="SMESH/SMESH_Hypothesis" id="IDL:SMESH/SMESH_Hypothesis:1.0"/>
+  </type-list>
+  
+  <!-- Component list -->
+  <component-list>
+    <component>
+      <!-- Component: SMESH -->
+      <!-- Component identification -->
+      <component-name>SMESH</component-name>
+      <component-username>Mesh</component-username>
+      <component-type>MESH</component-type>
+      <component-author>SALOME team</component-author>
+      <component-version>@SALOMESMESH_VERSION@</component-version>
+      <component-comment>Mesh component</component-comment>
+      <component-multistudy>1</component-multistudy>
+      <component-icone>ModuleMesh.png</component-icone>
+      <component-impltype>1</component-impltype>
+      <constraint></constraint>
+      
+      <!-- component interface list -->
+      <component-interface-list>
+	<component-interface-name>SMESH</component-interface-name>
+	<component-interface-comment></component-interface-comment>
+	<component-service-list>
+          <component-service>
+            <service-name>CreateHypothesis</service-name>
+            <service-author>SALOME team</service-author>
+            <service-version>@SALOMESMESH_VERSION@</service-version>
+            <service-comment></service-comment>
+            <service-by-default>0</service-by-default>
+            <inParameter-list>
+              <inParameter>
+		<inParameter-type>string</inParameter-type>
+		<inParameter-name>anHyp</inParameter-name>
+		<inParameter-comment></inParameter-comment>
+              </inParameter>
+              <inParameter>
+		<inParameter-type>long</inParameter-type>
+		<inParameter-name>studyId</inParameter-name>
+		<inParameter-comment></inParameter-comment>
+              </inParameter>
+            </inParameter-list>
+            <outParameter-list>
+	      <outParameter>
+		<outParameter-type>SMESH/SMESH_Hypothesis</outParameter-type>
+              <outParameter-name>aHyp</outParameter-name>
+              <outParameter-comment></outParameter-comment>
+	    </outParameter>
+	  </outParameter-list>
+        </component-service>
+        <component-service>
+          <service-name>Init</service-name>
+          <service-author>SALOME team</service-author>
+          <service-version>@SALOMESMESH_VERSION@</service-version>
+          <service-comment></service-comment>
+          <service-by-default>0</service-by-default>
+          <inParameter-list>
+            <inParameter>
+              <inParameter-type>GEOM/GEOM_Gen</inParameter-type>
+              <inParameter-name>geomEngine</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+            <inParameter>
+              <inParameter-type>long</inParameter-type>
+              <inParameter-name>studyId</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+            <inParameter>
+              <inParameter-type>GEOM/GEOM_Object</inParameter-type>
+              <inParameter-name>aShape</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+          </inParameter-list>
+          <outParameter-list>
+	    <outParameter>
+	      <outParameter-type>SMESH/SMESH_Mesh</outParameter-type>
+	      <outParameter-name>aMesh</outParameter-name>
+	      <outParameter-comment></outParameter-comment>
+	    </outParameter>
+	  </outParameter-list>
+        </component-service>
+        <component-service>
+          <service-name>Compute</service-name>
+          <service-author>SALOME team</service-author>
+          <service-version>@SALOMESMESH_VERSION@</service-version>
+          <service-comment></service-comment>
+          <service-by-default>0</service-by-default>
+          <inParameter-list>
+            <inParameter>
+              <inParameter-type>SMESH/SMESH_Mesh</inParameter-type>
+              <inParameter-name>aMesh</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+            <inParameter>
+              <inParameter-type>GEOM/GEOM_Object</inParameter-type>
+              <inParameter-name>aSubShape</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+          </inParameter-list>
+          <outParameter-list>
+            <outParameter>
+              <outParameter-type>boolean</outParameter-type>
+              <outParameter-name>res</outParameter-name>
+              <outParameter-comment>Result</outParameter-comment>
+            </outParameter>
+	  </outParameter-list>
+        </component-service>
+        <component-service>
+          <service-name>IsReadyToCompute</service-name>
+          <service-author>SALOME team</service-author>
+          <service-version>@SALOMESMESH_VERSION@</service-version>
+          <service-comment></service-comment>
+          <service-by-default>0</service-by-default>
+          <inParameter-list>
+            <inParameter>
+              <inParameter-type>SMESH/SMESH_Mesh</inParameter-type>
+              <inParameter-name>aMesh</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+            <inParameter>
+              <inParameter-type>GEOM/GEOM_Object</inParameter-type>
+              <inParameter-name>aSubShape</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+          </inParameter-list>
+          <outParameter-list>
+            <outParameter-type>boolean</outParameter-type>
+            <outParameter-name>res</outParameter-name>
+            <outParameter-comment>Result</outParameter-comment>
+	  </outParameter-list>
+        </component-service>
+      </component-service-list>
+      <component-interface-name>SMESH/SMESH_Mesh</component-interface-name>
+      <component-interface-comment></component-interface-comment>
+      <component-service-list>
+        <component-service>
+          <service-name>AddHypothesis</service-name>
+          <service-author>SALOME team</service-author>
+          <service-version>@SALOMESMESH_VERSION@</service-version>
+          <service-comment></service-comment>
+          <service-by-default>0</service-by-default>
+          <inParameter-list>
+            <inParameter>
+              <inParameter-type>GEOM/GEOM_Object</inParameter-type>
+              <inParameter-name>aSubShape</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+            <inParameter>
+              <inParameter-type>SMESH/SMESH_Hypothesis</inParameter-type>
+              <inParameter-name>aHyp</inParameter-name>
+              <inParameter-comment></inParameter-comment>
+            </inParameter>
+          </inParameter-list>
+          <outParameter-list>
+            <outParameter>
+              <outParameter-type>boolean</outParameter-type>
+              <outParameter-name>res</outParameter-name>
+              <outParameter-comment>Result</outParameter-comment>
+            </outParameter>
+	  </outParameter-list>
+        </component-service>
+      </component-service-list>
+    </component-interface-list>
+  </component>
 </component-list>
 </begin-catalog>
-- 
2.30.2