Author: tchemit Date: 2013-03-09 08:57:31 +0100 (Sat, 09 Mar 2013) New Revision: 566 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/566 Log: add more methods to TuttiIOUtil Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-08 15:03:08 UTC (rev 565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-09 07:57:31 UTC (rev 566) @@ -70,6 +70,29 @@ } } + public static void cleanDirectory(File dir, String errorMessage) { + try { + FileUtils.cleanDirectory(dir); + } catch (IOException e) { + throw new TuttiTechnicalException(errorMessage, e); + } + } + + public static void deleteDirectory(File dir, String errorMessage) { + try { + FileUtils.deleteDirectory(dir); + } catch (IOException e) { + throw new TuttiTechnicalException(errorMessage, e); + } + } + public static void forceDeleteOnExit(File dir, String errorMessage) { + try { + FileUtils.forceDeleteOnExit(dir); + } catch (IOException e) { + throw new TuttiTechnicalException(errorMessage, e); + } + } + public static void copyDirectory(File source, File target, String errorMessage) { try { FileUtils.copyDirectory(source, target); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-03-08 15:03:08 UTC (rev 565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-03-09 07:57:31 UTC (rev 566) @@ -24,13 +24,12 @@ * #L% */ +import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; -import org.apache.commons.io.FileUtils; import org.nuiton.util.Version; import org.nuiton.util.config.ApplicationConfig; import java.io.File; -import java.io.IOException; import java.net.URL; /** @@ -103,16 +102,26 @@ } public char getCsvSeparator() { - return applicationConfig.getOption(TuttiServiceConfigOption.CSV_SEPARATOR.getKey()).charAt(0); + return applicationConfig.getOption( + TuttiServiceConfigOption.CSV_SEPARATOR.getKey()).charAt(0); } - public void prepareDirectories() throws IOException { + public void prepareDirectories() { - FileUtils.forceMkdir(getDataDirectory()); + File dataDirectory = getDataDirectory(); + TuttiIOUtil.forceMkdir( + dataDirectory, + "Could not create data directory " + dataDirectory); + File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - FileUtils.deleteDirectory(tmpDirectory); + + TuttiIOUtil.deleteDirectory( + tmpDirectory, + "Could not delete temp directory " + tmpDirectory); } - FileUtils.forceMkdir(tmpDirectory); + TuttiIOUtil.forceMkdir( + tmpDirectory, + "Could not create temp directory " + tmpDirectory); } }