This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d7d8bde03da9bd1ff95006241048501ddd0a37b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:29:30 2014 +0100 fixes #6106: [TECH] pouvoir spécifier le chemin de génération de l'export générique dans la configuration --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++++++ .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java | 6 ++++-- .../fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java | 6 ++++-- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 9 files changed, 32 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 15446ff..adc1faf 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -223,6 +223,10 @@ public class TuttiConfiguration extends ApplicationConfiguration { ApplicationIOUtil.forceMkdir( getReportBackupDirectory(), t("tutti.io.mkDir.error", getReportBackupDirectory())); + + ApplicationIOUtil.forceMkdir( + getExportBackupDirectory(), + t("tutti.io.mkDir.error", getExportBackupDirectory())); } public File newTempFile(String basename) { @@ -442,6 +446,12 @@ public class TuttiConfiguration extends ApplicationConfiguration { return result; } + /** @return {@link TuttiConfigurationOption#EXPORT_BACKUP_DIRECTORY} value */ + public File getExportBackupDirectory() { + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.EXPORT_BACKUP_DIRECTORY.getKey()); + } + + /** @return {@link TuttiConfigurationOption#REPORT_LOG_DIRECTORY} value */ public File getReportLogDirectory() { File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_DIRECTORY.getKey()); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index a8f6167..eeb15c0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -210,6 +210,13 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { File.class, false), + EXPORT_BACKUP_DIRECTORY( + "tutti.export.backup.directory", + n("tutti.config.option.export.backup.directory.description"), + "${tutti.data.directory}/exportbackup", + File.class, + false), + HIBERNATE_SHOW_SQL( "tutti.persistence.hibernate.showSql", n("tutti.config.option.persistence.hibernate.showSql.description"), diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index adbacf1..c074775 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -33,6 +33,7 @@ tutti.config.option.basedir.description= tutti.config.option.cruiseId.description= tutti.config.option.csv.separator.description= tutti.config.option.data.directory.description= +tutti.config.option.export.backup.directory.description= tutti.config.option.export.countryId.description= tutti.config.option.help.directory.description= tutti.config.option.i18n.directory.description= diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 30a0de2..34e0b1d 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -33,6 +33,7 @@ tutti.config.option.basedir.description=Répertoire principale tutti.config.option.cruiseId.description=Identifiant de la dernière campagne utilisée tutti.config.option.csv.separator.description=Caractère séparateur pour les import / export de fichier au format csv. tutti.config.option.data.directory.description=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). +tutti.config.option.export.backup.directory.description=Répertoire où sont enregistrées les exports génériques tutti.config.option.export.countryId.description=L'id du pays à utiliser pour les exports (il s'agit de la valeur LOCATION.ID). tutti.config.option.help.directory.description=Répertoire des fichiers d'aide tutti.config.option.i18n.directory.description=Répertoire des fichiers de traductions diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java index 1f483d2..532cfe4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.generic.TuttiExportService; @@ -32,6 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIHandler; import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import java.io.File; @@ -64,7 +64,9 @@ public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, Cruise cruise = getModel().getCruise(); // choose file to export - file = saveFile( + file = saveFileWithStartDirectory( + getConfig().getExportBackupDirectory(), + false, "exportCruise-" + cruise.getName(), "zip", t("tutti.selectCruise.title.choose.exportCruiseFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java index 4a9d3dc..09e7670 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -33,6 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIHandler; import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import java.io.File; import java.util.List; @@ -65,7 +65,9 @@ public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel if (doAction) { // choose file to export - file = saveFile( + file = saveFileWithStartDirectory( + getConfig().getExportBackupDirectory(), + false, "exportProgram-" + program.getName(), "zip", t("tutti.selectCruise.title.choose.exportProgramFile"), t("tutti.selectCruise.action.chooseProgramExportFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index dc01925..79b3565 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -277,6 +277,9 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY) .setOptionShortLabel(t("tutti.config.option.service.report.backup.directory.shortLabel")) + .addOption(TuttiConfigurationOption.EXPORT_BACKUP_DIRECTORY) + .setOptionShortLabel(t("tutti.config.option.service.export.backup.directory.shortLabel")) + .addOption(TuttiConfigurationOption.UPDATE_APPLICATION_URL) .setOptionShortLabel(t("tutti.config.option.update.application.url.shortLabel")) diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index d3cccbd..f8de42f 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -130,6 +130,7 @@ tutti.config.option.persistence.db.directory.shortLabel= tutti.config.option.persistence.db.enumerationPath.shortLabel= tutti.config.option.persistence.db.protocol.directory.shortLabel= tutti.config.option.persistence.jdbc.url.shortLabel= +tutti.config.option.service.export.backup.directory.shortLabel= tutti.config.option.service.report.backup.directory.shortLabel= tutti.config.option.service.report.directory.shortLabel= tutti.config.option.service.report.log.directory.shortLabel= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index eaaf1e9..b9c2f76 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -119,6 +119,7 @@ tutti.config.option.persistence.db.directory.shortLabel=Répertoire de la base d tutti.config.option.persistence.db.enumerationPath.shortLabel=Chemin vers le fichier constantes adagio tutti.config.option.persistence.db.protocol.directory.shortLabel=Répertoire des protocoles tutti.config.option.persistence.jdbc.url.shortLabel=Url jdbc de connexion +tutti.config.option.service.export.backup.directory.shortLabel=Répertoire des sauvegardes d'export générique tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport tutti.config.option.service.report.log.directory.shortLabel=Répertoire des log de génération des rapports -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.