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

r4178 - in tags: . isis-fish-4.3.1.1
by echatellier＠users.forge.codelutin.com 26 Jan '15

26 Jan '15

Author: echatellier Date: 2015-01-26 09:05:44 +0000 (Mon, 26 Jan 2015) New Revision: 4178 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4178 Log: [maven-release-plugin] copy for tag isis-fish-4.3.1.1 Added: tags/isis-fish-4.3.1.1/ Property changes on: tags/isis-fish-4.3.1.1 ___________________________________________________________________ Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea

1 0

r4177 - branches/isis-fish-4.3.1.x
by maven-release＠users.forge.codelutin.com 26 Jan '15

26 Jan '15

Author: maven-release Date: 2015-01-26 09:01:31 +0000 (Mon, 26 Jan 2015) New Revision: 4177 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4177 Log: [maven-release-plugin] prepare release isis-fish-4.3.1.1 Modified: branches/isis-fish-4.3.1.x/pom.xml Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2015-01-26 08:39:55 UTC (rev 4176) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-26 09:01:31 UTC (rev 4177) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.1-SNAPSHOT</version> + <version>4.3.1.1</version>  <dependencies> @@ -693,9 +693,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</developerConnection> - <url>https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.1</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.1</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.1</url> </scm> <repositories>

1 0

r4176 - in branches/isis-fish-4.3.1.x: . src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard
by echatellier＠users.forge.codelutin.com 26 Jan '15

26 Jan '15

Author: echatellier Date: 2015-01-26 08:39:55 +0000 (Mon, 26 Jan 2015) New Revision: 4176 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4176 Log: Fix deploy... again Modified: branches/isis-fish-4.3.1.x/pom.xml branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2015-01-23 10:47:24 UTC (rev 4175) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-26 08:39:55 UTC (rev 4176) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.1</version> + <version>6.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -348,6 +348,8 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> </dependency> <dependency> @@ -488,6 +490,9 @@ <maven.compiler.target>1.7</maven.compiler.target> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> + +  + <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  <jaxxVersion>2.8.7</jaxxVersion> Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2015-01-23 10:47:24 UTC (rev 4175) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2015-01-26 08:39:55 UTC (rev 4176) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2015 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

1 0

r4175 - in branches/isis-fish-4.3.1.x: . src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 23 Jan '15

23 Jan '15

Author: echatellier Date: 2015-01-23 10:47:24 +0000 (Fri, 23 Jan 2015) New Revision: 4175 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4175 Log: fixes #6531: LazyInitializationException: could not initialize proxy - no Session in prescript Modified: branches/isis-fish-4.3.1.x/pom.xml branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2015-01-23 10:47:02 UTC (rev 4174) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-23 10:47:24 UTC (rev 4175) @@ -493,7 +493,7 @@ <jaxxVersion>2.8.7</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9.1</topiaVersion> - <hibernateVersion>4.3.7.Final</hibernateVersion> + <hibernateVersion>4.3.8.Final</hibernateVersion> <nuitonI18nVersion>3.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> @@ -688,9 +688,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</developerConnection> + <url>https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</url> </scm> <repositories> Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2015-01-23 10:47:02 UTC (rev 4174) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2015-01-23 10:47:24 UTC (rev 4175) @@ -38,6 +38,7 @@ import org.hibernate.type.StandardBasicTypes; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaId; @@ -83,12 +84,21 @@ TopiaEntity result = null; if (context != null) { try { - TopiaContext tx = context.beginTransaction(); - result = tx.findByTopiaId(topiaId); - // FIXME when after tx.closeContext we can continu to load - // object, call it here - tx.commitTransaction(); - tx.closeContext(); + + // normalement, on ne devrait pas avoir à tester ca + // mais il arrive que dans le cas des prescripts, on soit deja dans une transaction + // see (#6531) + TopiaContextImpl contextImpl = (TopiaContextImpl)context; + if (contextImpl.getParentContext() != null) { + result = contextImpl.findByTopiaId(topiaId); + } else { + TopiaContext tx = context.beginTransaction(); + result = tx.findByTopiaId(topiaId); + // FIXME when after tx.closeContext we can continu to load + // object, call it here + tx.commitTransaction(); + tx.closeContext(); + } } catch (TopiaException eee) { if (log.isWarnEnabled()) { log.warn("Can't find Entity from TopiaId " + topiaId, eee); @@ -99,8 +109,8 @@ String entityClass = TopiaId.getClassNameAsString(topiaId); try { - /* Non compilable code since hibernate 4.2, but not a real, not usefull - boolean mustCommit = false; + // usefull for prescript (must be reopened) + /*boolean mustCommit = false; if (!session.getJDBCContext().getTransaction().isActive()) { mustCommit = true; session.getJDBCContext().getTransaction().begin();

1 0

r4174 - in branches/isis-fish-4.3.1.x/src: main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by echatellier＠users.forge.codelutin.com 23 Jan '15

23 Jan '15

