updated README

diff --git a/Workspace/README b/Workspace/README
index 9272d3c8b382a77bf75251cc0ce9aedf47a0e7ed..c634b7854c674fbbcc2e73ae7943a60f0f1d344c 100644 (file)
--- 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 3115e34adcd64cff175b84bb0979bb4f376260f5..d19362efaee0fe35c547422daa0c08d5419a946d 100644 (file)
--- 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 b1121e18fb29ed6070789773034b35ea92874b0b..114dcac6820d253d0866eef3f7213ab212d34da0 100644 (file)
--- 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 e8466835f8eb437087faed838c20e5200f72d1fd..997c048b8bae6569d50f44e284fc6219cddc5b4b 100644 (file)
--- 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 88555e30a4443b3bfd99026b483f98fdd433126a..e849ecb95a394e5f27651baa9b24a4dd0f13f947 100644 (file)
--- 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 4d5b37acdfd1b3bd4e829679a2e1b5bb3fe6bc3b..8ce2b5653e4d00013d312150ecf0483dd9066996 100644 (file)
--- 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 b11f196da9ff0a98a5ed0b59aebc185d65edb4d9..4bd43ce05d1316d890cdba0db7521b20ea9935fc 100644 (file)
--- 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 bef234b357750c20c830b480a48f72251811a9c8..20a65637318f636e1e8235bca48466b08864c947 100644 (file)
--- 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 fb563dc11e06bd2dfe8c620a777dd08afa26a55b..ef5492ebfad4b2add54d1f0a77769e91b81ce497 100644 (file)
--- 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 56aa51669ab7fc68f11bf757a2de5526e011a578..14265c970c392f247943ca3c9021561298cf405d 100644 (file)
--- 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 3115e34adcd64cff175b84bb0979bb4f376260f5..d19362efaee0fe35c547422daa0c08d5419a946d 100644 (file)
--- 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 (file)
Binary files a/Workspace/Siman/WebContent/jap/splat-launcher.jar and b/Workspace/Siman/WebContent/jap/splat-launcher.jar differ

diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar
index 067fff1be0c50832f913998dae12a2461ec66d65..6910ca92981747791be7f93483845bf7e7af139e 100644 (file)
Binary files a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar and b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar differ

diff --git a/Workspace/Siman/conf/customer.txt b/Workspace/Siman/conf/customer.txt
index b1121e18fb29ed6070789773034b35ea92874b0b..114dcac6820d253d0866eef3f7213ab212d34da0 100644 (file)
--- 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 e8466835f8eb437087faed838c20e5200f72d1fd..997c048b8bae6569d50f44e284fc6219cddc5b4b 100644 (file)
--- 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 88555e30a4443b3bfd99026b483f98fdd433126a..e849ecb95a394e5f27651baa9b24a4dd0f13f947 100644 (file)
--- 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 2efac10560802a97bcffa780478a1fe0bdd7cd59..bdc8c0bf415ef1135ed12aad9f00fa7195b16fba 100644 (file)
--- 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 a91d722405f0b6a00b5679b7a8c0c63fb16e1e2e..61843b52462f30d6faf6f81e571ede339d0cdc75 100644 (file)
--- 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 fb563dc11e06bd2dfe8c620a777dd08afa26a55b..e71213c1eae3d066d9e41285df9fb3d6d7c1f0b4 100644 (file)
--- 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 56aa51669ab7fc68f11bf757a2de5526e011a578..14265c970c392f247943ca3c9021561298cf405d 100644 (file)
--- 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