From 32308cb4177c7a7517c07e6adc0440013bce6ed3 Mon Sep 17 00:00:00 2001
From: bri <bri@opencascade.com>
Date: Mon, 15 Jul 2013 16:13:52 +0000
Subject: [PATCH] updated README

---
 Workspace/README                              |  10 ++--
 Workspace/Siman-WS/WebContent/conf/som.xml    |  53 +++++++++++++-----
 Workspace/Siman-WS/conf/customer.txt          |   2 +-
 Workspace/Siman-WS/conf/debug.properties      |   6 +-
 Workspace/Siman-WS/conf/release.properties    |   6 +-
 Workspace/Siman-WS/src/hibernate.properties   |   6 +-
 Workspace/Siman-WS/src/jdbc.properties        |   6 +-
 Workspace/Siman-WS/src/log4j.xml              |   2 +-
 Workspace/Siman-WS/src/som.properties         |  24 ++++----
 Workspace/Siman-WS/src/som_en.properties      |  22 ++++----
 Workspace/Siman/WebContent/conf/som.xml       |  53 +++++++++++++-----
 .../Siman/WebContent/jap/splat-launcher.jar   | Bin 10426 -> 10426 bytes
 .../WebContent/jap/splat-signedlauncher.jar   | Bin 12151 -> 12151 bytes
 Workspace/Siman/conf/customer.txt             |   2 +-
 Workspace/Siman/conf/debug.properties         |   6 +-
 Workspace/Siman/conf/release.properties       |   6 +-
 Workspace/Siman/src/hibernate.properties      |   6 +-
 Workspace/Siman/src/jdbc.properties           |   6 +-
 Workspace/Siman/src/som.properties            |  22 ++++----
 Workspace/Siman/src/som_en.properties         |  22 ++++----
 20 files changed, 162 insertions(+), 98 deletions(-)

diff --git a/Workspace/README b/Workspace/README
index 9272d3c..c634b78 100644
--- a/Workspace/README
+++ b/Workspace/README
@@ -18,8 +18,8 @@ cvs -d :pserver:bri@cvs.opencascade.com:/home/server/cvs/SIMAN checkout  SIMAN_S
 
 3. Build SIMAN java libraries and web archive siman.war
 
-- go to the directory SIMAN
-- adjust paths to ANT bin folder, JAVA_HOME and required RDBMS (MySQL or PostgreSQL) in the file build-war.bat or build-war.sh
+- go to the directory Siman
+- adjust paths to ANT bin folder, JAVA_HOME as well as required RDBMS (prepare-mysql or prepare-postgres) and Workflows (prepare-edf or prepare-cea) in the file build-war.bat or build-war.sh
 - run script build-war.bat or build-war.sh
 - the result web archive siman.war is created in sub-directory dist
 
@@ -27,8 +27,8 @@ The examples of "# Connection properties" of release.properties for PostgreSQL a
 
 4. Build SIMAN java libraries and web archive Siman-WS.war
 
-- go to the directory SIMAN-WS
-- adjust paths to ANT bin folder, JAVA_HOME and required RDBMS (MySQL or PostgreSQL) in the file build-war.bat or build-war.sh
+- go to the directory Siman-WS
+- adjust paths to ANT bin folder, JAVA_HOME as well as required RDBMS (prepare-mysql or prepare-postgres) and Workflows (prepare-edf or prepare-cea) in the file build-war.bat or build-war.sh
 - run script build-war.bat or build-war.sh
-- the result web archive SIMAN-WS.war is created in sub-directory dist
+- the result web archive Siman-WS.war is created in sub-directory dist
 
diff --git a/Workspace/Siman-WS/WebContent/conf/som.xml b/Workspace/Siman-WS/WebContent/conf/som.xml
index 3115e34..d19362e 100644
--- a/Workspace/Siman-WS/WebContent/conf/som.xml
+++ b/Workspace/Siman-WS/WebContent/conf/som.xml
@@ -6,7 +6,7 @@
 <!-- 1. Database physical location
      -->
     <database>
