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

r4196 - trunk
by echatellier＠users.forge.codelutin.com 17 Apr '15

17 Apr '15

Author: echatellier Date: 2015-04-17 14:49:42 +0000 (Fri, 17 Apr 2015) New Revision: 4196 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4196 Log: Update openmap Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-16 17:17:55 UTC (rev 4195) +++ trunk/pom.xml 2015-04-17 14:49:42 UTC (rev 4196) @@ -279,7 +279,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.1.3</version> + <version>5.1.10</version> <scope>compile</scope> </dependency>

1 0

r4195 - trunk
by echatellier＠users.forge.codelutin.com 16 Apr '15

16 Apr '15

Author: echatellier Date: 2015-04-16 17:17:55 +0000 (Thu, 16 Apr 2015) New Revision: 4195 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4195 Log: Update topia and hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-16 16:54:19 UTC (rev 4194) +++ trunk/pom.xml 2015-04-16 17:17:55 UTC (rev 4195) @@ -520,8 +520,8 @@  <jaxxVersion>2.23.1</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> - <topiaVersion>2.9.4</topiaVersion> - <hibernateVersion>4.3.8.Final</hibernateVersion> + <topiaVersion>2.9.5.1</topiaVersion> + <hibernateVersion>4.3.9.Final</hibernateVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r4194 - in trunk/src/main/java/fr/ifremer/isisfish: datastore simulator
by echatellier＠users.forge.codelutin.com 16 Apr '15

16 Apr '15

Author: echatellier Date: 2015-04-16 16:54:19 +0000 (Thu, 16 Apr 2015) New Revision: 4194 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4194 Log: Fix sensitivity export necessary result not been included in isResultEnabled() Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2015 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 @@ -247,8 +247,7 @@ getAvailableResult().add(key); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#isEnabled(java.lang.String) + /* @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ @Override public boolean isEnabled(String name) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2012 - 2015 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 @@ -62,6 +62,7 @@ * * @param name result name * @return {@code true} if result is enabled + * @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ public boolean isEnabled(String name); Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2012 - 2015 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 @@ -374,6 +374,7 @@ * * @param name result name * @return {@code true} if result is enabled + * @deprecated since 4.4.0.0 : this method is duplicated with ResultManager#isEnabled(String) */ @Override public boolean isEnabled(String name) { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2015-04-07 17:59:01 UTC (rev 4193) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2015-04-16 16:54:19 UTC (rev 4194) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2007 - 2015 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -43,6 +43,7 @@ import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.ExportInfo; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.types.TimeStep; @@ -136,6 +137,14 @@ } } } + List<SensitivityExport> sensitivityExports = param.getSensitivityExport(); + if (sensitivityExports != null) { + for (SensitivityExport sensitivityExport : sensitivityExports) { + for (String resultName : sensitivityExport.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } List<Rule> rules = param.getRules(); if (rules != null) { for (Rule rule : rules) {

1 0

r4193 - trunk
by echatellier＠users.forge.codelutin.com 07 Apr '15

07 Apr '15

Author: echatellier Date: 2015-04-07 17:59:01 +0000 (Tue, 07 Apr 2015) New Revision: 4193 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4193 Log: Update commons-lang and slf Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-03-26 11:24:13 UTC (rev 4192) +++ trunk/pom.xml 2015-04-07 17:59:01 UTC (rev 4193) @@ -175,7 +175,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.4</version> </dependency> <dependency> @@ -218,7 +218,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.10</version> + <version>1.7.12</version> <scope>runtime</scope> </dependency>

1 0

r4192 - trunk
by echatellier＠users.forge.codelutin.com 26 Mar '15

26 Mar '15

Author: echatellier Date: 2015-03-26 11:24:13 +0000 (Thu, 26 Mar 2015) New Revision: 4192 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4192 Log: Update some libs. Use h2 version with autocommit patch. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-03-17 10:42:37 UTC (rev 4191) +++ trunk/pom.xml 2015-03-26 11:24:13 UTC (rev 4192) @@ -286,7 +286,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.51</version> + <version>0.1.52</version> <scope>compile</scope> </dependency> @@ -301,7 +301,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176</version> + <version>1.3.176_autocommitpatch</version> <scope>compile</scope> </dependency> @@ -518,9 +518,9 @@ <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  - <jaxxVersion>2.22</jaxxVersion> + <jaxxVersion>2.23.1</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> - <topiaVersion>2.9.3</topiaVersion> + <topiaVersion>2.9.4</topiaVersion> <hibernateVersion>4.3.8.Final</hibernateVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r4191 - trunk
by echatellier＠users.forge.codelutin.com 17 Mar '15

17 Mar '15

Author: echatellier Date: 2015-03-17 10:42:37 +0000 (Tue, 17 Mar 2015) New Revision: 4191 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4191 Log: Update libs. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-01-28 11:10:32 UTC (rev 4190) +++ trunk/pom.xml 2015-03-17 10:42:37 UTC (rev 4191) @@ -91,14 +91,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> <scope>compile</scope> </dependency> @@ -195,7 +195,7 @@ <artifactId>commons-io</artifactId> <version>2.4</version> </dependency> - + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> @@ -231,28 +231,28 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>runtime</scope> </dependency> @@ -308,7 +308,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.8.5</version> </dependency> <dependency> @@ -358,14 +358,14 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.21</version> + <version>2.3.22</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.4</version> + <version>4.4.2</version> </dependency> <dependency>

