updated scripts

diff --git a/Workspace/Siman-WS/build-war.bat b/Workspace/Siman-WS/build-war.bat
index 6d5cc34eb9c2c48a330b4a8828020f98f4b83f91..fa1d7690caf4330c43480250f524bef72d8adeed 100644 (file)
--- a/Workspace/Siman-WS/build-war.bat
+++ b/Workspace/Siman-WS/build-war.bat
@@ -3,10 +3,10 @@ set JAVA_HOME=D:\Program Files\Java\jdk1.6.0_27
 
 set PATH=%PATH%;%ANT_BIN%
 
-call ant prepare-cea
-#call ant prepare-edf
+#call ant prepare-cea
+call ant prepare-edf
 
-call ant prepare-postgres
-#call ant prepare-mysql
+#call ant prepare-postgres
+call ant prepare-mysql
 
 ant -f pre_build.xml && ant build-war

diff --git a/Workspace/Siman-WS/build-war.sh b/Workspace/Siman-WS/build-war.sh
index 8a96b28109714715f7982e97a759219e6b90e8f8..492110c9e6cb109d95c9efe3b6ed69aafb0cea30 100755 (executable)
--- a/Workspace/Siman-WS/build-war.sh
+++ b/Workspace/Siman-WS/build-war.sh
@@ -7,10 +7,10 @@ export JAVA_HOME=/usr/java/jdk1.6.0_37
 
 export PATH=${ANT_BIN}:${JAVA_HOME}/bin:${PATH}
 
-ant prepare-cea
-#ant prepare-edf
+#ant prepare-cea
+ant prepare-edf
 
-ant prepare-postgres
-#ant prepare-mysql
+#ant prepare-postgres
+ant prepare-mysql
 
 ant -f pre_build.xml && ant build-war

diff --git a/Workspace/Siman-WS/conf/debug.properties b/Workspace/Siman-WS/conf/debug.properties
index 997c048b8bae6569d50f44e284fc6219cddc5b4b..e8466835f8eb437087faed838c20e5200f72d1fd 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:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 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 e849ecb95a394e5f27651baa9b24a4dd0f13f947..88555e30a4443b3bfd99026b483f98fdd433126a 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:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 #hibernate.hbm2ddl.auto=validate
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 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 250f981367aff2f53110317df0582b950d072ce8..4d5b37acdfd1b3bd4e829679a2e1b5bb3fe6bc3b 100644 (file)
--- a/Workspace/Siman-WS/src/hibernate.properties
+++ b/Workspace/Siman-WS/src/hibernate.properties
@@ -1,11 +1,11 @@
-# Generated at 13/11/2012 04:32:01
-# Don't edit manually. See the source in D:\DevTools\SIMAN\SIMAN_SRC\Workspace\Siman-WS\conf\templates.
+# Generated at 10/07/2013 07:17:41
+# Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman-WS/conf/templates.
 # Connection properties
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 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 614bb8f1422b655463e1771ec63b4bb83ee1cf82..b11f196da9ff0a98a5ed0b59aebc185d65edb4d9 100644 (file)
--- a/Workspace/Siman-WS/src/jdbc.properties
+++ b/Workspace/Siman-WS/src/jdbc.properties
@@ -1,7 +1,7 @@
-# Generated at 13/11/2012 04:32:01
-# Don't edit manually. See the source in D:\DevTools\SIMAN\SIMAN_SRC\Workspace\Siman-WS\conf\templates.
+# Generated at 10/07/2013 07:17:41
+# Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman-WS/conf/templates.
 # Connection properties
-connection.url=jdbc:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver

diff --git a/Workspace/Siman-WS/src/log4j.xml b/Workspace/Siman-WS/src/log4j.xml
index 72e0a4983dc241803c82a38e2003dd0ebd4f179f..bef234b357750c20c830b480a48f72251811a9c8 100644 (file)
--- a/Workspace/Siman-WS/src/log4j.xml
+++ b/Workspace/Siman-WS/src/log4j.xml
@@ -3,8 +3,8 @@
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
-       <!-- Generated at 08/04/2013 12:40:08 -->
-       <!-- Don't edit manually. See the source in W:\Eclipse workspace\SIMAN\SIMAN_SRC\Workspace\Siman-WS\conf\templates. -->
+       <!-- Generated at 10/07/2013 07:17:41 -->
+       <!-- 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">
         <layout class="org.apache.log4j.PatternLayout"> 
@@ -54,14 +54,6 @@
     <category name="com.opensymphony.xwork2.validator">
       <priority value="DEBUG"/>
    </category>
-   
-   <category name="com.opensymphony.xwork2.util.OgnlUtil">
-      <priority value="ERROR"/>
-   </category>
-   
-   <category name="com.opensymphony.xwork2.ognl.OgnlValueStack">
-      <priority value="ERROR"/>
-   </category>
 
    <category name="org.apache.struts2.interceptor.validation">
       <priority value="DEBUG"/>