-		<repository disk="/home/siman/Repository" />
+        <repository disk="/home/siman/Repository" />
     </database>
 
 
@@ -68,8 +68,9 @@
         <article type="loads"         uses="model"/>
         <article type="script"        uses="loads"/>
         <article type="log"           uses="script"/>
-        <article type="results"       uses="script"/>
-        <article type="report"        uses="results"/>
+        <article type="resultsMeca"   uses="script"/>
+        <article type="resultsSyrthes" uses="script"/>
+        <article type="report"        uses="resultsMeca, resultsSyrthes"/>
         <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
@@ -156,11 +157,17 @@
             <storage path="3.Mesh"/>
             <module name="SMESH"/>
         </step>
-        <step name="solving">
+        <step name="meca">
             <classification context="loads,script,platform,module,component"/>
-            <flow contents="loads,model,log,results,minutes" result="results"/>
+            <flow contents="loads,model,log,minutes,resultsMeca" result="resultsMeca"/>
             <storage path="5.Result"/>
-            <module name="CASTEM"/>
+            <module name="ASTER"/>
+        </step>
+        <step name="syrthes">
+            <classification context="loads,script,platform,module,component"/>
+            <flow contents="loads,model,log,minutes,resultsSyrthes" result="resultsSyrthes"/>
+            <storage path="5.Result"/>
+            <module name="SYRTHES"/>
         </step>
         <step name="postprocessing">
             <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
@@ -212,12 +219,20 @@
         </document>
         <document type="model">
             <import format="med"/>      <!-- Result mesh without input parameters     -->
+            <import format="mmed"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="model"/>    <!-- Input data created interactively         -->
+            <import format="comm"/>      <!-- MECA input data created interactively         -->
+            <import format="bz2"/>      <!-- SYRTHES input data created interactively         -->
+        </document>
+        <document type="resultsMeca">
+            <import format="resu"/>      <!-- Calculation results source file          -->
+            <import format="mess"/>      <!-- Calculation results source file          -->
+            <import format="rmed"/>      <!-- Calculation results source file          -->
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
-        <document type="results">
-            <import format="med"/>      <!-- Calculation results source file          -->
+        <document type="resultsSyrthes">
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
         <document type="schema">
             <import format="xml"/>      <!-- Calculation results source file          -->
@@ -251,18 +266,30 @@
             <mapping extension="docx"   type="memorandum"/>
             <mapping extension="xml"    type="memorandum"/>
             <mapping extension="med"    type="model"/>
+            <mapping extension="mmed"   type="model"/>
             <mapping extension="py"     type="model"/>             <!-- SMESH Python script             -->
         </step>
-        <step number="5"> <!-- execute the calculations -->
-        	<mapping extension="med"    type="model"/>
-        	<mapping extension="model"  type="loads"/>
+        <step number="5"> <!-- execute the MECA calculations -->
+            <mapping extension="comm"    type="loads"/>
+            <mapping extension="resu"    type="resultsMeca"/>
+            <mapping extension="mess"    type="resultsMeca"/>
+            <mapping extension="rmed"    type="resultsMeca"/>
+            <mapping extension="bz2"     type="resultsMeca"/>
             <mapping extension="py"     type="loads"/>
         </step>
         <step number="6">
+            <mapping extension="syd"    type="loads"/>
+            <mapping extension="syr"    type="loads"/>
+            <mapping extension="syr_desc"    type="loads"/>
+            <mapping extension="c"      type="loads"/>
+            <mapping extension="bz2"    type="resultsSyrthes"/>
+            <mapping extension="py"     type="loads"/>
+        </step>
+        <step number="7">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>
         </step>
-        <step number="7">
+        <step number="8">
             <mapping extension="xml"    type="schema"/>
         </step>
     </default-doctypes>
