- Wao-commits - mailman.cloud.codelutin.com

r2195 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Aug. 4, 2014

Aug. 4, 2014

Author: bleny Date: 2014-08-04 17:26:22 +0200 (Mon, 04 Aug 2014) New Revision: 2195 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2195 Log: do not hide exception Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 10:23:44 UTC (rev 2194) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 15:26:22 UTC (rev 2195) @@ -153,6 +153,8 @@ serviceContext.getPersistenceContext().rollback(); } + throw t; + } finally { // TODO brendan 21/07/14 use try with resources

1 0

r2194 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Aug. 4, 2014

Aug. 4, 2014

Author: bleny Date: 2014-08-04 12:23:44 +0200 (Mon, 04 Aug 2014) New Revision: 2194 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2194 Log: rollback on error in interceptor Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-30 16:16:43 UTC (rev 2193) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 10:23:44 UTC (rev 2194) @@ -146,6 +146,13 @@ return invocation.invoke(); + } catch (Throwable t) { + + // TODO brendan 21/07/14 use try with resources + if (serviceContext != null) { + serviceContext.getPersistenceContext().rollback(); + } + } finally { // TODO brendan 21/07/14 use try with resources

1 0

[ANN] - Wao 4.0.6 released
by codelutin.com Release Notification July 30, 2014

July 30, 2014

The Wao team is pleased to announce the wao-4.0.6 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o Problème d'accès aux filtre à la deuxième utilisation Issue: 5573. Thanks to Anne-Sophie Cornou. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.6.war - http://forge.codelutin.com/attachments/download/2127 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2193 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 18:16:43 +0200 (Wed, 30 Jul 2014) New Revision: 2193 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2193 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-07-30 16:16:37 UTC (rev 2192) +++ branches/wao-4.0.x/pom.xml 2014-07-30 16:16:43 UTC (rev 2193) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.6</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.6</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.6</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 16:16:37 UTC (rev 2192) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 16:16:43 UTC (rev 2193) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 16:16:37 UTC (rev 2192) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 16:16:43 UTC (rev 2193) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 16:16:37 UTC (rev 2192) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 16:16:43 UTC (rev 2193) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2192 - in tags: . wao-4.0.6
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 18:16:37 +0200 (Wed, 30 Jul 2014) New Revision: 2192 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2192 Log: [maven-release-plugin] copy for tag wao-4.0.6 Added: tags/wao-4.0.6/ Property changes on: tags/wao-4.0.6 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2191 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 18:16:31 +0200 (Wed, 30 Jul 2014) New Revision: 2191 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2191 Log: [maven-release-plugin] prepare release wao-4.0.6 Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-07-30 15:49:27 UTC (rev 2190) +++ branches/wao-4.0.x/pom.xml 2014-07-30 16:16:31 UTC (rev 2191) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.6</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.6</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.6</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 15:49:27 UTC (rev 2190) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 16:16:31 UTC (rev 2191) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 15:49:27 UTC (rev 2190) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 16:16:31 UTC (rev 2191) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 15:49:27 UTC (rev 2190) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 16:16:31 UTC (rev 2191) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2190 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: bleny Date: 2014-07-30 17:49:27 +0200 (Wed, 30 Jul 2014) New Revision: 2190 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2190 Log: refs #5573 fix boats filter values cache key Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-07-30 13:17:52 UTC (rev 2189) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-07-30 15:49:27 UTC (rev 2190) @@ -23,6 +23,7 @@ import com.google.common.base.Objects; import com.google.common.base.Optional; +import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.entity.ObsProgram; import java.io.Serializable; @@ -30,16 +31,19 @@ public class BoatsFilterValuesCacheKey implements Serializable { - protected final Locale locale; + protected Locale locale; - protected final ObsProgram obsProgram; + protected ObsProgram obsProgram; - protected final Optional<String> optionalCompanyId; + protected Optional<String> optionalCompanyId; - public BoatsFilterValuesCacheKey(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { + protected BoatsFilter boatsFilter; + + public BoatsFilterValuesCacheKey(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId, BoatsFilter boatsFilter) { this.locale = locale; this.obsProgram = obsProgram; this.optionalCompanyId = optionalCompanyId; + this.boatsFilter = boatsFilter; } @Override @@ -49,7 +53,8 @@ BoatsFilterValuesCacheKey that = (BoatsFilterValuesCacheKey) o; boolean equals = Objects.equal(locale, that.locale) && Objects.equal(optionalCompanyId, that.optionalCompanyId) - && Objects.equal(obsProgram, that.obsProgram); + && Objects.equal(obsProgram, that.obsProgram) + && Objects.equal(boatsFilter, that.boatsFilter); return equals; } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-30 13:17:52 UTC (rev 2189) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-30 15:49:27 UTC (rev 2190) @@ -80,7 +80,8 @@ new BoatsFilterValuesCacheKey( serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), - optionalCompanyId); + optionalCompanyId, + filter); Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> cache = serviceContext.getBoatsFilterValuesCache();

1 0

[ANN] - Wao 4.0.5 released
by codelutin.com Release Notification July 30, 2014

July 30, 2014

The Wao team is pleased to announce the wao-4.0.5 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o L'affichage des pages ne commence pas en haut de la page Issue: 5561. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Profil Observateur Obsvente, page navire, je clique sur le lien de l'armateur et il revient sur la liste des navires Issue: 5309. Thanks to Vincent BADTS. Resolved by bleny. o Problème lors de la saise des dates avec le calendrier Issue: 5446. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Erreur lors de l'enregistrement d'un contact Issue: 5487. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Impossible d'accéder au plan en connexion Administrateur Issue: 5494. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Le lien « Voir les contacts associés à cette ligne du plan » ne fonctionne pas Issue: 5506. Thanks to Brendan Le Ny. Resolved by bleny. o Obsventes, Filtre navire ne fonctionnant pas à la deuxième utilisation Issue: 5505. Thanks to Anne-Sophie Cornou. Resolved by ascornou. Changes: o Accès au plan d'échantillonnage sur démo en profil : observateur Obsvente Issue: 5560. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o QUESTIONS Issue: 5562. Thanks to Anne-Sophie Cornou. Resolved by ascornou. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.5.war - http://forge.codelutin.com/attachments/download/2122 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2189 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 15:17:52 +0200 (Wed, 30 Jul 2014) New Revision: 2189 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2189 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-07-30 13:17:47 UTC (rev 2188) +++ branches/wao-4.0.x/pom.xml 2014-07-30 13:17:52 UTC (rev 2189) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.5</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.5</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.5</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 13:17:47 UTC (rev 2188) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-07-30 13:17:52 UTC (rev 2189) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 13:17:47 UTC (rev 2188) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-07-30 13:17:52 UTC (rev 2189) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 13:17:47 UTC (rev 2188) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-07-30 13:17:52 UTC (rev 2189) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2188 - in tags: . wao-4.0.5
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 15:17:47 +0200 (Wed, 30 Jul 2014) New Revision: 2188 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2188 Log: [maven-release-plugin] copy for tag wao-4.0.5 Added: tags/wao-4.0.5/ Property changes on: tags/wao-4.0.5 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0