CCAR: some corrections in component catalog and update port properties (name)

diff --git a/resources/DSCCODECatalog.xml b/resources/DSCCODECatalog.xml
index fedf034a2d9dea72327c8387702166fe2bff8863..4b3c09cef814463a5755bb3428d266b778db3947 100644 (file)
--- a/resources/DSCCODECatalog.xml
+++ b/resources/DSCCODECatalog.xml
@@ -36,9 +36,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -66,9 +68,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -112,9 +116,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -140,9 +146,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -187,9 +195,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -217,9 +227,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -265,9 +277,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -295,9 +309,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>niter</inParameter-name>
                             <inParameter-type>long</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -357,9 +373,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>dt</inParameter-name>
                             <inParameter-type>double</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -404,9 +422,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>dt</inParameter-name>
                             <inParameter-type>double</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>
@@ -451,9 +471,11 @@
                     <service-by-default>1</service-by-default>
                     <!-- service-connexion -->
                     <inParameter-list>
+                          <inParameter>
                             <inParameter-name>dt</inParameter-name>
                             <inParameter-type>double</inParameter-type>
                             <inParameter-comment></inParameter-comment>
+                          </inParameter>
                     </inParameter-list>
                     <outParameter-list>
                     </outParameter-list>

diff --git a/resources/calcium4.xml b/resources/calcium4.xml
index 02443228e5ceffb2581d906cc66fa2b87122d547..452834b4fa858ca086679fe1f8e5c6e62213d922 100644 (file)
--- a/resources/calcium4.xml
+++ b/resources/calcium4.xml
@@ -61,37 +61,37 @@
       <stream>
         <fromnode>crayon</fromnode> <fromport>tpi</fromport>
         <tonode>int4</tonode> <toport>tparoi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>int4</fromnode> <fromport>tpar</fromport>
         <tonode>canal</tonode> <toport>tpi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>canal</fromnode> <fromport>tfi</fromport>
         <tonode>crayon</tonode> <toport>tfi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>tempi</fromport>
         <tonode>comb</tonode> <toport>tempi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>comb</fromnode> <fromport>puissi</fromport>
         <tonode>crayon</tonode> <toport>puissi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>iconv</fromport>
         <tonode>canal</tonode> <toport>iconv</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>iconv</fromport>
         <tonode>comb</tonode> <toport>iconv</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
     </bloc>
 
@@ -146,47 +146,47 @@
       <stream>
         <fromnode>canal</fromnode> <fromport>rfluide</fromport>
         <tonode>crayon</tonode> <toport>rext</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>canal</fromnode> <fromport>tfluide</fromport>
         <tonode>crayon</tonode> <toport>text</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>rparoi</fromport>
         <tonode>canal</tonode> <toport>rparoi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>tparoi</fromport>
         <tonode>int1</tonode> <toport>tparoit</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>int1</fromnode> <fromport>tpart</fromport>
         <tonode>canal</tonode> <toport>tparoi</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>temperature</fromport>
         <tonode>int2</tonode> <toport>tparoit</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>int2</fromnode> <fromport>tpart</fromport>
         <tonode>comb</tonode> <toport>temperature</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>comb</fromnode> <fromport>puissance</fromport>
         <tonode>int3</tonode> <toport>tparoit</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
       <stream>
         <fromnode>int3</fromnode> <fromport>tpart</fromport>
         <tonode>crayon</tonode> <toport>puissa</toport>
-        <property name="level" value="10"/>
+        <property name="StorageLevel" value="10"/>
       </stream>
     </bloc>