diff --git a/Workspace/Siman-WS/conf/customer.txt b/Workspace/Siman-WS/conf/customer.txt
index b1121e1..114dcac 100644
--- a/Workspace/Siman-WS/conf/customer.txt
+++ b/Workspace/Siman-WS/conf/customer.txt
@@ -1 +1 @@
-cea
\ No newline at end of file
+edf
\ No newline at end of file
diff --git a/Workspace/Siman-WS/conf/debug.properties b/Workspace/Siman-WS/conf/debug.properties
index e846683..997c048 100644
--- a/Workspace/Siman-WS/conf/debug.properties
+++ b/Workspace/Siman-WS/conf/debug.properties
@@ -1,12 +1,12 @@
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman-WS/conf/release.properties b/Workspace/Siman-WS/conf/release.properties
index 88555e3..e849ecb 100644
--- a/Workspace/Siman-WS/conf/release.properties
+++ b/Workspace/Siman-WS/conf/release.properties
@@ -1,13 +1,13 @@
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 #hibernate.hbm2ddl.auto=validate
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman-WS/src/hibernate.properties b/Workspace/Siman-WS/src/hibernate.properties
index 4d5b37a..8ce2b56 100644
--- a/Workspace/Siman-WS/src/hibernate.properties
+++ b/Workspace/Siman-WS/src/hibernate.properties
@@ -1,11 +1,11 @@
-# Generated at 10/07/2013 07:17:41
+# Generated at 11/07/2013 04:06:50
 # Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman-WS/conf/templates.
 # Connection properties
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman-WS/src/jdbc.properties b/Workspace/Siman-WS/src/jdbc.properties
index b11f196..4bd43ce 100644
--- a/Workspace/Siman-WS/src/jdbc.properties
+++ b/Workspace/Siman-WS/src/jdbc.properties
@@ -1,7 +1,7 @@
-# Generated at 10/07/2013 07:17:41
+# Generated at 11/07/2013 04:06:50
 # Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman-WS/conf/templates.
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
diff --git a/Workspace/Siman-WS/src/log4j.xml b/Workspace/Siman-WS/src/log4j.xml
index bef234b..20a6563 100644
--- a/Workspace/Siman-WS/src/log4j.xml
+++ b/Workspace/Siman-WS/src/log4j.xml
@@ -3,7 +3,7 @@
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
-	<!-- Generated at 10/07/2013 07:17:41 -->
+	<!-- Generated at 11/07/2013 04:06:50 -->
 	<!-- Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman-WS/conf/templates. -->
 	
     <appender name="console" class="org.apache.log4j.ConsoleAppender">
diff --git a/Workspace/Siman-WS/src/som.properties b/Workspace/Siman-WS/src/som.properties
index fb563dc..ef5492e 100644
--- a/Workspace/Siman-WS/src/som.properties
+++ b/Workspace/Siman-WS/src/som.properties
@@ -8,21 +8,25 @@ menu.step.1   = Sp
 menu.step.2   = Concevoir le scénario
 menu.step.3   = Créer la géométrie
 menu.step.4   = Générer le modèle d''analyse
-menu.step.5   = Entrer les conditions de calcul
-menu.step.6   = Analyser les résultats
-menu.step.7   = Définir le schéma de calcul
-menu.step.8   = Capitaliser ce cas d''étude
-menu.step.9   = Finaliser l''étude
+menu.step.5   = Effectuer le CASTEM
+menu.step.6   = Effectuer le MECA
+menu.step.7   = Effectuer le SYRTHES
+menu.step.8   = Analyser les résultats
+menu.step.9   = Définir le schéma de calcul
+menu.step.10   = Capitaliser ce cas d''étude
+menu.step.11   = Finaliser l''étude
 
 folder.step.1 = Spécification de l''étude
 folder.step.2 = Description du scénario
 folder.step.3 = Géométrie
 folder.step.4 = Modèle d''analyse
-folder.step.5 = Conditions de calcul
-folder.step.6 = Résultats
-folder.step.7 = Schéma de calcul
-folder.step.8 = Élements de connaissances
-folder.step.9 = Rapport final
+folder.step.5 = Exécution de calcul CASTEM
+folder.step.6 = Exécution de calcul MECA
+folder.step.7 = Exécution de calcul SYRTHES
+folder.step.8 = Résultats
+folder.step.9 = Schéma de calcul
+folder.step.10 = Élements de connaissances
+folder.step.11 = Rapport final
 
 
 type.document.requirements   = Cahier des charges