diff --git a/Workspace/Siman-WS/src/som.properties b/Workspace/Siman-WS/src/som.properties
index 20bc72059c848a151cb9b1d12b181c30110feff1..fb563dc11e06bd2dfe8c620a777dd08afa26a55b 100644 (file)
--- a/Workspace/Siman-WS/src/som.properties
+++ b/Workspace/Siman-WS/src/som.properties
@@ -8,8 +8,7 @@ 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.5   = Effectuer le calcul
+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
@@ -19,13 +18,13 @@ folder.step.1 = Sp
 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.5 = Exécution de calcul
+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
 
+
 type.document.requirements   = Cahier des charges
 type.document.specification  = Document de spécification
 type.document.design         = Document de conception
@@ -35,6 +34,8 @@ type.document.loads          = Conditions de calcul
 type.document.script         = Script d''exécution
 type.document.log            = Log d''exécution
 type.document.results        = Résultats de calcul
+type.document.resultsMeca    = Résultats de calcul MECA
+type.document.resultsSyrthes = Résultats de calcul Syrthes
 type.document.report         = Rapport final
 type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu

diff --git a/Workspace/Siman-WS/src/som_en.properties b/Workspace/Siman-WS/src/som_en.properties
index 635b313f9ec56933a433f19f75c258ba7a6a3148..56aa51669ab7fc68f11bf757a2de5526e011a578 100644 (file)
--- a/Workspace/Siman-WS/src/som_en.properties
+++ b/Workspace/Siman-WS/src/som_en.properties
@@ -8,8 +8,7 @@ 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.5   = Execute the calculation
+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
@@ -19,13 +18,13 @@ 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.5 = Calculation execution
+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
 
+
 type.document.requirements   = Customer requirements
 type.document.specification  = Specification document
 type.document.design         = Design document
@@ -35,6 +34,8 @@ type.document.loads          = Boundary conditions
 type.document.script         = Execution script
 type.document.log            = Execution log
 type.document.results        = Calculation results
+type.document.resultsMeca    = MECA calculation results
+type.document.resultsSyrthes = Syrthes calculation results
 type.document.report         = Final report
 type.document.memorandum     = Technical report
 type.document.minutes        = Minute meeting

diff --git a/Workspace/Siman/WebContent/conf/som.xml b/Workspace/Siman/WebContent/conf/som.xml
index ff38e554d9422532e9ef36dc88506c441b87c7c8..3115e34adcd64cff175b84bb0979bb4f376260f5 100644 (file)
--- a/Workspace/Siman/WebContent/conf/som.xml
+++ b/Workspace/Siman/WebContent/conf/som.xml
@@ -256,6 +256,7 @@
         <step number="5"> <!-- execute the calculations -->
                <mapping extension="med"    type="model"/>
                <mapping extension="model"  type="loads"/>
+            <mapping extension="py"     type="loads"/>
         </step>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>

diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index aa8933f61d0f6b61e7eb0b9e9f09125da251ebb5..b2fb6ba9e5a8a457b08317d78d98730abb703e63 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 046f024e3ef6eb7b8d43ccce9a36419af299e8f5..067fff1be0c50832f913998dae12a2461ec66d65 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/build-war.bat b/Workspace/Siman/build-war.bat
index 6d5cc34eb9c2c48a330b4a8828020f98f4b83f91..fa1d7690caf4330c43480250f524bef72d8adeed 100644 (file)
--- a/Workspace/Siman/build-war.bat
+++ b/Workspace/Siman/build-war.bat
@@ -3,10 +3,10 @@ set JAVA_HOME=D:\Program Files\Java\jdk1.6.0_27
 
 set PATH=%PATH%;%ANT_BIN%
 
-call ant prepare-cea
-#call ant prepare-edf
+#call ant prepare-cea
+call ant prepare-edf
 
-call ant prepare-postgres
-#call ant prepare-mysql
+#call ant prepare-postgres
+call ant prepare-mysql
 
 ant -f pre_build.xml && ant build-war

diff --git a/Workspace/Siman/build-war.sh b/Workspace/Siman/build-war.sh
index 8a96b28109714715f7982e97a759219e6b90e8f8..492110c9e6cb109d95c9efe3b6ed69aafb0cea30 100755 (executable)
--- a/Workspace/Siman/build-war.sh
+++ b/Workspace/Siman/build-war.sh
@@ -7,10 +7,10 @@ export JAVA_HOME=/usr/java/jdk1.6.0_37
 
 export PATH=${ANT_BIN}:${JAVA_HOME}/bin:${PATH}
 
-ant prepare-cea
-#ant prepare-edf
+#ant prepare-cea
+ant prepare-edf
 
