Author: echatellier Date: 2012-10-31 11:36:16 +0100 (Wed, 31 Oct 2012) New Revision: 3803 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3803 Log: refs #654: Update to svnkit 1.7.6 refs #1257: Update to h2 1.3.168 refs #1258: Update to topia 2.7 refs #1259: Update to slf4j 1.7.2 refs #1260: Update to nuiton-utils 2.6.3 fixes #1661: Update to commons-io 2.4 fixes #1662: Update to jsch 0.1.49 fixes #1663: Update to swingx 1.6.4 fixes #1665: Update to jaxx 2.5.6 fixes #1666: Update to eugene 2.5 fixes #1667: Update to nuiton-i18n 2.5 Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/pom.xml 2012-10-31 10:36:16 UTC (rev 3803) @@ -167,7 +167,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.3</version> + <version>2.4</version> </dependency> <dependency> @@ -205,14 +205,14 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.5</version> + <version>1.7.2</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.5</version> + <version>1.7.2</version> <scope>runtime</scope> </dependency> @@ -253,14 +253,14 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.48</version> + <version>0.1.49</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <scope>compile</scope> </dependency> @@ -268,7 +268,7 @@ <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>1.1.1</version> + <version>1.1.4</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -286,7 +286,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.167</version> + <version>1.3.168</version> <scope>compile</scope> </dependency> @@ -373,7 +373,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.5</version> + <version>1.7.6</version> <scope>compile</scope> </dependency> <!-- fin svnkit pour communication subversion --> @@ -524,12 +524,12 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Dependencies version --> - <jaxxVersion>2.4.2</jaxxVersion> - <eugeneVersion>2.4.2</eugeneVersion> - <topiaVersion>2.6.13</topiaVersion> + <jaxxVersion>2.5.6</jaxxVersion> + <eugeneVersion>2.5</eugeneVersion> + <topiaVersion>2.7</topiaVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> @@ -556,19 +556,19 @@ <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> <plugin> @@ -625,25 +625,13 @@ </dependency> </dependencies> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java16-sun</artifactId> - <version>1.10</version> - </signature> - </configuration> - </plugin> </plugins> </pluginManagement> <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>eugene-generation</id> @@ -656,7 +644,7 @@ <templates>org.nuiton.topia.generator.TopiaMetaTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -672,7 +660,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> @@ -689,7 +677,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <entries> <entry> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -57,7 +57,6 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.util.FileUtil; import org.nuiton.util.Version; import org.nuiton.widget.SwingSession; @@ -640,7 +639,7 @@ // using non recompiled script due to dependency changes // this is the better solution found : // remove isis build directory - FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); + FileUtils.deleteQuietly(IsisFish.config.getCompileDirectory()); ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -33,9 +33,9 @@ import java.util.List; import java.util.regex.Pattern; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.nuiton.util.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; @@ -192,7 +192,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } public void exportRule(File file, String name, boolean force) throws Exception { @@ -204,7 +204,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } public void exportScript(File file, String name, boolean force) throws Exception { @@ -216,7 +216,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } public void exportExport(File file, String name, boolean force) throws Exception { @@ -228,7 +228,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } public void exportSimulator(File file, String name, boolean force) throws Exception { @@ -240,7 +240,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } public void exportFormula(File file, String category, String name, boolean force) throws Exception { @@ -252,7 +252,7 @@ throw new IllegalArgumentException(_("could not found %s", name)); } String content = storage.getContent(); - FileUtil.writeString(file, content); + FileUtils.writeStringToFile(file, content); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -29,7 +29,7 @@ import java.io.File; -import org.nuiton.util.FileUtil; +import org.apache.commons.io.FileUtils; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.SimulationPlanStorage; @@ -64,7 +64,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } @@ -74,7 +74,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } @@ -84,7 +84,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } @@ -94,7 +94,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } @@ -104,7 +104,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } @@ -117,7 +117,7 @@ if(!force && storage.exists()) { throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); storage.setContent(content); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -31,10 +31,10 @@ import java.io.FileInputStream; import java.util.Properties; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig.Action.Step; -import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisConfig; @@ -144,7 +144,7 @@ //simulation.getStorage().closeContext(); String simulationPrescriptContent = null; if (simulationPrescript != null && simulationPrescript.canRead()) { - simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); + simulationPrescriptContent = FileUtils.readFileToString(simulationPrescript); } SimulationControl control = new SimulationControl(name); @@ -224,7 +224,7 @@ //simulation.getStorage().closeContext(); String simulationPrescriptContent = null; if (simulationPrescript != null && simulationPrescript.canRead()) { - simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); + simulationPrescriptContent = FileUtils.readFileToString(simulationPrescript); } SimulationControl control = new SimulationControl(name); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.io.FileUtils; import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; @@ -200,7 +201,7 @@ content = ""; } else { try { - content = FileUtil.readAsString(getFile()); + content = FileUtils.readFileToString(getFile()); lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } catch (IOException eee) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,17 +32,17 @@ import java.util.List; import java.util.Properties; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.IsisFish; /** * Class abstraite dont herite tous les storages qui on besoin d'un TopiaContext @@ -280,7 +280,7 @@ if (file.equals(getDataBackupFile())) { backupFile = target; } - FileUtil.copy(file, target); + FileUtils.copyFile(file, target); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -33,13 +33,13 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.vcs.VCSException; import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; import java.io.File; @@ -106,7 +106,7 @@ public String getCommentForNextCommit() throws IOException { commentForNextCommitFile.createNewFile(); String result; - result = FileUtil.readAsString(commentForNextCommitFile); + result = FileUtils.readFileToString(commentForNextCommitFile); return result; } @@ -116,7 +116,7 @@ */ public void setCommentForNextCommit(String commentForNextCommit) throws IOException { commentForNextCommitFile.createNewFile(); - FileUtil.writeString(commentForNextCommitFile, commentForNextCommit); + FileUtils.writeStringToFile(commentForNextCommitFile, commentForNextCommit); } /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -37,6 +37,7 @@ import java.util.Properties; import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -767,7 +768,7 @@ // we must prepare storage (no file found) prepare(); } - FileUtil.copy(getDataBackupFile(), file1); + FileUtils.copyFile(getDataBackupFile(), file1); // zip it File zipRegion = new File(tmpDir, "extractedRegion.zip"); @@ -783,7 +784,7 @@ } catch (TopiaException ex) { throw new StorageException("Can't extract region", ex); } finally { - if (tmpDir != null && !FileUtil.deleteRecursively(tmpDir)) { + if (tmpDir != null && !FileUtils.deleteQuietly(tmpDir)) { log.warn(_("isisfish.error.delete.file", tmpDir)); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -318,7 +319,7 @@ //TODO There is a bug to fix ? some files are not deleted! // due to h2, storage need to be closed before deletion if (getFile().isDirectory()) { - FileUtil.deleteRecursively(getFile()); + FileUtils.deleteQuietly(getFile()); } else { getFile().delete(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -57,6 +57,7 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -174,7 +175,7 @@ ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream); BufferedWriter zipWriter = new BufferedWriter(new OutputStreamWriter(zipOutputStream)); zipOutputStream.putNextEntry(new ZipEntry(zipFile.getName())); - String content = FileUtil.readAsString(zipFile); + String content = FileUtils.readFileToString(zipFile); zipWriter.write(content); zipWriter.flush(); @@ -251,7 +252,7 @@ Transport.send(msg); if (tmpDirectory != null) { - if (!FileUtil.deleteRecursively(tmpDirectory)) { + if (!FileUtils.deleteQuietly(tmpDirectory)) { log.warn(_("isisfish.error.remove.directory", tmpDirectory)); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -36,6 +36,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -45,7 +46,6 @@ import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.FileUtil; import org.nuiton.util.ObjectUtil; import org.nuiton.util.StringUtil; @@ -115,7 +115,7 @@ SimulationStorage storage = SimulationStorage.getSimulation(id); storage.closeStorage(); - FileUtil.deleteRecursively(storage.getFile()); + FileUtils.deleteQuietly(storage.getFile()); } if (log.isDebugEnabled()) { @@ -479,7 +479,7 @@ if (log.isDebugEnabled()) { log.debug("Delete simulation build directory : " + simulationBuildDirectory.getAbsolutePath()); } - FileUtil.deleteRecursively(simulationBuildDirectory); + FileUtils.deleteQuietly(simulationBuildDirectory); // context is used in TraceAspect.printStatistiqueAndClear() SimulationContext.remove(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -44,7 +44,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.nuiton.util.MD5InputStream; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; @@ -404,7 +403,7 @@ if (md5ControlFile != null) { control.setText(_("isisfish.simulation.remote.message.downloadresults")); - String md5sum = FileUtil.readAsString(md5ControlFile); + String md5sum = FileUtils.readFileToString(md5ControlFile); if (log.isDebugEnabled()) { log.debug("MD5 Control file have been downloaded : " + md5ControlFile.getAbsolutePath()); @@ -967,7 +966,7 @@ File tempPreScriptFile = File.createTempFile("simulation-" + simulationId + "-prescript", ".bsh"); tempPreScriptFile.deleteOnExit(); - FileUtil.writeString(tempPreScriptFile, simulationPreScript); + FileUtils.writeStringToFile(tempPreScriptFile, simulationPreScript, "utf-8"); // remote temp directory should have been created // by #uploadSimulation(Session, String) @@ -1061,7 +1060,7 @@ String fileContent = getSimulationScriptLaunchContent( QSUB_SCRIPT_TEMPLATE, simuationId, simulationZip, standaloneZip, simulationResultZip, preScriptPath, multipleSimulationScript); - FileUtil.writeString(tempScript, fileContent); + FileUtils.writeStringToFile(tempScript, fileContent, "utf-8"); return tempScript; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -52,6 +52,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.ConvertUtilsBean; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; @@ -95,7 +96,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.util.CompileHelper; @@ -1021,7 +1021,7 @@ sim.closeStorage(); // quoi qu'il arrive on supprime le repertoire temporaire - if (!FileUtil.deleteRecursively(tmpDirectory)) { + if (!FileUtils.deleteQuietly(tmpDirectory)) { log.warn(_("isisfish.error.remove.directory", tmpDirectory)); } @@ -1172,7 +1172,7 @@ if (!ruleFile.isFile()) { ruleFile = new File(RuleStorage.getCommunityRuleDirectory(), name + ".java"); } - FileUtil.copy(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + FileUtils.copyFile(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); } @@ -1182,7 +1182,7 @@ if (!ruleFile.isFile()) { ruleFile = new File(RuleStorage.getCommunityRuleDirectory(), name + ".java"); } - FileUtil.copy(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + FileUtils.copyFile(ruleFile, new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); } @@ -1194,7 +1194,7 @@ if (!planFile.isFile()) { planFile = new File(SimulationPlanStorage.getCommunitySimulationPlanDirectory(), name + ".java"); } - FileUtil.copy(planFile, new File(tmpDirectory, SimulationPlanStorage.SIMULATION_PLAN_PATH + FileUtils.copyFile(planFile, new File(tmpDirectory, SimulationPlanStorage.SIMULATION_PLAN_PATH + File.separator + name + ".java")); } @@ -1205,7 +1205,7 @@ if (!exportFile.isFile()) { exportFile = new File(ExportStorage.getCommunityExportDirectory(), name); } - FileUtil.copy(exportFile, + FileUtils.copyFile(exportFile, new File(tmpDirectory, ExportStorage.EXPORT_PATH + File.separator + name)); } @@ -1218,7 +1218,7 @@ if (!sensitivityFile.isFile()) { sensitivityFile = new File(SensitivityExportStorage.getCommunitySensitivityExportDirectory(), name); } - FileUtil.copy(sensitivityFile, + FileUtils.copyFile(sensitivityFile, new File(tmpDirectory, SensitivityExportStorage.SENSITIVITY_EXPORT_PATH + File.separator + name)); } @@ -1235,7 +1235,7 @@ if (!simulatorFile.isFile()) { simulatorFile = new File(SimulatorStorage.getCommunitySimulatorDirectory(), param.getSimulatorName()); } - FileUtil.copy(simulatorFile, new File(tmpDirectory, + FileUtils.copyFile(simulatorFile, new File(tmpDirectory, SimulatorStorage.SIMULATOR_PATH + File.separator + param.getSimulatorName())); @@ -1258,7 +1258,7 @@ ZipUtil.compress(result, tmpDirectory, null); // poussin 20071015: remove temp directory - if (!FileUtil.deleteRecursively(tmpDirectory)) { + if (!FileUtils.deleteQuietly(tmpDirectory)) { log.warn(_("isisfish.error.remove.directory", tmpDirectory)); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -38,10 +38,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -162,7 +162,7 @@ if (!StringUtils.isEmpty(simulationPrescript)) { tempPrescriptFile = File.createTempFile("isis", ".prescript"); tempPrescriptFile.deleteOnExit(); - FileUtil.writeString(tempPrescriptFile, simulationPrescript); + FileUtils.writeStringToFile(tempPrescriptFile, simulationPrescript, "utf-8"); } String java = System.getProperty("java.home") + File.separator + "bin" Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,12 +36,12 @@ import javax.swing.JScrollPane; import javax.swing.JTextPane; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.SensitivityExport; @@ -260,7 +260,7 @@ String simulResult=""; try{ - simulResult = FileUtil.readAsString(importFile); + simulResult = FileUtils.readFileToString(importFile); } catch (IOException ioe) { log.error ("An error occured trying to read a result file : " + ioe.getMessage()); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2012 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -35,6 +35,7 @@ import javax.swing.JOptionPane; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; @@ -64,12 +65,10 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO; -import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.SelectivityDAO; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.SpeciesDAO; import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.entities.TargetSpeciesDAO; import fr.ifremer.isisfish.entities.Zone; @@ -793,7 +792,7 @@ // copy map file File destMap = new File(destDir, filename); - FileUtil.copy(inputMap, destMap); + FileUtils.copyFile(inputMap, destMap); List<String> maps = fisheryRegion.getMapFileList(); maps.add(filename); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -971,7 +971,7 @@ log.info("Copying " + sourceFile.getName() + " to " + dst); } - FileUtil.copy(sourceFile, dst); + FileUtils.copyFile(sourceFile, dst); } } } catch (Exception ex) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2012 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -30,9 +30,9 @@ import java.io.IOException; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -133,7 +133,7 @@ if (log.isInfoEnabled()) { log.info("Copying " + src.getName() + " to " + dst); } - FileUtil.copy(src, dst); + FileUtils.copyFile(src, dst); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2012-10-31 10:36:16 UTC (rev 3803) @@ -28,7 +28,7 @@ java.io.File java.io.IOException javax.swing.ComboBoxModel - org.nuiton.util.FileUtil + org.apache.commons.io.FileUtils fr.ifremer.isisfish.datastore.SimulationStorage fr.ifremer.isisfish.simulator.launcher.SimulationService fr.ifremer.isisfish.simulator.launcher.SimulationJob @@ -111,7 +111,7 @@ for(File file : files) { content += "Fichier " + file.getName() + "\n"; content += "------------------------------\n"; - content += FileUtil.readAsString(file) + "\n"; + content += FileUtils.readFileToString(file) + "\n"; content += "\n"; } textAreaSensitivitySecondpassResult.setText(content); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -43,6 +43,7 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -87,7 +88,7 @@ List<File> result = new ArrayList<File>(); for (File src : srcDir.listFiles()) { File dest = new File(FileUtil.basename(src, ".java"), ".class"); - if (src.getName().endsWith(".java") && FileUtil.isNewer(src, dest)) { + if (src.getName().endsWith(".java") && FileUtils.isFileNewer(src, dest)) { result.add(src); } } @@ -142,7 +143,7 @@ File src = source.getFile(); File dst = new File(destDir, source.getFQN().replace('.', File.separatorChar) + ".class"); - if (force || FileUtil.isNewer(src, dst)) { + if (force || !dst.exists() || FileUtils.isFileNewer(src, dst)) { return compile(source.getRoot(), src, destDir, out); } return 0; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -39,12 +39,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; - /** * Permet d'evaluer les equations ecritent en Java * @@ -145,7 +143,7 @@ if (fileSrc.exists() && fileCheckSum.exists()) { String oldCheckSum = ""; try { - oldCheckSum = FileUtil.readAsString(fileCheckSum); + oldCheckSum = FileUtils.readFileToString(fileCheckSum); } catch (IOException eee) { log.info("Can't read old checkSum: " + fileCheckSum, eee); } @@ -161,19 +159,19 @@ try { // force writing to UTF-8 // fix compilation issue : unmappable characters - FileUtil.writeString(fileSrc, content, "utf-8"); + FileUtils.writeStringToFile(fileSrc, content, "utf-8"); } catch (IOException zzz) { throw new IsisFishRuntimeException(_("isisfish.error.save.script.compilation", fileSrc), zzz); } try { - FileUtil.writeString(fileCheckSum, Integer.toString(script.hashCode())); + FileUtils.writeStringToFile(fileCheckSum, Integer.toString(script.hashCode()), "utf-8"); } catch (IOException zzz) { throw new IsisFishRuntimeException(_("isisfish.error.save.checkSum.compilation", fileSrc), zzz); } } // if Java file is newer than class file, compile java file - if (FileUtil.isNewer(fileSrc, fileDest)) { + if (!fileDest.exists() || FileUtils.isFileNewer(fileSrc, fileDest)) { try { // does'nt contains isisdatabase-3 directory //int compileResult = CompileHelper.compile(fileRootSrc, fileSrc, fileRootSrc, null); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -82,7 +83,7 @@ File dst = new File(destDir, source.getFQN().replace('.', File.separatorChar) + ".html"); int result = 0; - if (force || FileUtil.isNewer(src, dst)) { + if (force || !dst.exists() || FileUtils.isFileNewer(src, dst)) { result = generateJavadoc(source.getRoot(), src, destDir, out); } return result; Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-10-31 10:36:16 UTC (rev 3803) @@ -1,3 +1,4 @@ += Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-10-31 10:36:16 UTC (rev 3803) @@ -1,3 +1,4 @@ += Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -137,7 +137,7 @@ public static void clean() { System.clearProperty("user.home"); if (dirIsisBase != null) { - FileUtil.deleteRecursively(dirIsisBase); + FileUtils.deleteQuietly(dirIsisBase); dirIsisBase = null; } } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; -import org.nuiton.util.FileUtil; +import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -84,7 +84,7 @@ //System.out.println("Content: '" + script.getContent() + "'"); Assert.assertEquals(content1, script.getContent()); - FileUtil.writeString(script.getFile(), content2); + FileUtils.writeStringToFile(script.getFile(), content2); //System.out.println("Content: '" + script.getContent() + "'"); Assert.assertEquals(content2, script.getContent()); } finally { Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -31,6 +31,7 @@ import junit.framework.Assert; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.Level; @@ -129,7 +130,7 @@ File logFile = new File(loggerFile); - String logFileContent = FileUtil.readAsString(logFile); + String logFileContent = FileUtils.readFileToString(logFile); log.info("++ File content ----------------------------------------------------------"); for (Object o : logFileContent.split("\n")) { @@ -232,7 +233,7 @@ File logFile = new File(loggerFile); - String logFileContent = FileUtil.readAsString(logFile); + String logFileContent = FileUtils.readFileToString(logFile); log.info("++ File content ----------------------------------------------------------"); for (Object o : logFileContent.split("\n")) { Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -108,7 +109,7 @@ File f = File.createTempFile("testCompile", ".java", getTestDirectory()); String filename = FileUtil.basename(f, ".java"); String code = getFirstClassContent(filename); - FileUtil.writeString(f, code); + FileUtils.writeStringToFile(f, code); List<File> classpath = new ArrayList<File>(); classpath.add(f.getParentFile()); @@ -141,12 +142,12 @@ File fA = File.createTempFile("testCompileA", ".java", getTestDirectory()); String filenameA = FileUtil.basename(fA, ".java"); String codeA = getFirstClassContent(filenameA); - FileUtil.writeString(fA, codeA); + FileUtils.writeStringToFile(fA, codeA); File fB = File.createTempFile("testCompileB", ".java", getTestDirectory()); String filenameB = FileUtil.basename(fB, ".java"); String codeB = getSecondClassContent(filenameB, filenameA); - FileUtil.writeString(fB, codeB); + FileUtils.writeStringToFile(fB, codeB); File dest = new File(fB.getParentFile(), "testCompile"); @@ -179,7 +180,7 @@ fclassB.delete(); fA.delete(); fB.delete(); - FileUtil.deleteRecursively(dest); + FileUtils.deleteQuietly(dest); } /** Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2012-10-30 16:02:36 UTC (rev 3802) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2012-10-31 10:36:16 UTC (rev 3803) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 Ifremer, Code Lutin + * Copyright (C) 2008 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.nuiton.util.Version; import org.junit.After; import org.junit.Assert; @@ -126,7 +126,7 @@ + File.separator + "data").mkdirs(); new File(template, "scripts").mkdirs(); - FileUtil.writeString(new File(template, "scripts" + File.separator + FileUtils.writeStringToFile(new File(template, "scripts" + File.separator + "version.txt"), FILECONTENTTAG); // creation du repo pour les tests @@ -166,16 +166,16 @@ public void tearDown() { // un peu de nettoyage if (template.exists()) { - FileUtil.deleteRecursively(template); + FileUtils.deleteQuietly(template); } if (remoteRepo.exists()) { - FileUtil.deleteRecursively(remoteRepo); + FileUtils.deleteQuietly(remoteRepo); } if (localRepo.exists()) { - FileUtil.deleteRecursively(localRepo); + FileUtils.deleteQuietly(localRepo); } if (localRepoTrunk.exists()) { - FileUtil.deleteRecursively(localRepoTrunk); + FileUtils.deleteQuietly(localRepoTrunk); } } @@ -297,12 +297,12 @@ File version = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); Assert.assertTrue(version.exists()); - Assert.assertEquals(FILECONTENTTAG, FileUtil.readAsString(version)); + Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version)); // modification du fichier version.txt - FileUtil.writeString(version, FILECONTENTTRUNK); + FileUtils.writeStringToFile(version, FILECONTENTTRUNK); vcs.commit(null, "modif du fichier version"); - Assert.assertEquals(FILECONTENTTRUNK, FileUtil.readAsString(version)); + Assert.assertEquals(FILECONTENTTRUNK, FileUtils.readFileToString(version)); // recuperation de DemoRegion File demo = new File(vcs.getLocalRepository(), "regions" @@ -317,13 +317,13 @@ // ajout d'un fichier sur le trunk avant passage sur le tag File fileToAdd = new File(vcs.getLocalRepository(), "newfile.txt"); String lecontent = "Le nouveau fichier"; - FileUtil.writeString(fileToAdd, lecontent); + FileUtils.writeStringToFile(fileToAdd, lecontent); vcs.add(Arrays.asList(fileToAdd), "ajout d'un fichier"); // test switchTag vcs.setTag(new Version(3, 1, 0)); Assert.assertTrue(vcs.getTag().startsWith("/tags/3.1.0")); - Assert.assertEquals(FILECONTENTTAG, FileUtil.readAsString(version)); + Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version)); Assert.assertTrue(demo.exists()); // recherche du status des fichiers @@ -340,7 +340,7 @@ Assert.assertTrue(map.containsKey(newfileAdded)); // modif dans repo trunk de version pour qu'il y ait un conflit - FileUtil.writeString(fileVersion, "Le nouveau content de version"); + FileUtils.writeStringToFile(fileVersion, "Le nouveau content de version"); // update global du repo trunk List<File> conflictFile = trunk.update(null, true); @@ -351,7 +351,7 @@ Assert.assertTrue(conflictFile.contains(fileVersion)); File fileAdded = new File(trunk.getLocalRepository(), "newfile.txt"); - Assert.assertEquals(lecontent, FileUtil.readAsString(fileAdded)); + Assert.assertEquals(lecontent, FileUtils.readFileToString(fileAdded)); Assert.assertFalse(fileDeleted.exists()); // recherche du status des fichiers en remote, il ne doit plus y avoir de diff @@ -396,7 +396,7 @@ // now, make a modification, on LOCAL repo File firstFile = new File(vcs.getLocalRepository() + File.separator + "scripts" + File.separator + "version.txt"); - FileUtil.writeString(firstFile, "Version 3.2.1"); + FileUtils.writeStringToFile(firstFile, "Version 3.2.1"); List<File> files = Collections.singletonList(firstFile); @@ -461,8 +461,8 @@ vcs.checkout(null, true); // now, make a modification, on LOCAL repo - FileUtil.writeString(firstFile, "version 3.2.1"); - FileUtil.writeString(secondFile, "name = test1"); + FileUtils.writeStringToFile(firstFile, "version 3.2.1"); + FileUtils.writeStringToFile(secondFile, "name = test1"); SVNClientManager svnManager = SVNClientManager.newInstance(); svnManager.getWCClient().doAdd(secondFile, // File path true, // boolean force @@ -503,7 +503,7 @@ vcs.checkout(null, true); // now, make a modification, on LOCAL repo - FileUtil.writeString(firstFile, "Version 3.2.1"); + FileUtils.writeStringToFile(firstFile, "Version 3.2.1"); String result = vcs.getDiff(firstFile); @@ -862,7 +862,7 @@ // modif on local repo File file = new File(vcs.getLocalRepository() + File.separator + "test.txt"); - FileUtil.writeString(file, "name = test1"); + FileUtils.writeStringToFile(file, "name = test1"); SVNClientManager svnManager = SVNClientManager.newInstance(); svnManager.getWCClient().doAdd(file, // File path true, // boolean force @@ -936,7 +936,7 @@ // modif on local repo File file = new File(vcs.getLocalRepository() + File.separator + "test.txt"); - FileUtil.writeString(file, "name = test1"); + FileUtils.writeStringToFile(file, "name = test1"); SVNClientManager svnManager = SVNClientManager.newInstance(); svnManager.getWCClient().doAdd(file, // File path true, // boolean force @@ -1011,7 +1011,7 @@ // modif on remote repo File file = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file, "aaaaaz"); + FileUtils.writeStringToFile(file, "aaaaaz"); SVNClientManager svnManager = SVNClientManager.newInstance(); SVNCommitInfo rev = svnManager.getCommitClient().doCommit( new File[] { file },// File[] paths, @@ -1081,7 +1081,7 @@ // modif on remote repo File file = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file, "aaaaaz"); + FileUtils.writeStringToFile(file, "aaaaaz"); SVNClientManager svnManager = SVNClientManager.newInstance(); SVNCommitInfo rev = svnManager.getCommitClient().doCommit( new File[] { file },// File[] paths, @@ -1110,7 +1110,7 @@ // modify one file File file2 = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file2, "oooooo"); + FileUtils.writeStringToFile(file2, "oooooo"); // try to update... List<File> filesInConflict = vcs.update(null, true); @@ -1147,7 +1147,7 @@ // modif on remote repo on tag :) File file = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file, "aaaaaz"); + FileUtils.writeStringToFile(file, "aaaaaz"); SVNClientManager svnManager = SVNClientManager.newInstance(); SVNCommitInfo rev = svnManager.getCommitClient().doCommit( new File[] { file },// File[] paths, @@ -1168,7 +1168,7 @@ // modify one file File file2 = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file2, "oooooo"); + FileUtils.writeStringToFile(file2, "oooooo"); // try to update... List<File> filesInConflict = vcs.setTag(new Version(3, 1, 0)); @@ -1205,7 +1205,7 @@ // modif on remote repo File file = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file, "aaaaaz"); + FileUtils.writeStringToFile(file, "aaaaaz"); SVNClientManager svnManager = SVNClientManager.newInstance(); SVNCommitInfo rev = svnManager.getCommitClient().doCommit( new File[] { file },// File[] paths, @@ -1234,7 +1234,7 @@ // modify one file File file2 = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file2, "oooooo"); + FileUtils.writeStringToFile(file2, "oooooo"); // try to update... List<File> filesInConflict = vcs.checkFileStatus(); @@ -1274,7 +1274,7 @@ // modif on remote repo File file = new File(vcs.getLocalRepository(), "scripts" + File.separator + "version.txt"); - FileUtil.writeString(file, "modified content"); + FileUtils.writeStringToFile(file, "modified content"); Assert.assertEquals(Status.STATUS_MODIFIED, vcs.getLocalStatus(file)); }