December 2012 - Isis-fish-commits - mailman.cloud.codelutin.com

r3809 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 19 Dec '12

19 Dec '12

Author: echatellier Date: 2012-12-19 15:00:54 +0100 (Wed, 19 Dec 2012) New Revision: 3809 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3809 Log: Close each simulation after simulation ends (for plan). Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2012-12-18 09:20:23 UTC (rev 3808) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2012-12-19 14:00:54 UTC (rev 3809) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -249,6 +250,14 @@ if (!subControl.isStopSimulationRequest()) { SimulationStorage simulation = subjob.getLauncher().getSimulationStorage(simulationService, subControl); i.finished(subjob, simulation); + try { + simulation.closeStorage(); + simulation.closeMemStorage(); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close simulation", ex); + } + } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2012-12-18 09:20:23 UTC (rev 3808) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2012-12-19 14:00:54 UTC (rev 3809) @@ -53,6 +53,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationInformation; @@ -626,6 +627,15 @@ analyzeSensitivityResult(job, simulation); } } + + try { + simulation.closeStorage(); + simulation.closeMemStorage(); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close simulation", ex); + } + } } else { // allow simulation to restart to be properly removed

1 0

r3808 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 18 Dec '12

18 Dec '12

Author: echatellier Date: 2012-12-18 10:20:23 +0100 (Tue, 18 Dec 2012) New Revision: 3808 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3808 Log: Force resultStorage close when closing simulationStorage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-12-17 15:27:27 UTC (rev 3807) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-12-18 09:20:23 UTC (rev 3808) @@ -111,6 +111,16 @@ setParameter(parameter); } + @Override + public void closeStorage() throws TopiaException { + // force result storage close + if (resultStorage != null) { + resultStorage.close(); + resultStorage = null; + } + super.closeStorage(); + } + /** * Retourne le repertoire de base de stockage des simulations. *

1 0

r3807 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 17 Dec '12

17 Dec '12

Author: echatellier Date: 2012-12-17 16:27:27 +0100 (Mon, 17 Dec 2012) New Revision: 3807 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3807 Log: Prepare next version Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-12-07 15:05:12 UTC (rev 3806) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-12-17 15:27:27 UTC (rev 3807) @@ -115,7 +115,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 1, 0); + protected final static Version version = new Version(4, 2, 1, 1); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3806 - in trunk/src/main/java/fr/ifremer/isisfish: ui util
by echatellier＠users.forge.codelutin.com 07 Dec '12

07 Dec '12

Author: echatellier Date: 2012-12-07 16:05:12 +0100 (Fri, 07 Dec 2012) New Revision: 3806 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3806 Log: Update javadoc links Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2012-12-06 13:20:01 UTC (rev 3805) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2012-12-07 15:05:12 UTC (rev 3806) @@ -87,8 +87,8 @@ static { URLSALIAS.put("ISISFISH", "http://www.isis-fish.org/"); - URLSALIAS.put("JAVA_API", "http://java.sun.com/javase/6/docs/api/index.html"); - URLSALIAS.put("ISIS_API", "http://www.isis-fish.org/isis-fish/apidocs/index.html"); + URLSALIAS.put("JAVA_API", "http://docs.oracle.com/javase/6/docs/api/index.html"); + URLSALIAS.put("ISIS_API", "http://www.isis-fish.org/apidocs/index.html"); URLSALIAS.put("MATRIX_API", "http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html"); URLSALIAS.put("TOPIA_API", "http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-12-06 13:20:01 UTC (rev 3805) +++ trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-12-07 15:05:12 UTC (rev 3806) @@ -182,7 +182,7 @@ args.add(dest.getAbsolutePath()); args.add("-link"); - args.add("http://java.sun.com/javase/6/docs/api/"); + args.add("http://docs.oracle.com/javase/6/docs/api/"); args.add("-link"); args.add(IsisFish.config.getJavadocURL());

1 0

r3805 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 06 Dec '12

06 Dec '12

Author: echatellier Date: 2012-12-06 14:20:01 +0100 (Thu, 06 Dec 2012) New Revision: 3805 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3805 Log: Utilisation de matrices non mapp?\195?\169e par defaut. Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-11-06 10:23:53 UTC (rev 3804) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-12-06 13:20:01 UTC (rev 3805) @@ -42,7 +42,7 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import org.nuiton.math.matrix.DoubleBigMappedVector; +import org.nuiton.math.matrix.DoubleBigVector; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -1043,7 +1043,7 @@ USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key), - MAPPED_RESULT_MATRIX_VECTOR_CLASS("mapped.result.matrix.vector.class", n_("isisfish.config.mapped.result.matrix.vector.class.description"), DoubleBigMappedVector.class.getName()); + MAPPED_RESULT_MATRIX_VECTOR_CLASS("mapped.result.matrix.vector.class", n_("isisfish.config.mapped.result.matrix.vector.class.description"), DoubleBigVector.class.getName()); public String key; public String description;

1 0