diff --git a/Workspace/Siman-WS/src/som_en.properties b/Workspace/Siman-WS/src/som_en.properties
index 56aa516..14265c9 100644
--- a/Workspace/Siman-WS/src/som_en.properties
+++ b/Workspace/Siman-WS/src/som_en.properties
@@ -8,21 +8,23 @@ menu.step.1   = Specify the study
 menu.step.2   = Design the scenario
 menu.step.3   = Create the geometry
 menu.step.4   = Generate the analysis model
-menu.step.5   = Enter the boundary conditions
-menu.step.6   = Analyze the results
-menu.step.7   = Define the calculation schema
-menu.step.8   = Capitalize this use-case
-menu.step.9   = Finalize the study
+menu.step.5   = Execute MECA
+menu.step.6   = Execute SYRTHES
+menu.step.7   = Analyze the results
+menu.step.8   = Define the calculation schema
+menu.step.9   = Capitalize this use-case
+menu.step.10   = Finalize the study
 
 folder.step.1 = Specification of the study
 folder.step.2 = Description of the scenario
 folder.step.3 = Geometry
 folder.step.4 = Analysis model
-folder.step.5 = Boundary conditions
-folder.step.6 = Calculation results
-folder.step.7 = Calculation schema
-folder.step.8 = Knowledge elements
-folder.step.9 = Final report
+folder.step.5 = MECA calculation execution
+folder.step.6 = SYRTHES calculation execution
+folder.step.7 = Calculation results
+folder.step.8 = Calculation schema
+folder.step.9 = Knowledge elements
+folder.step.10 = Final report
 
 
 type.document.requirements   = Customer requirements
diff --git a/Workspace/Siman/WebContent/conf/som.xml b/Workspace/Siman/WebContent/conf/som.xml
index 3115e34..d19362e 100644
--- a/Workspace/Siman/WebContent/conf/som.xml
+++ b/Workspace/Siman/WebContent/conf/som.xml
@@ -6,7 +6,7 @@
 <!-- 1. Database physical location
      -->
     <database>
-		<repository disk="/home/siman/Repository" />
+        <repository disk="/home/siman/Repository" />
     </database>
 
 
@@ -68,8 +68,9 @@
         <article type="loads"         uses="model"/>
         <article type="script"        uses="loads"/>
         <article type="log"           uses="script"/>
-        <article type="results"       uses="script"/>
-        <article type="report"        uses="results"/>
+        <article type="resultsMeca"   uses="script"/>
+        <article type="resultsSyrthes" uses="script"/>
+        <article type="report"        uses="resultsMeca, resultsSyrthes"/>
         <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
@@ -156,11 +157,17 @@
             <storage path="3.Mesh"/>
             <module name="SMESH"/>
         </step>
-        <step name="solving">
+        <step name="meca">
             <classification context="loads,script,platform,module,component"/>
-            <flow contents="loads,model,log,results,minutes" result="results"/>
+            <flow contents="loads,model,log,minutes,resultsMeca" result="resultsMeca"/>
             <storage path="5.Result"/>
-            <module name="CASTEM"/>
+            <module name="ASTER"/>
+        </step>
+        <step name="syrthes">
+            <classification context="loads,script,platform,module,component"/>
+            <flow contents="loads,model,log,minutes,resultsSyrthes" result="resultsSyrthes"/>
+            <storage path="5.Result"/>
+            <module name="SYRTHES"/>
         </step>
         <step name="postprocessing">
             <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
@@ -212,12 +219,20 @@
         </document>
         <document type="model">
             <import format="med"/>      <!-- Result mesh without input parameters     -->