1 0

r4190 - in trunk: . src/main/java/fr/ifremer/isisfish/entities src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/simulator/sensitivity src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by echatellier＠users.forge.codelutin.com 28 Jan '15

28 Jan '15

Author: echatellier Date: 2015-01-28 11:10:32 +0000 (Wed, 28 Jan 2015) New Revision: 4190 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4190 Log: Merge branche 4.3.1.x into trunk Update libs Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ Removed: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ Modified: trunk/ trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 /branches/4.3.0-log4j2:4048-4129 + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 /branches/4.3.0-log4j2:4048-4129 /branches/isis-fish-4.3.1.x:4144-4183 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-01-28 09:46:25 UTC (rev 4189) +++ trunk/pom.xml 2015-01-28 11:10:32 UTC (rev 4190) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.2</version> + <version>6.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -34,7 +34,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-rc-2</version> + <version>3.0</version> <scope>compile</scope> </dependency> @@ -70,7 +70,7 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <version>3.2.0.Final</version> + <version>3.2.1.Final</version> <scope>runtime</scope> </dependency> @@ -199,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.4</version> + <version>3.4.1</version> <scope>runtime</scope>  </dependency> @@ -218,7 +218,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.9</version> + <version>1.7.10</version> <scope>runtime</scope> </dependency> @@ -379,6 +379,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> + <scope>test</scope> </dependency> </dependencies> @@ -512,12 +513,15 @@ <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.20</jaxxVersion> - <eugeneVersion>2.13</eugeneVersion> + <jaxxVersion>2.22</jaxxVersion> + <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.9.3</topiaVersion> - <hibernateVersion>4.3.7.Final</hibernateVersion> + <hibernateVersion>4.3.8.Final</hibernateVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-01-28 09:46:25 UTC (rev 4189) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-01-28 11:10:32 UTC (rev 4190) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.LazyInitializationException; import fr.ifremer.isisfish.types.Month; @@ -207,7 +208,15 @@ // return t("isisfish.populationGroup.toString", this.getPopulation(), // this.getId()); if (toStringCache == null) { - toStringCache = this.getPopulation() + " Group " + this.getId(); + try { + toStringCache = this.getPopulation() + " Group " + this.getId(); + } catch (LazyInitializationException e) { + // cette exception se produit quand le toString est appelé par exemple lors + // su lancement d'une population mais que l'entité d'origine a été rechargée + // depuis une précédente transation fermé (rechargement d'une simulation + // avec ses facteurs) + toStringCache = "Unknow Population Group " + this.getId(); + } } return toStringCache; } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2015-01-28 09:46:25 UTC (rev 4189) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2015-01-28 11:10:32 UTC (rev 4190) @@ -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()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2015-01-28 09:46:25 UTC (rev 4189) +++ trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2015-01-28 11:10:32 UTC (rev 4190) @@ -67,7 +67,9 @@ @Override public Object convert(Class type, Object value) { Object result = null; - if (value instanceof TopiaEntity) { + if (value == null) { + result = null; + } else if (value instanceof TopiaEntity) { result = value; } else if (value instanceof String) { // after ':' is entity string representation Property changes on: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain ___________________________________________________________________ Added: svn:mergeinfo + /branches/4.0.0-svnkit/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain:3665-3698 /branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain:3616-3968 /branches/4.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain:3601-3670

1 0

[ANN] - IsisFish 4.3.1.2 released
by codelutin.com Release Notification 28 Jan '15

28 Jan '15

The IsisFish team is pleased to announce the isis-fish-4.3.1.2 release! Simulateur de pecherie complexe. Documentation of the project can be found here: http://doc.codelutin.com/isis-fish Changes ------- Changes in this version include: Fixed Bugs: o LazyInitializationException: could not initialize proxy - no Session in prescript Issue: 6567. Thanks to Eric Chatellier. Resolved by echatellier. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/isis-fish/files * isis-fish-4.3.1.2-bin.zip - http://forge.codelutin.com/attachments/download/2802 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -IsisFish team

1 0

r4189 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com 28 Jan '15

28 Jan '15

Author: echatellier Date: 2015-01-28 09:46:25 +0000 (Wed, 28 Jan 2015) New Revision: 4189 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4189 Log: [maven-release-plugin] prepare for next development iteration 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-28 09:45:59 UTC (rev 4188) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:46:25 UTC (rev 4189) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.2</version> + <version>4.3.1.3-SNAPSHOT</version>  <dependencies> @@ -693,9 +693,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</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>

1 0

r4188 - in tags: . isis-fish-4.3.1.2
by echatellier＠users.forge.codelutin.com 28 Jan '15

28 Jan '15

Author: echatellier Date: 2015-01-28 09:45:59 +0000 (Wed, 28 Jan 2015) New Revision: 4188 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4188 Log: [maven-release-plugin] copy for tag isis-fish-4.3.1.2 Added: tags/isis-fish-4.3.1.2/ Property changes on: tags/isis-fish-4.3.1.2 ___________________________________________________________________ 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