-ant prepare-postgres
-#ant prepare-mysql
+#ant prepare-postgres
+ant prepare-mysql
 
 ant -f pre_build.xml && ant build-war

diff --git a/Workspace/Siman/conf/debug.properties b/Workspace/Siman/conf/debug.properties
index 997c048b8bae6569d50f44e284fc6219cddc5b4b..e8466835f8eb437087faed838c20e5200f72d1fd 100644 (file)
--- a/Workspace/Siman/conf/debug.properties
+++ b/Workspace/Siman/conf/debug.properties
@@ -1,12 +1,12 @@
 # Connection properties
-connection.url=jdbc:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties

diff --git a/Workspace/Siman/conf/release.properties b/Workspace/Siman/conf/release.properties
index e849ecb95a394e5f27651baa9b24a4dd0f13f947..88555e30a4443b3bfd99026b483f98fdd433126a 100644 (file)
--- a/Workspace/Siman/conf/release.properties
+++ b/Workspace/Siman/conf/release.properties
@@ -1,13 +1,13 @@
 # Connection properties
-connection.url=jdbc:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 #hibernate.hbm2ddl.auto=validate
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties

diff --git a/Workspace/Siman/src/hibernate.properties b/Workspace/Siman/src/hibernate.properties
index be4f5875284dbfb6f1e7ed016ab6a1a1eabeaccd..2efac10560802a97bcffa780478a1fe0bdd7cd59 100644 (file)
--- a/Workspace/Siman/src/hibernate.properties
+++ b/Workspace/Siman/src/hibernate.properties
@@ -1,11 +1,11 @@
-# Generated at 25/12/2012 03:58:17
-# Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates.
+# Generated at 10/07/2013 07:14:30
+# Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman/conf/templates.
 # Connection properties
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
-hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.current_session_context_class=thread
 
 # Log properties

diff --git a/Workspace/Siman/src/jdbc.properties b/Workspace/Siman/src/jdbc.properties
index a1fb94421edf9dc84bc269bafb8661a820304328..a91d722405f0b6a00b5679b7a8c0c63fb16e1e2e 100644 (file)
--- a/Workspace/Siman/src/jdbc.properties
+++ b/Workspace/Siman/src/jdbc.properties
@@ -1,7 +1,7 @@
-# Generated at 25/12/2012 03:58:17
-# Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates.
+# Generated at 10/07/2013 07:14:30
+# Don't edit manually. See the source in /data/SIMAN/SIMAN_SRC/Workspace/Siman/conf/templates.
 # Connection properties
-connection.url=jdbc:mysql://localhost/simer
+connection.url=jdbc:postgresql://localhost:5432/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.mysql.jdbc.Driver
+connection.driver_class=org.postgresql.Driver

diff --git a/Workspace/Siman/src/som.properties b/Workspace/Siman/src/som.properties
index 20bc72059c848a151cb9b1d12b181c30110feff1..fb563dc11e06bd2dfe8c620a777dd08afa26a55b 100644 (file)
--- a/Workspace/Siman/src/som.properties
+++ b/Workspace/Siman/src/som.properties
@@ -8,8 +8,7 @@ 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.5   = Effectuer le calcul
+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
@@ -19,13 +18,13 @@ folder.step.1 = Sp
 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.5 = Exécution de calcul
+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
 
+
 type.document.requirements   = Cahier des charges
 type.document.specification  = Document de spécification
 type.document.design         = Document de conception
@@ -35,6 +34,8 @@ type.document.loads          = Conditions de calcul
 type.document.script         = Script d''exécution
 type.document.log            = Log d''exécution
 type.document.results        = Résultats de calcul
+type.document.resultsMeca    = Résultats de calcul MECA
+type.document.resultsSyrthes = Résultats de calcul Syrthes
 type.document.report         = Rapport final
 type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu

diff --git a/Workspace/Siman/src/som_en.properties b/Workspace/Siman/src/som_en.properties
index 635b313f9ec56933a433f19f75c258ba7a6a3148..56aa51669ab7fc68f11bf757a2de5526e011a578 100644 (file)
--- a/Workspace/Siman/src/som_en.properties
+++ b/Workspace/Siman/src/som_en.properties
@@ -8,8 +8,7 @@ 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.5   = Execute the calculation
+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
@@ -19,13 +18,13 @@ 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.5 = Calculation execution
+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
 
+
 type.document.requirements   = Customer requirements
 type.document.specification  = Specification document
 type.document.design         = Design document
@@ -35,6 +34,8 @@ type.document.loads          = Boundary conditions
 type.document.script         = Execution script
 type.document.log            = Execution log
 type.document.results        = Calculation results
+type.document.resultsMeca    = MECA calculation results
+type.document.resultsSyrthes = Syrthes calculation results
 type.document.report         = Final report
 type.document.memorandum     = Technical report
 type.document.minutes        = Minute meeting