Author: echatellier Date: 2015-01-23 10:47:02 +0000 (Fri, 23 Jan 2015) New Revision: 4174 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4174 Log: fixes #6525: Dans les facteurs continues, les valeurs de r?\195?\169f?\195?\169rences n?\195?\169gatives ne peuvent pas fonctionner Added: branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2015-01-23 10:45:48 UTC (rev 4173) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2015-01-23 10:47:02 UTC (rev 4174) @@ -189,8 +189,10 @@ args.add(1.0 + coef); // max } else { double ref = (Double)reference; - args.add(ref * (1.0 - coef)); // min - args.add(ref * (1.0 + coef)); // max + // Math.abs(ref) est utilisé pour avoir un resultat correct même avec une + // valeur de référence négative + args.add(ref - coef * Math.abs(ref)); // min + args.add(ref + coef * Math.abs(ref)); // max } } else { for (DistributionParam param : distribution.getDistibutionParams()) { Added: branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java =================================================================== --- branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java (rev 0) +++ branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java 2015-01-23 10:47:02 UTC (rev 4174) @@ -0,0 +1,65 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.simulator.sensitivity.Distribution; + +public class ContinuousDomainTest { + + /** + * Test jdistlib pour verifier que les parametres sont bien compris en compte. + * + * Ici : valeurs positives non gérées correctement. + */ + @Test + public void testJDistLib1() { + + ContinuousDomain d = new ContinuousDomain(Distribution.QUNIFPC); + d.getDistributionParameters().put("reference", 0.83); + d.getDistributionParameters().put("coefficient", 0.5); + + Assert.assertEquals(0.581, (Double)d.getValueForIdentifier(0.2), 0.001); + Assert.assertEquals(1.162, (Double)d.getValueForIdentifier(0.9), 0.001); + } + + /** + * Test jdistlib pour verifier que les parametres sont bien compris en compte. + * + * Ici : valeurs négatives non gérées correctement (min > max). + */ + @Test + public void testJDistLib2() { + + ContinuousDomain d = new ContinuousDomain(Distribution.QUNIFPC); + d.getDistributionParameters().put("reference", -0.83); + d.getDistributionParameters().put("coefficient", 0.5); + + Assert.assertEquals(-1.079, (Double)d.getValueForIdentifier(0.2), 0.001); + Assert.assertEquals(-0.498, (Double)d.getValueForIdentifier(0.9), 0.001); + } +} Property changes on: branches/isis-fish-4.3.1.x/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r4173 - branches/isis-fish-4.3.1.x/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 23 Jan '15

23 Jan '15

Author: echatellier Date: 2015-01-23 10:45:48 +0000 (Fri, 23 Jan 2015) New Revision: 4173 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4173 Log: happy new year Modified: branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-22 16:59:18 UTC (rev 4172) +++ branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-23 10:45:48 UTC (rev 4173) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-22 16:59:18 UTC (rev 4172) +++ branches/isis-fish-4.3.1.x/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-23 10:45:48 UTC (rev 4173) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés

1 0

r4172 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 22 Jan '15

22 Jan '15

Author: echatellier Date: 2015-01-22 16:59:18 +0000 (Thu, 22 Jan 2015) New Revision: 4172 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4172 Log: Happy new year ! Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-22 11:21:24 UTC (rev 4171) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-22 16:59:18 UTC (rev 4172) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-22 11:21:24 UTC (rev 4171) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-22 16:59:18 UTC (rev 4172) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés

1 0

r4171 - in trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by echatellier＠users.forge.codelutin.com 22 Jan '15

22 Jan '15

Author: echatellier Date: 2015-01-22 11:21:24 +0000 (Thu, 22 Jan 2015) New Revision: 4171 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4171 Log: refs #6525: add failing unit test Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java 2015-01-22 11:21:24 UTC (rev 4171) @@ -0,0 +1,25 @@ +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.simulator.sensitivity.Distribution; + +public class ContinuousDomainTest { + + /** + * Test jdistlib pour verifier que les parametres sont bien compris en compte. + * + * Ici : valeurs négatives non gérées correctement (min > max). + */ + @Test + public void testJDistLib() { + + ContinuousDomain d = new ContinuousDomain(Distribution.QUNIFPC); + d.getDistributionParameters().put("reference", 0.83); + d.getDistributionParameters().put("coefficient", 0.5); + + Assert.assertEquals(-0.415, (Double)d.getValueForIdentifier(0.0), 0.0); + Assert.assertEquals(-1.162, (Double)d.getValueForIdentifier(0.9), 0.0); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r4170 - in trunk/src/main: java/fr/ifremer/isisfish/simulator resources/templates/script
by echatellier＠users.forge.codelutin.com 05 Jan '15

05 Jan '15

Author: echatellier Date: 2015-01-05 16:13:05 +0000 (Mon, 05 Jan 2015) New Revision: 4170 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4170 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import java.util.ArrayList; import java.util.HashMap; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import java.util.List; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; /** Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:13:05 UTC (rev 4170) @@ -5,7 +5,7 @@ $Id: export.ftl 4156 2014-12-09 11:27:18Z echatellier $ $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/trunk/src/main/resources/templ… $ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2015 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 @@ -56,6 +56,7 @@ import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.types.TimeStep; /** * ${name}.java

1 0

r4169 - trunk
by echatellier＠users.forge.codelutin.com 05 Jan '15

05 Jan '15

Author: echatellier Date: 2015-01-05 16:12:42 +0000 (Mon, 05 Jan 2015) New Revision: 4169 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4169 Log: Update versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-12-24 16:39:29 UTC (rev 4168) +++ trunk/pom.xml 2015-01-05 16:12:42 UTC (rev 4169) @@ -199,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.3</version> + <version>3.4</version> <scope>runtime</scope>  </dependency> @@ -218,7 +218,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> + <version>1.7.9</version> <scope>runtime</scope> </dependency> @@ -336,7 +336,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.5</version> + <version>1.8.7</version> <scope>compile</scope> <exclusions> <exclusion> @@ -514,7 +514,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.18</jaxxVersion> + <jaxxVersion>2.20</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.3</topiaVersion> <hibernateVersion>4.3.7.Final</hibernateVersion>

1 0