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

r4187 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:45:27 +0000 (Wed, 28 Jan 2015) New Revision: 4187 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4187 Log: [maven-release-plugin] prepare release isis-fish-4.3.1.2 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:40:38 UTC (rev 4186) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:45:27 UTC (rev 4187) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.2-SNAPSHOT</version> + <version>4.3.1.2</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.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> </scm> <repositories>

1 0

r4186 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:40:38 +0000 (Wed, 28 Jan 2015) New Revision: 4186 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4186 Log: Redo release 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:39:56 UTC (rev 4185) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:40:38 UTC (rev 4186) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.3-SNAPSHOT</version> + <version>4.3.1.2-SNAPSHOT</version>  <dependencies>

1 0

r4185 - tags
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:39:56 +0000 (Wed, 28 Jan 2015) New Revision: 4185 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4185 Log: redo release Removed: tags/isis-fish-4.3.1.2/

1 0

r4184 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:34:59 +0000 (Wed, 28 Jan 2015) New Revision: 4184 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4184 Log: update scm 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:13:04 UTC (rev 4183) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:34:59 UTC (rev 4184) @@ -693,9 +693,9 @@   <scm> - <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> + <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

r4183 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:13:04 +0000 (Wed, 28 Jan 2015) New Revision: 4183 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4183 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:12:55 UTC (rev 4182) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:13:04 UTC (rev 4183) @@ -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/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

r4182 - in tags: . isis-fish-4.3.1.2
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:12:55 +0000 (Wed, 28 Jan 2015) New Revision: 4182 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4182 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:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670

1 0

r4181 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:12:47 +0000 (Wed, 28 Jan 2015) New Revision: 4181 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4181 Log: [maven-release-plugin] prepare release isis-fish-4.3.1.2 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:06:33 UTC (rev 4180) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:12:47 UTC (rev 4181) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.2-SNAPSHOT</version> + <version>4.3.1.2</version>  <dependencies> @@ -693,9 +693,9 @@   <scm> - <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> + <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> </scm> <repositories>

1 0

r4180 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 28, 2015

Jan. 28, 2015

Author: echatellier Date: 2015-01-28 09:06:33 +0000 (Wed, 28 Jan 2015) New Revision: 4180 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4180 Log: Reset snapshot 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-27 17:41:11 UTC (rev 4179) +++ branches/isis-fish-4.3.1.x/pom.xml 2015-01-28 09:06:33 UTC (rev 4180) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.1</version> + <version>4.3.1.2-SNAPSHOT</version>  <dependencies>

1 0

r4179 - in branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish: . entities util
by echatellier＠users.forge.codelutin.com Jan. 27, 2015

Jan. 27, 2015

Author: echatellier Date: 2015-01-27 17:41:11 +0000 (Tue, 27 Jan 2015) New Revision: 4179 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4179 Log: fixes #6567: LazyInitializationException: could not initialize proxy - no Session in prescript Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2015-01-26 09:05:44 UTC (rev 4178) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2015-01-27 17:41:11 UTC (rev 4179) @@ -128,7 +128,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 3, 1, 1); + protected final static Version version = new Version(4, 3, 1, 2); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-01-26 09:05:44 UTC (rev 4178) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-01-27 17:41:11 UTC (rev 4179) @@ -25,10 +25,9 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n.t; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.LazyInitializationException; import fr.ifremer.isisfish.types.Month; @@ -209,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: 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-26 09:05:44 UTC (rev 4178) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2015-01-27 17:41:11 UTC (rev 4179) @@ -68,7 +68,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 @@ -84,21 +86,12 @@ TopiaEntity result = null; if (context != null) { try { - - // 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(); - } + 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);

1 0

[ANN] - IsisFish 4.3.1.1 released
by codelutin.com Release Notification Jan. 26, 2015

Jan. 26, 2015

The IsisFish team is pleased to announce the isis-fish-4.3.1.1 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 Dans les facteurs continues, les valeurs de références négatives ne peuvent pas fonctionner Issue: 6525. Thanks to Eric Chatellier. Resolved by echatellier. o LazyInitializationException: could not initialize proxy - no Session in prescript Issue: 6531. 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.1-bin.zip - http://forge.codelutin.com/attachments/download/2791 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -IsisFish team

1 0