This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 832ab3fcb4ca122e294cf1a214e2fb8f475351d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 1 16:42:50 2016 +0200 Ajout du répertoire temporaire dans la configuration --- .../java/fr/ifremer/echobase/config/EchoBaseConfiguration.java | 8 ++++++++ .../fr/ifremer/echobase/config/EchoBaseConfigurationOption.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 3af8af3..72d841a 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -122,6 +122,7 @@ public class EchoBaseConfiguration { } createDirectory(EchoBaseConfigurationOption.DATA_DIRECTORY); + createDirectory(EchoBaseConfigurationOption.TEMPORARY_DIRECTORY); try { FileUtils.forceMkdir(getLibDirectory()); } catch (IOException e) { @@ -181,6 +182,13 @@ public class EchoBaseConfiguration { return file; } + public File getTemporaryDirectory() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.TEMPORARY_DIRECTORY.key); + Preconditions.checkNotNull(file); + return file; + } + public File getWarLocation() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.WAR_LOCATION.key); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index c6812db..09918fc 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -50,6 +50,10 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.internal.db.directory.description"), "${echobase.data.directory}/internaldb", File.class), + TEMPORARY_DIRECTORY("echobase.data.temporary.directory", + n("echobase.config.data.temporary.directory.description"), + "${echobase.data.directory}/temp", + File.class), RSCRIPT_EXECTUABLE_PATH( "echobase.Rscript.executable.path", n("echobase.config.Rscript.executable.path.description"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.