From: bri Date: Wed, 10 Jul 2013 15:22:57 +0000 (+0000) Subject: updated scripts X-Git-Tag: Delivery_V1_0_2013_07_12~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=644c3c0a9fdf1619d4496388d81e4ad0ada51897;p=tools%2Fsiman.git updated scripts --- diff --git a/Workspace/Siman-WS/build-war.bat b/Workspace/Siman-WS/build-war.bat index 6d5cc34..fa1d769 100644 --- 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 8a96b28..492110c 100755 --- 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 997c048..e846683 100644 --- 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 e849ecb..88555e3 100644 --- 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 250f981..4d5b37a 100644 --- 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 614bb8f..b11f196 100644 --- 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 72e0a49..bef234b 100644 --- a/Workspace/Siman-WS/src/log4j.xml +++ b/Workspace/Siman-WS/src/log4j.xml @@ -3,8 +3,8 @@ - - + + @@ -54,14 +54,6 @@ - - - - - - - - diff --git a/Workspace/Siman-WS/src/som.properties b/Workspace/Siman-WS/src/som.properties index 20bc720..fb563dc 100644 --- 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 635b313..56aa516 100644 --- 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 ff38e55..3115e34 100644 --- a/Workspace/Siman/WebContent/conf/som.xml +++ b/Workspace/Siman/WebContent/conf/som.xml @@ -256,6 +256,7 @@ + diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar index aa8933f..b2fb6ba 100644 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 046f024..067fff1 100644 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 6d5cc34..fa1d769 100644 --- 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 8a96b28..492110c 100755 --- 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 997c048..e846683 100644 --- 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 e849ecb..88555e3 100644 --- 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 be4f587..2efac10 100644 --- 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 a1fb944..a91d722 100644 --- 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 20bc720..fb563dc 100644 --- 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 635b313..56aa516 100644 --- 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