branch develop updated (fa45238 -> bada55a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from fa45238 Fixes #8544 Merge branch 'feature/8544' into develop new bada55a Ajout d'une nouvelle option pour la sauvegarde de fin d'application (See #8544) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bada55aff88d06c617f62ce205591b94a5c8bd6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 19 17:09:09 2016 +0200 Ajout d'une nouvelle option pour la sauvegarde de fin d'application (See #8544) Summary of changes: .../swing/configuration/ObserveSwingApplicationConfigOption.java | 9 ++++++++- .../i18n/application-swing-configuration_en_GB.properties | 1 + .../i18n/application-swing-configuration_es_ES.properties | 5 +++-- .../i18n/application-swing-configuration_fr_FR.properties | 1 + .../application/swing/ObserveSwingApplicationContext.java | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit bada55aff88d06c617f62ce205591b94a5c8bd6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 19 17:09:09 2016 +0200 Ajout d'une nouvelle option pour la sauvegarde de fin d'application (See #8544) --- .../swing/configuration/ObserveSwingApplicationConfigOption.java | 9 ++++++++- .../i18n/application-swing-configuration_en_GB.properties | 1 + .../i18n/application-swing-configuration_es_ES.properties | 5 +++-- .../i18n/application-swing-configuration_fr_FR.properties | 1 + .../application/swing/ObserveSwingApplicationContext.java | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java index 0c5df74..6b53610 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java @@ -655,13 +655,20 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { n("observe.config.validation.speedMaxValue"), "30.0" ), - /** Pour activer les sauvegarde automatiques. */ + /** Pour activer les sauvegardes automatiques. */ BACKUP_USE( Boolean.class, "backup.use", n("observe.config.backup.use"), "true" ), + /** Pour effectuer une sauvegarde à la fermeture de l'application. */ + BACKUP_AT_CLOSE( + Boolean.class, + "backup.atClose", + n("observe.config.backup.atClose"), + "true" + ), /** Le nombre de minutes avant de lancer une sauvegarde de la base locale. */ BACKUP_DELAY( Integer.class, diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index ff9503d..a0a25e8 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -7,6 +7,7 @@ observe.action.commandline.launch.admin.ui=Launch an administration task observe.action.commandline.launch.h2.server.mode=Launch ObServe in server mode observe.action.commandline.launch.obstuna.admin.ui=Launch an adminstration task on obstuna observe.action.commandline.use.jmx=Add JMX support +observe.config.backup.atClose=Perform a backup of local source when closing application observe.config.backup.delay=Delay in minutes between local data source backup observe.config.backup.use=To activate auto backup of local source observe.config.configFileName.description=Configuration filename diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index 150d075..f85b4aa 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -7,8 +7,9 @@ observe.action.commandline.launch.admin.ui=Ejecutar una operación de administra observe.action.commandline.launch.h2.server.mode=Ejecutar ObServe en modo servidor observe.action.commandline.launch.obstuna.admin.ui=Ejecutar una operación de administración sobre Obstuna observe.action.commandline.use.jmx=Mostrar el soporte JMX -observe.config.backup.delay=Delay in minutes between local data source backup #TODO -observe.config.backup.use=To activate auto backup of local source #TODO +observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application \#TODO +observe.config.backup.delay=Delay in minutes between local data source backup \#TODO +observe.config.backup.use=To activate auto backup of local source \#TODO observe.config.configFileName.description=Nombre del archivo de configuración observe.config.db.locale=Idioma del referencial observe.config.defaultBackupDirectory.description=Carpeta por defecto para copia de seguridad de bases locales diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index fcc3cd3..5351e51 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -7,6 +7,7 @@ observe.action.commandline.launch.admin.ui=Lancer une opération d'administratio observe.action.commandline.launch.h2.server.mode=Lancer ObServe en mode serveur observe.action.commandline.launch.obstuna.admin.ui=Lancer une opération d'administration sur Obstuna observe.action.commandline.use.jmx=Ajouter le support JMX +observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application observe.config.backup.delay=Temps en minutes entre chaque sauvegarde de la base locale observe.config.backup.use=Pour activer la sauvegarde automatique observe.config.configFileName.description=Le nom du fichier de configuration diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java index 8bac9e7..9f9521d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java @@ -406,7 +406,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im log.info("Closing swing application context " + this); } - if (getConfig().isBackupUse()) { + if (getConfig().isBackupAtClose()) { try { getLocalDatabaseBackupTimer().submit(new LocalDatabaseBackupTask()).get(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm