Tag version V6_6_0rc1

[samples/genericsolver.git] / resources / GENERICSOLVERCatalog.xml.in

diff --git a/resources/GENERICSOLVERCatalog.xml.in b/resources/GENERICSOLVERCatalog.xml.in
index d4ef765c2a439b600ca1af0343c58027557d9a10..2514cc44b8266a8378e2804f02caf6810019456d 100644 (file)
--- a/resources/GENERICSOLVERCatalog.xml.in
+++ b/resources/GENERICSOLVERCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2009-2010 EDF R&D
+  Copyright (C) 2009-2012 EDF R&D
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -33,16 +33,7 @@
        <type-list>
                <sequence name="Point" content="double"/>
                <objref name="pyobj" id="python:obj:1.0"/>
-
-        <sequence content="double" name="GENERICSOLVER_ORB/Value"></sequence>
-        <sequence content="string" name="GENERICSOLVER_ORB/VarList"></sequence>
-        <sequence content="GENERICSOLVER_ORB/Value" name="GENERICSOLVER_ORB/ValueList"></sequence>
-        <struct name="GENERICSOLVER_ORB/InputDescription">
-            <member type="GENERICSOLVER_ORB/VarList" name="inputVarList"></member>
-            <member type="GENERICSOLVER_ORB/VarList" name="outputVarList"></member>
-            <member type="GENERICSOLVER_ORB/ValueList" name="inputValues"></member>
-        </struct>
-       </type-list>
+    </type-list>
 
        <!-- Component list -->
        <component-list>
@@ -60,77 +51,6 @@
                        <component-interface-list>
                                <component-interface-name>GENERICSOLVER</component-interface-name>
                                <component-interface-comment></component-interface-comment>
-                               <component-service-list>
-                                       <component-service>
-                                               <!-- service-identification -->
-                                               <service-name>Init</service-name>
-                                               <service-author>EDF-RD</service-author>
-                                               <service-version>@VERSION@</service-version>
-                                               <service-comment></service-comment>
-                                               <service-by-default>0</service-by-default>
-                                               <!-- service-connexion -->
-                                               <inParameter-list>
-                                                       <inParameter>
-                                                               <inParameter-name>studyID</inParameter-name>
-                                                               <inParameter-type>long</inParameter-type>
-                                                       </inParameter>
-                                                       <inParameter>
-                                                               <inParameter-name>entry</inParameter-name>
-                                                               <inParameter-type>string</inParameter-type>
-                                                       </inParameter>
-                                                       <inParameter>
-                                                               <inParameter-name>wrapperDescription</inParameter-name>
-                                                               <inParameter-type>string</inParameter-type>
-                                                       </inParameter>
-                                               </inParameter-list>
-                                               <outParameter-list>
-                                                       <outParameter>
-                                                               <outParameter-name>return</outParameter-name>
-                                                               <outParameter-type>long</outParameter-type>
-                                                       </outParameter>
-                                               </outParameter-list>
-                                       </component-service>
-                                       <component-service>
-                                               <!-- service-identification -->
-                                               <service-name>Exec</service-name>
-                                               <service-author>EDF-RD</service-author>
-                                               <service-version>@VERSION@</service-version>
-                                               <service-comment></service-comment>
-                                               <service-by-default>0</service-by-default>
-                                               <!-- service-connexion -->
-                                               <inParameter-list>
-                                                       <inParameter>
-                                                               <inParameter-name>inPoint</inParameter-name>
-                                                               <inParameter-type>Point</inParameter-type>
-                                                       </inParameter>
-                                               </inParameter-list>
-                                               <outParameter-list>
-                                                       <outParameter>
-                                                               <outParameter-name>return</outParameter-name>
-                                                               <outParameter-type>long</outParameter-type>
-                                                       </outParameter>
-                                                       <outParameter>
-                                                               <outParameter-name>outPoint</outParameter-name>
-                                                               <outParameter-type>Point</outParameter-type>
-                                                       </outParameter>
-                                               </outParameter-list>
-                                       </component-service>
-                                       <component-service>
-                                               <!-- service-identification -->
-                                               <service-name>Finalize</service-name>
-                                               <service-author>EDF-RD</service-author>
-                                               <service-version>@VERSION@</service-version>
-                                               <service-comment></service-comment>
-                                               <service-by-default>0</service-by-default>
-                                               <!-- service-connexion -->
-                                               <outParameter-list>
-                                                       <outParameter>
-                                                               <outParameter-name>return</outParameter-name>
-                                                               <outParameter-type>long</outParameter-type>
-                                                       </outParameter>
-                                               </outParameter-list>
-                                       </component-service>
-                               </component-service-list>
                        </component-interface-list>
                </component>
                <component>
@@ -162,7 +82,7 @@
                                                                <inParameter-type>long</inParameter-type>
                                                        </inParameter>
                                                        <inParameter>
-                                                               <inParameter-name>entry</inParameter-name>
+                                                               <inParameter-name>detCaseEntry</inParameter-name>
                                                                <inParameter-type>string</inParameter-type>
                                                        </inParameter>
                                                </inParameter-list>
@@ -177,14 +97,14 @@
                                                <!-- service-connexion -->
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>inputDesc</inParameter-name>
-                                <inParameter-type>GENERICSOLVER_ORB/InputDescription</inParameter-type>
+                                <inParameter-name>paramInput</inParameter-name>
+                                <inParameter-type>SALOME_TYPES/ParametricInput</inParameter-type>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
-                                <outParameter-name>outputValues</outParameter-name>
-                                <outParameter-type>GENERICSOLVER_ORB/ValueList</outParameter-type>
+                                <outParameter-name>paramOutput</outParameter-name>
+                                <outParameter-type>SALOME_TYPES/ParametricOutput</outParameter-type>
                             </outParameter>
                         </outParameter-list>
                                        </component-service>