Merge V9_dev branch into master

[samples/hello.git] / resources / HELLOCatalog.xml.in

diff --git a/resources/HELLOCatalog.xml.in b/resources/HELLOCatalog.xml.in
index 1d9f1dea610e1c88ce78e3af46dd59988fba8306..949d7ba0215c0bd37e6349e277b8ffcbd8be8670 100644 (file)
--- a/resources/HELLOCatalog.xml.in
+++ b/resources/HELLOCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -8,7 +8,7 @@
   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.
+  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
@@ -40,9 +40,8 @@
             <component-username>Hello</component-username>
             <component-type>OTHER</component-type>
             <component-author>Vadim SANDLER</component-author>
-            <component-version>@VERSION@</component-version>
+            <component-version>@SALOMEHELLO_VERSION@</component-version>
             <component-comment>Sample module</component-comment>
-            <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
             <component-icone>HELLO.png</component-icone>
             <constraint></constraint>
@@ -54,15 +53,10 @@
                     <component-service>
                         <service-name>hello</service-name>
                         <service-author>Vadim SANDLER</service-author>
-                        <service-version>@VERSION@</service-version>
+                        <service-version>@SALOMEHELLO_VERSION@</service-version>
                         <service-comment>Hello function</service-comment>
                         <service-by-default>1</service-by-default>
                         <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>study</inParameter-name>
-                                <inParameter-type>Study</inParameter-type>
-                                <inParameter-comment>study</inParameter-comment>
-                            </inParameter>
                             <inParameter>
                                 <inParameter-name>name</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
@@ -81,15 +75,10 @@
                     <component-service>
                         <service-name>goodbye</service-name>
                         <service-author>Vadim SANDLER</service-author>
-                        <service-version>@VERSION@</service-version>
+                        <service-version>@SALOMEHELLO_VERSION@</service-version>
                         <service-comment>Goodbye function</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>study</inParameter-name>
-                                <inParameter-type>Study</inParameter-type>
-                                <inParameter-comment>study</inParameter-comment>
-                            </inParameter>
                             <inParameter>
                                 <inParameter-name>name</inParameter-name>
                                 <inParameter-type>string</inParameter-type>