+            <import format="mmed"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="model"/>    <!-- Input data created interactively         -->
+            <import format="comm"/>      <!-- MECA input data created interactively         -->
+            <import format="bz2"/>      <!-- SYRTHES input data created interactively         -->
+        </document>
+        <document type="resultsMeca">
+            <import format="resu"/>      <!-- Calculation results source file          -->
+            <import format="mess"/>      <!-- Calculation results source file          -->
+            <import format="rmed"/>      <!-- Calculation results source file          -->
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
-        <document type="results">
-            <import format="med"/>      <!-- Calculation results source file          -->
+        <document type="resultsSyrthes">
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
         <document type="schema">
             <import format="xml"/>      <!-- Calculation results source file          -->
@@ -251,18 +266,30 @@
             <mapping extension="docx"   type="memorandum"/>
             <mapping extension="xml"    type="memorandum"/>
             <mapping extension="med"    type="model"/>
+            <mapping extension="mmed"   type="model"/>
             <mapping extension="py"     type="model"/>             <!-- SMESH Python script             -->
         </step>
-        <step number="5"> <!-- execute the calculations -->
-        	<mapping extension="med"    type="model"/>
-        	<mapping extension="model"  type="loads"/>
+        <step number="5"> <!-- execute the MECA calculations -->
+            <mapping extension="comm"    type="loads"/>
+            <mapping extension="resu"    type="resultsMeca"/>
+            <mapping extension="mess"    type="resultsMeca"/>
+            <mapping extension="rmed"    type="resultsMeca"/>
+            <mapping extension="bz2"     type="resultsMeca"/>
             <mapping extension="py"     type="loads"/>
         </step>
         <step number="6">
+            <mapping extension="syd"    type="loads"/>
+            <mapping extension="syr"    type="loads"/>
+            <mapping extension="syr_desc"    type="loads"/>
+            <mapping extension="c"      type="loads"/>
+            <mapping extension="bz2"    type="resultsSyrthes"/>
+            <mapping extension="py"     type="loads"/>
+        </step>
+        <step number="7">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>
         </step>
-        <step number="7">
+        <step number="8">
             <mapping extension="xml"    type="schema"/>
         </step>
     </default-doctypes>
diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index b2fb6ba9e5a8a457b08317d78d98730abb703e63..04e47371a86fe47a0cd89f78e08c38184c689d0f 100644
GIT binary patch
delta 230
zcmdlLxGRu1z?+$civa|#HoTt5tHE)l;kDCqwuGq@Z6`8bnRs5D`7%)ar96n5%+06@
zri~f(K=kGm#xh1Q<1W)`7BHimeJ?YZ;m!R}2+YuzyTBv}RP6NT;m>WxEDQ`w*%=r#
zCOa~UP43qa-E6IB&%z9}dUCC*1>Ek*dsVGKnkWBK)d$l$YNlX1Ma>ROFI9^I(@g3C
XU^-OY4@@sp4+PV{)DysTtVS#VODSVv

delta 230
zcmdlLxGRu1z?+$civa{K%zQPGSA*mH%vVlH_rG~ew4KO!Vd8ml<}E<+m-5V8XTF-u
z&8P~djT!Yo^yU=CGDa}tF4JljFr%A&FEg0o&HYda%+Qy+z$6G%?DXd0&uzvm3=B)z
z85lGsJ2Hw*?$;3AY^`X|!VI)}a;>Tb-0sPHRjokwPX48;4>Dx3j+!Z$PEoT1(@WK&
cz%-M30GJL{_XE?*)C0lvFZBd49jg%w0Q2NzbpQYW

diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar
index 067fff1be0c50832f913998dae12a2461ec66d65..6910ca92981747791be7f93483845bf7e7af139e 100644
GIT binary patch
delta 1152
zcmew!_dSj`z?+#xgn<JHuQt4%$ZN(_C^OO3#4E#k*~5+YBI})gYH!=JY__xXthRXJ
zRaXB>b8OigGg+9FTf55-mgc-DE92W@x72iVn2LBz+|onpnP(&O>i^l=UR0jN)@aPK
zj(PXQ!|KxP*1|!rG?G`B?hG&9|8mpM74|#%_URu!__Wn(GApB6{ewl<pWF!dzF9r@
zzWP~?qtcBt?)*P$nSFKV+_U`&EbI?nv~ge0<bQd+=&ITOsSlU^w37S#=6b^Jdpiyr
zoYGr;_;I3{@9xd=|1B=ue)~5{^IYEVw#vzRdY()_%$G~#Xr5VQ{L;VLwd}t6gB<@;
zQ3^}t6RJ)Yehs^m^5)6n?<QK2`Ww!caem1B>9Y8Q<?*E2n)E+R0p9E!OfN*%bTKk8
zTw-EiKno_RdLPG7KW7iuAiZF>sT0rkEpiZX`>wW+xjXJmi-y*MwiGcgrhg9oD{kzX
zIi(<RRjbynRRIrPx?f)H_vYQ1chPevSHELh&eA!_QJv+Op=#Te_up=<?X`Yct}};8
zT$W#O&K`arD`7<myQxe&6u;^jseJlZE)?^`^%-0D<%26XTJqH&dcD5vbV>uuk-3?*
z?R>lU+Q0JnwNbP4$-|DoxMD`j>CaSN{j13_S+cQ`ZE2*%@hhL#?KZf2jw{5)thwht
z&)aGJMFuLTf?CBTg}mClg#NNF%h5dR*Wufx#C);W=*Um@c16Y8$)9a~zb+}_UR(d|
zx~J@udv_$y?Q?r?*!glQd;NqYy@<bC1h+eXW(eSUvv8%28~16p|3}<;<#&YCZIqhC
zp6tCies<2BgVPibP4+**UM}%#{qd6(TdtJtT61~jv|Ar~lK#)OQB&pg^KLux_W5S5
zrbl*iR)<`8R{XPZ*wE!vuKL0I=9kq!VpiNQ*|k3*it8ii_CVX(&1=$JQuoblcM)*$
z+P8mQ`nH|F*Z<>xc>1p2*>Lu`u|>~IU+>9m@7yXEQS4gB|Ct{Yk9Ul%56%R};}7(B
z+`N_9nyH?3y?tBSo}{l;bB^tN6MBB%%0*{B{SLFwG2Q#6V`Idpdvki%L<t#HZ;SJY
z`nhG-kK>)aGuO235B^@DrV&@XXWz@WpQinEvcEPrao5#95u2`CJ$$gg?X>Ut{`mii
z>&yR6Ke5DZA-k<8<Jnp3)BSY+y$ewJ^(OjY(q36V8Fuw7Jq?YDUB8e0-1$0Q8kEY|
zIpmiuI6EKc((BBSRL8{t0>I2Uc^aDr^JO4?kWC&;KW0+})7<QOAbPV6dmAH|ag<{>
z3z*T&dzKl@2p0S(1ZKFaJYWJdwA4FTIDn=)fl~S8UD{ThAPzXFCjZs81oOa7nQX5k
z%D8-TsE!IV$PqO<79jnTx9jMG>6bdDU|Lbv4ooNMMuF-5x&dHXNY4*UC+h`*>Fs(6
JU|LE)769ocA9w%&

delta 1152
zcmew!_dSj`z?+#xgn<JH&(C}{k=KlAqwqvm6R+cK%N}mD7g_K0Q+wN%WwV`c8}jZ~
z3n~5c`bHHW(`618H!kt_P29Q1-@aLpT<evcw$?*$#~!a%|4Xwr-}(2ax@wWT2``fc
zi(bjDiHFstpO>gDxe|CR>~+!lXLXlTKL^$q$=1ZTHJ|2goy^LpRzJse{mG5%r)~Of
zwcmf1V3#?Q;m-fv#n)C9ThEq1ctWyav9w;y4Y^C}pRUUNr+wJ>bE(a*o9hpj?JaCi
zoDv(>e*AFGtg>|be}xOS-~PQdXwKblyr0!#V<xeD$loB5vvRU)`lb2by58)|KX7y2
zl&ub4_6NR9di-kbj*~Y|y1&m1*`%K^`>oJ}%bz;k1Z|Ed)z+l{VG8hO=UDLbY(*C%
z1H&aI1_rcXlB)M{4E1yNa1GK6c59t@uy2uri0gN?f6U#HXO1W+E!uWcC%{FbwQs?V
zZ)rhd{JW;CI<zV&>hG_MU$WG;?cF`Q-0$9APECoRtqiuTik#`nXLHJD^&TnrxvR?R
zv9!Ho;vZ#!W!7Gtn^udSn3%R_W00ZH*Y<x({??^0Wi;XsU2J+#pT5~put6l{*N>X!
zZ@1^(zvl3J-W4BiPO+GIOPRE`Haz^+|NGeM*h>rjtHaOEKeIRU$34OKIu{SEZrr?2
zYE~~tphRYjNZT5(B|Sn{dG<FNgw2_5tukkomgCmK&Lw}28(x|q-j#5e+uHtT=y@BL
z(|=?x8_f8+y#J!~A)|kK$r>H?A&>s(23~j1<k4U*ydJXuQT#ggi++51n_hpu)?J-w
zBDc%--;E~|g~FH&XVyF2`}No4)_$wQ2ls5>7HuZ~or`~7pxDXdPdL*pHM1J8lzx86
z>0HWPE}OY-*PXg|N)ZpP#A|#Cia!%vwqlKb)h=IybyI(}RBv>$o;iQn8KH|U%LH7L
zoAd5X56=H|bj$y*_2PE%>vebCxb=vC?%VLq$@#B$oL(m_v9>?yA2=epXU&e91&qia
z=n=Vj3$ry-{j}F*g|R!L47&eb`tzqa)-v$U8TB|nE2FQkCf(>ZoXO2s^I%m#cw+zR
zU-rhmwU3(lK2BkODD*x`ruxeIxV<Ldf6VVZ<l~<<b8c;AjORON=Ux9E`Tj0V$uBB+
zb}njf{@TM+ET?bXcFe~<xwPeTUfaRB4txK4CrK~joqX=g{6CA-f95{qk3ZjGya|}f
z*g5=H)ke(&I`ld-B-L>-fWU>BuO?4p(_r2Lqz|&mGj9dbkJ(hgG&j2*h~8|&-o^-K
z9Oc-}0%kPxo@E9zf(1Vcff?>9517CVE%go-4q%pd0;TfFyR@x1K^$;MP5!HG3Fd*F
zGTB~7lySx6P#qO!kRxhzEWnP~uA>h!XYxxOQ!uTlYX_#2bfduZe%$~tEu`lMrjzvo
O!Sr^$1TZb79}57WD<^ya

diff --git a/Workspace/Siman/conf/customer.txt b/Workspace/Siman/conf/customer.txt
index b1121e1..114dcac 100644
--- a/Workspace/Siman/conf/customer.txt
+++ b/Workspace/Siman/conf/customer.txt
@@ -1 +1 @@
-cea
\ No newline at end of file
+edf
\ No newline at end of file
diff --git a/Workspace/Siman/conf/debug.properties b/Workspace/Siman/conf/debug.properties
index e846683..997c048 100644
--- a/Workspace/Siman/conf/debug.properties
+++ b/Workspace/Siman/conf/debug.properties
@@ -1,12 +1,12 @@
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman/conf/release.properties b/Workspace/Siman/conf/release.properties
index 88555e3..e849ecb 100644
--- a/Workspace/Siman/conf/release.properties
+++ b/Workspace/Siman/conf/release.properties
@@ -1,13 +1,13 @@
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 #hibernate.hbm2ddl.auto=validate
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman/src/hibernate.properties b/Workspace/Siman/src/hibernate.properties
index 2efac10..bdc8c0b 100644
--- a/Workspace/Siman/src/hibernate.properties
+++ b/Workspace/Siman/src/hibernate.properties
@@ -1,11 +1,11 @@
-# Generated at 10/07/2013 07:14:30
+# Generated at 11/07/2013 04:06:35
 # Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman/conf/templates.
 # Connection properties
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 hibernate.current_session_context_class=thread
 
 # Log properties
diff --git a/Workspace/Siman/src/jdbc.properties b/Workspace/Siman/src/jdbc.properties
index a91d722..61843b5 100644
--- a/Workspace/Siman/src/jdbc.properties
+++ b/Workspace/Siman/src/jdbc.properties
@@ -1,7 +1,7 @@
-# Generated at 10/07/2013 07:14:30
+# Generated at 11/07/2013 04:06:35
 # Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman/conf/templates.
 # Connection properties
-connection.url=jdbc:postgresql://localhost:5432/simer
+connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=org.postgresql.Driver
+connection.driver_class=com.mysql.jdbc.Driver
diff --git a/Workspace/Siman/src/som.properties b/Workspace/Siman/src/som.properties
index fb563dc..e71213c 100644
--- a/Workspace/Siman/src/som.properties
+++ b/Workspace/Siman/src/som.properties
@@ -8,21 +8,23 @@ menu.step.1   = Sp
 menu.step.2   = Concevoir le scénario
 menu.step.3   = Créer la géométrie
 menu.step.4   = Générer le modèle d''analyse
-menu.step.5   = Entrer les conditions de calcul
-menu.step.6   = Analyser les résultats
-menu.step.7   = Définir le schéma de calcul
-menu.step.8   = Capitaliser ce cas d''étude
-menu.step.9   = Finaliser l''étude
+menu.step.5   = Effectuer le MECA
+menu.step.6   = Effectuer le SYRTHES
+menu.step.7   = Analyser les résultats
+menu.step.8   = Définir le schéma de calcul
+menu.step.9   = Capitaliser ce cas d''étude
+menu.step.10   = Finaliser l''étude
 
 folder.step.1 = Spécification de l''étude
 folder.step.2 = Description du scénario
 folder.step.3 = Géométrie
 folder.step.4 = Modèle d''analyse
-folder.step.5 = Conditions de calcul
-folder.step.6 = Résultats
-folder.step.7 = Schéma de calcul
-folder.step.8 = Élements de connaissances
-folder.step.9 = Rapport final
+folder.step.5 = Exécution de calcul MECA
+folder.step.6 = Exécution de calcul SYRTHES
+folder.step.7 = Résultats
+folder.step.8 = Schéma de calcul
+folder.step.9 = Élements de connaissances
+folder.step.10 = Rapport final
 
 
 type.document.requirements   = Cahier des charges
diff --git a/Workspace/Siman/src/som_en.properties b/Workspace/Siman/src/som_en.properties
index 56aa516..14265c9 100644
--- a/Workspace/Siman/src/som_en.properties
+++ b/Workspace/Siman/src/som_en.properties
@@ -8,21 +8,23 @@ menu.step.1   = Specify the study
 menu.step.2   = Design the scenario
 menu.step.3   = Create the geometry
 menu.step.4   = Generate the analysis model
-menu.step.5   = Enter the boundary conditions
-menu.step.6   = Analyze the results
-menu.step.7   = Define the calculation schema
-menu.step.8   = Capitalize this use-case
-menu.step.9   = Finalize the study
+menu.step.5   = Execute MECA
+menu.step.6   = Execute SYRTHES
+menu.step.7   = Analyze the results
+menu.step.8   = Define the calculation schema
+menu.step.9   = Capitalize this use-case
+menu.step.10   = Finalize the study
 
 folder.step.1 = Specification of the study
 folder.step.2 = Description of the scenario
 folder.step.3 = Geometry
 folder.step.4 = Analysis model
-folder.step.5 = Boundary conditions
-folder.step.6 = Calculation results
-folder.step.7 = Calculation schema
-folder.step.8 = Knowledge elements
-folder.step.9 = Final report
+folder.step.5 = MECA calculation execution
+folder.step.6 = SYRTHES calculation execution
+folder.step.7 = Calculation results
+folder.step.8 = Calculation schema
+folder.step.9 = Knowledge elements
+folder.step.10 = Final report
 
 
 type.document.requirements   = Customer requirements
-- 
2.39.2