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

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

Aug. 18, 2014

Author: bleny Date: 2014-08-18 17:43:36 +0200 (Mon, 18 Aug 2014) New Revision: 2219 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2219 Log: Ajout d'un log savoir qui chercher ?\195?\160 modifier quels contacts (refs #5634) Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-08-14 08:27:37 UTC (rev 2218) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-08-18 15:43:36 UTC (rev 2219) @@ -22,6 +22,7 @@ */ import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; @@ -68,6 +69,8 @@ import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -91,6 +94,8 @@ private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(EditContactAction.class); + /** * Id of contact to edit. */ @@ -205,6 +210,12 @@ @Override public void prepare() { + Preconditions.checkState(optionalContactId.isPresent()); + + if (log.isInfoEnabled()) { + log.info("user " + getAuthenticatedWaoUser() + " want to edit contact " + optionalContactId.get()); + } + try { updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); } catch (UnknownContactIdException e) {

1 0

r2218 - in branches/wao-4.0.x/wao-web/src/main: resources/i18n webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: bleny Date: 2014-08-14 10:27:37 +0200 (Thu, 14 Aug 2014) New Revision: 2218 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2218 Log: Ajout d'un message explicatif sur la diff?\195?\169rence entre l'effort 0 et l'effort vide Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-08-13 15:11:12 UTC (rev 2217) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-08-14 08:27:37 UTC (rev 2218) @@ -508,6 +508,7 @@ wao.ui.samplingPlan.averageTideTime=Average tide time (d.) wao.ui.samplingPlan.effort=Observation effort wao.ui.samplingPlan.effort.obsVente=Observation effort +wao.ui.samplingPlan.effort.tip=There is a difference between "0" as effort and leave it empty. O means that no effort is asked to the observers but they can still create contacts for this month. Leaving the field empty makes impossible for the observers to create contacts for this months. wao.ui.samplingPlan.estimated=estimated wao.ui.samplingPlan.expected=expected wao.ui.samplingPlan.export=Export the sampling plan from %s to %s Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-08-13 15:11:12 UTC (rev 2217) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-08-14 08:27:37 UTC (rev 2218) @@ -508,6 +508,7 @@ wao.ui.samplingPlan.averageTideTime=Durée moyenne d'une marée (J.) wao.ui.samplingPlan.effort=Effort d'observation en nombre de marées wao.ui.samplingPlan.effort.obsVente=Effort d'observation en nombre de sorties +wao.ui.samplingPlan.effort.tip=Il y a une différence entre saisir « 0 » comme effort mensuel et laisser la case vide. Si vous indiquez un effort de 0, aucun effort n'est demandé aux observateurs mais ils pourront tout de même saisir un contact. Si vous laissez la case vide, les observateurs ne pourront pas créer de contacts pour ce mois. wao.ui.samplingPlan.estimated=estimé wao.ui.samplingPlan.expected=planifié wao.ui.samplingPlan.export=Exporter le plan d'échantillonnage du %s au %s Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-08-13 15:11:12 UTC (rev 2217) +++ branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-08-14 08:27:37 UTC (rev 2218) @@ -206,7 +206,9 @@ </div> </div> - + <div class="alert"> + <s:text name="wao.ui.samplingPlan.effort.tip" /> + </div> </fieldset> <fieldset>

1 0

[ANN] - Wao 4.0.8 released
by codelutin.com Release Notification Aug. 13, 2014

Aug. 13, 2014

The Wao team is pleased to announce the wao-4.0.8 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: New features: o Ajouter une règle de validation pour empêcher l'import CSV avec des dates avant la création de Wao Issue: 5609. Thanks to Brendan Le Ny. Resolved by bleny. Fixed Bugs: o Problème de curseur mal positionné Issue: 5612. Thanks to Anne-Sophie Cornou. Resolved by bleny. o impossible de modifier les droits d'un utilisateur Issue: 5621. Thanks to Vincent BADTS. Resolved by bleny. o Coordinateur possibilité de réactiver un observateur Issue: 5627. Thanks to Anne-Sophie Cornou. Resolved by bleny. Changes: o Question sur le changement d'un mot de passe Issue: 5476. 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.8.war - http://forge.codelutin.com/attachments/download/2139 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2217 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: maven-release Date: 2014-08-13 17:11:12 +0200 (Wed, 13 Aug 2014) New Revision: 2217 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2217 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-08-13 15:11:05 UTC (rev 2216) +++ branches/wao-4.0.x/pom.xml 2014-08-13 15:11:12 UTC (rev 2217) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8</version> + <version>4.0.9-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.8</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.8</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.8</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-08-13 15:11:05 UTC (rev 2216) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-08-13 15:11:12 UTC (rev 2217) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8</version> + <version>4.0.9-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-08-13 15:11:05 UTC (rev 2216) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-08-13 15:11:12 UTC (rev 2217) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8</version> + <version>4.0.9-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-08-13 15:11:05 UTC (rev 2216) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-08-13 15:11:12 UTC (rev 2217) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8</version> + <version>4.0.9-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2216 - in tags: . wao-4.0.8
by maven-release＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: maven-release Date: 2014-08-13 17:11:05 +0200 (Wed, 13 Aug 2014) New Revision: 2216 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2216 Log: [maven-release-plugin] copy for tag wao-4.0.8 Added: tags/wao-4.0.8/ Property changes on: tags/wao-4.0.8 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

r2215 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: maven-release Date: 2014-08-13 17:10:59 +0200 (Wed, 13 Aug 2014) New Revision: 2215 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2215 Log: [maven-release-plugin] prepare release wao-4.0.8 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-08-13 13:22:11 UTC (rev 2214) +++ branches/wao-4.0.x/pom.xml 2014-08-13 15:10:59 UTC (rev 2215) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.8</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.8</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.8</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.8</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-08-13 13:22:11 UTC (rev 2214) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-08-13 15:10:59 UTC (rev 2215) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.8</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-08-13 13:22:11 UTC (rev 2214) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-08-13 15:10:59 UTC (rev 2215) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.8</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-08-13 13:22:11 UTC (rev 2214) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-08-13 15:10:59 UTC (rev 2215) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.8</version> </parent> <artifactId>wao-web</artifactId>

1 0

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

Aug. 13, 2014

Author: bleny Date: 2014-08-13 15:22:11 +0200 (Wed, 13 Aug 2014) New Revision: 2214 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2214 Log: Affichage des stats de tous les caches ?\195?\160 l'extinction de l'appli Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-08-13 12:27:30 UTC (rev 2213) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-08-13 13:22:11 UTC (rev 2214) @@ -198,6 +198,8 @@ if (log.isInfoEnabled()) { log.info("samplingPlansCache stats: " + getSamplingPlansCache().stats().toString()); log.info("boatsFilterValuesCache stats: " + getBoatsFilterValuesCache().stats().toString()); + log.info("contactsFilterValuesCache stats: " + getContactsFilterValuesCache().stats().toString()); + log.info("synthesesCache stats: " + getSynthesesCache().stats().toString()); } if (topiaApplicationContext != null) {

1 0

r2213 - in branches/wao-4.0.x: wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test/java/fr/ifremer/wao/services wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: bleny Date: 2014-08-13 14:27:30 +0200 (Wed, 13 Aug 2014) New Revision: 2213 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2213 Log: Ajout d'un cache pour les contactsFilterValues Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -28,6 +28,8 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValues; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import fr.ifremer.wao.services.service.Synthesis; @@ -128,4 +130,9 @@ public Cache<ContactsFilter, Synthesis> getSynthesesCache() { return waoApplicationContext.getSynthesesCache(); } + + @Override + public Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache() { + return waoApplicationContext.getContactsFilterValuesCache(); + } } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -27,6 +27,8 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValues; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import fr.ifremer.wao.services.service.Synthesis; @@ -60,6 +62,8 @@ Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); + Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache(); + Cache<ContactsFilter, Synthesis> getSynthesesCache(); } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -27,6 +27,8 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValues; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import fr.ifremer.wao.services.service.Synthesis; @@ -60,5 +62,7 @@ Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); + Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache(); + Cache<ContactsFilter,Synthesis> getSynthesesCache(); } Copied: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java (from rev 2208, 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/ContactsFilterValuesCacheKey.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -0,0 +1,66 @@ +package fr.ifremer.wao.services.service; + +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.common.base.Objects; +import com.google.common.base.Optional; +import fr.ifremer.wao.ContactsFilter; +import fr.ifremer.wao.entity.ObsProgram; + +import java.io.Serializable; +import java.util.Locale; + +public class ContactsFilterValuesCacheKey implements Serializable { + + protected Locale locale; + + protected ObsProgram obsProgram; + + protected Optional<String> optionalCompanyId; + + protected ContactsFilter contactsFilter; + + public ContactsFilterValuesCacheKey(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId, ContactsFilter contactsFilter) { + this.locale = locale; + this.obsProgram = obsProgram; + this.optionalCompanyId = optionalCompanyId; + this.contactsFilter = contactsFilter; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ContactsFilterValuesCacheKey that = (ContactsFilterValuesCacheKey) o; + boolean equals = Objects.equal(locale, that.locale) + && Objects.equal(optionalCompanyId, that.optionalCompanyId) + && Objects.equal(obsProgram, that.obsProgram) + && Objects.equal(contactsFilter, that.contactsFilter); + return equals; + } + + @Override + public int hashCode() { + return Objects.hashCode(locale, optionalCompanyId, obsProgram, contactsFilter); + } + +} Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -24,6 +24,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.cache.Cache; import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoTechnicalException; @@ -135,17 +136,33 @@ public ContactsFilterValues getContactsFilterValues(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter) { - ContactTopiaDao dao = getContactDao(); - List<Contact> contacts = dao.findAllForFilterValues(filter); + Locale locale = serviceContext.getLocale(); + ObsProgram obsProgram = authenticatedWaoUser.getObsProgram(); Optional<String> optionalCompanyId = Optional.absent(); if (authenticatedWaoUser.isCoordinatorOrObserver()) { optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); } - ContactsFilterValues contactsFilterValues = new ContactsFilterValues(serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), optionalCompanyId); - for (Contact contact : contacts) { - contactsFilterValues.addContact(contact); + ContactsFilterValuesCacheKey cacheKey = + new ContactsFilterValuesCacheKey(locale, obsProgram, optionalCompanyId, filter); + + Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> cache = + serviceContext.getContactsFilterValuesCache(); + + ContactsFilterValues contactsFilterValues = cache.getIfPresent(cacheKey); + + if (contactsFilterValues == null) { + + ContactTopiaDao dao = getContactDao(); + List<Contact> contacts = dao.findAllForFilterValues(filter); + + contactsFilterValues = new ContactsFilterValues(locale, obsProgram, optionalCompanyId); + for (Contact contact : contacts) { + contactsFilterValues.addContact(contact); + } + + cache.put(cacheKey, contactsFilterValues); } return contactsFilterValues; Modified: branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -31,6 +31,8 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValues; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -73,6 +75,8 @@ protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + protected Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> contactsFilterValuesCache; + protected Cache<ContactsFilter, Synthesis> synthesisCache; public FakeWaoApplicationContext(String context, boolean initWithReferential) { @@ -283,6 +287,14 @@ } @Override + public Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache() { + if (contactsFilterValuesCache == null) { + contactsFilterValuesCache = CacheBuilder.newBuilder().build(); + } + return contactsFilterValuesCache; + } + + @Override public Cache<ContactsFilter, Synthesis> getSynthesesCache() { if (synthesisCache == null) { synthesisCache = CacheBuilder.newBuilder().build(); Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-08-13 12:07:39 UTC (rev 2212) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-08-13 12:27:30 UTC (rev 2213) @@ -34,11 +34,12 @@ import fr.ifremer.wao.services.WaoWebApplicationContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValues; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; -import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlan; +import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import fr.ifremer.wao.services.service.Synthesis; -import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; @@ -74,6 +75,8 @@ protected Cache<ContactsFilter, Synthesis> synthesesCache; + protected Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> contactsFilterValuesCache; + @Override public WaoApplicationConfig getApplicationConfig() { if (applicationConfig == null) { @@ -140,6 +143,14 @@ return synthesesCache; } + @Override + public Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache() { + if (contactsFilterValuesCache == null) { + contactsFilterValuesCache = newCacheBuilder(100).expireAfterWrite(18, TimeUnit.HOURS).build(); + } + return contactsFilterValuesCache; + } + protected <K, V> CacheBuilder<K, V> newCacheBuilder(int expectedMaximumCacheSize) { int maximumCacheSize = applicationConfig.isCachingEnabled() ? expectedMaximumCacheSize : 0; CacheBuilder<K, V> cacheBuilder = (CacheBuilder<K, V>) CacheBuilder.newBuilder().maximumSize(maximumCacheSize);

1 0

r2212 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: bleny Date: 2014-08-13 14:07:39 +0200 (Wed, 13 Aug 2014) New Revision: 2212 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2212 Log: On consid?\195?\168re le filtre dans le hashcode du cache de la cl?\195?\169 pour les BoatFilterValues Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.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-08-13 10:23:05 UTC (rev 2211) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-08-13 12:07:39 UTC (rev 2212) @@ -60,7 +60,7 @@ @Override public int hashCode() { - return Objects.hashCode(locale, optionalCompanyId, obsProgram); + return Objects.hashCode(locale, optionalCompanyId, obsProgram, boatsFilter); } }

1 0

r2211 - in branches/wao-4.0.x: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations wao-services/src/main/resources/i18n
by bleny＠users.forge.codelutin.com Aug. 13, 2014

Aug. 13, 2014

Author: bleny Date: 2014-08-13 12:23:05 +0200 (Wed, 13 Aug 2014) New Revision: 2211 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2211 Log: Ajout d'une r?\195?\168gle emp?\195?\170chant l'utilisation de date avant la cr?\195?\169ation de Wao pour pr?\195?\169venir un import absurde (mauvaise utilisation du tableur) ; refactoring divers sur WaoUtils ; fixes #5609 Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayParserFormatter.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayTimeParserFormatter.java Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -22,10 +22,10 @@ */ import fr.ifremer.wao.entity.I18nAble; -import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.i18n.I18n; +import org.nuiton.util.DateUtil; import java.text.DateFormat; import java.text.ParseException; @@ -35,7 +35,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import java.util.regex.Pattern; public class WaoUtils { @@ -59,6 +58,8 @@ protected static final String FRENCH_LANGUAGE = new Locale("fr").getLanguage(); + protected static final Date WAO_CREATION_DATE = DateUtil.createDate(27, 1, 2010); + @Deprecated public static String formatMonth(Date date) { return formatDate(date, MONTH_PATTERN); @@ -118,26 +119,22 @@ return dateFormat.parse(monthYear); } - public static Date parseDate(Locale locale, String monthYear) throws ParseException { + public static Date parseDate(Locale locale, String date) throws ParseException { String pattern = I18n.l(locale, "wao.date.parser"); DateFormat dateFormat = new SimpleDateFormat(pattern); - return dateFormat.parse(monthYear); + return dateFormat.parse(date); } - public static Date parseDateTime(Locale locale, String monthYear) throws ParseException { + public static Date parseDateTime(Locale locale, String dateTime) throws ParseException { String pattern = I18n.l(locale, "wao.datetime.parser"); DateFormat dateFormat = new SimpleDateFormat(pattern); - return dateFormat.parse(monthYear); + return dateFormat.parse(dateTime); } public static String l(Locale locale, I18nAble i18nAble) { return I18n.l(locale, i18nAble.getI18nKey()); } - public static Pattern getSampleRowCodePattern(ObsProgram obsProgram) { - return Pattern.compile("^(\\d{4})_" + obsProgram.getShortCode() + "(\\d{4})$"); - } - public static <T extends Enum> Collection<Integer> toOrdinals(Collection<T> enums) { List<Integer> ordinals = new LinkedList<>(); for (Enum anEnum : enums) { @@ -185,4 +182,8 @@ boolean isFrench = FRENCH_LANGUAGE.equals(locale.getLanguage()); return isFrench; } + + public static boolean isAfterWaoCreation(Date date) { + return WAO_CREATION_DATE.before(date); + } } Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java =================================================================== --- branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -20,6 +20,8 @@ */ package fr.ifremer.wao.entity; +import java.util.regex.Pattern; + import static org.nuiton.i18n.I18n.n; public enum ObsProgram implements I18nAble { @@ -66,4 +68,9 @@ public String getI18nKey() { return i18nKey; } + + public Pattern getSampleRowCodePattern() { + return Pattern.compile("^(\\d{4})_" + getShortCode() + "(\\d{4})$"); + } + } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -722,7 +722,7 @@ } if (updateSampleRowCommand.isCreation()) { - if ( ! WaoUtils.getSampleRowCodePattern(sampleRow.getObsProgram()).matcher(sampleRow.getCode()).matches()) { + if ( ! sampleRow.getObsProgram().getSampleRowCodePattern().matcher(sampleRow.getCode()).matches()) { throw new WrongSampleRowCodeFormatException(sampleRow); } } else { Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -41,6 +41,8 @@ import fr.ifremer.wao.services.service.csv.operations.BoatParserFormatter; import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter; import fr.ifremer.wao.services.service.csv.operations.ContactStateMotivesParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.DayParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.DayTimeParserFormatter; import fr.ifremer.wao.services.service.csv.operations.I18nAbleParserFormatter; import fr.ifremer.wao.services.service.csv.operations.SampleRowParserFormatter; import fr.ifremer.wao.services.service.csv.operations.UserParserFormatter; @@ -140,7 +142,7 @@ protected ModelBuilder<Contact> getModel() { ModelBuilder<Contact> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport("CONTACT_ID", Contact.PROPERTY_TOPIA_ID); - modelBuilder.newColumnForImportExport("CONTACT_DATE_CREATION", Contact.PROPERTY_CREATION_DATE, Common.DAY_TIME); + modelBuilder.newColumnForImportExport("CONTACT_DATE_CREATION", Contact.PROPERTY_CREATION_DATE, new DayTimeParserFormatter(locale)); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEUR_PRINCIPAL", Contact.PROPERTY_MAIN_OBSERVER, new UserParserFormatter(locale, waoUsers)); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEURS_SECONDAIRES", Contact.PROPERTY_SECONDARY_OBSERVERS, new UsersParserFormatter(locale, waoUsers)); @@ -171,9 +173,9 @@ new CompanyParserFormatter(locale, null) ); modelBuilder.newColumnForImportExport("CONTACT_ETAT", "contactState", new I18nAbleParserFormatter<>(locale, ContactState.getAllowedStates(obsProgram))); - modelBuilder.newColumnForImportExport("CONTACT_DEBUT_OBSERVATION", Contact.PROPERTY_OBSERVATION_BEGIN_DATE, Common.DAY_TIME); - modelBuilder.newColumnForImportExport("CONTACT_FIN_OBSERVATION", Contact.PROPERTY_OBSERVATION_END_DATE, Common.DAY_TIME); - modelBuilder.newColumnForImportExport("CONTACT_SAISIE_DONNEES", Contact.PROPERTY_DATA_INPUT_DATE, Common.DAY); + modelBuilder.newColumnForImportExport("CONTACT_DEBUT_OBSERVATION", Contact.PROPERTY_OBSERVATION_BEGIN_DATE, new DayTimeParserFormatter(locale)); + modelBuilder.newColumnForImportExport("CONTACT_FIN_OBSERVATION", Contact.PROPERTY_OBSERVATION_END_DATE, new DayTimeParserFormatter(locale)); + modelBuilder.newColumnForImportExport("CONTACT_SAISIE_DONNEES", Contact.PROPERTY_DATA_INPUT_DATE, new DayParserFormatter(locale)); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_OBSERVATEUR", Contact.PROPERTY_COMMENT); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_COORDINATEUR", Contact.PROPERTY_COMMENT_COORDINATOR); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_PROGRAMME", Contact.PROPERTY_COMMENT_ADMIN); @@ -211,7 +213,7 @@ return name; } }); - modelBuilder.newColumnForImportExport("CONTACT_TRANSMISSION_RESTITUTION", Contact.PROPERTY_RESTITUTION, Common.DAY); + modelBuilder.newColumnForImportExport("CONTACT_TRANSMISSION_RESTITUTION", Contact.PROPERTY_RESTITUTION, new DayParserFormatter(locale)); Set<ObservedDataControl> observedDataControlsValues = new HashSet<>(); Collections.addAll(observedDataControlsValues, ObservedDataControl.values()); Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayParserFormatter.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayParserFormatter.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayParserFormatter.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -0,0 +1,31 @@ +package fr.ifremer.wao.services.service.csv.operations; + +import fr.ifremer.wao.WaoUtils; +import org.nuiton.csv.Common; +import org.nuiton.i18n.I18n; + +import java.text.ParseException; +import java.util.Date; +import java.util.Locale; + +/** + * On vérifie que ce n'est pas une date absurde (l'an 14...) + */ +public class DayParserFormatter extends Common.DateValue { + + protected Locale locale; + + public DayParserFormatter(Locale locale) { + super("dd/MM/yyyy"); + this.locale = locale; + } + + @Override + public Date parse(String value) throws ParseException { + Date day = super.parse(value); + if (day != null && ! WaoUtils.isAfterWaoCreation(day)) { + throw new IllegalArgumentException(I18n.l(locale, "wao.import.failure.dateBeforeWaoCreation", value)); + } + return day; + } +} Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayTimeParserFormatter.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayTimeParserFormatter.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DayTimeParserFormatter.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -0,0 +1,31 @@ +package fr.ifremer.wao.services.service.csv.operations; + +import fr.ifremer.wao.WaoUtils; +import org.nuiton.csv.Common; +import org.nuiton.i18n.I18n; + +import java.text.ParseException; +import java.util.Date; +import java.util.Locale; + +/** + * On vérifie que ce n'est pas une date absurde (l'an 14...) + */ +public class DayTimeParserFormatter extends Common.DateValue { + + protected Locale locale; + + public DayTimeParserFormatter(Locale locale) { + super("dd/MM/yyyy HH:mm"); + this.locale = locale; + } + + @Override + public Date parse(String value) throws ParseException { + Date dayTime = super.parse(value); + if (dayTime != null && ! WaoUtils.isAfterWaoCreation(dayTime)) { + throw new IllegalArgumentException(I18n.l(locale, "wao.import.failure.dateBeforeWaoCreation", value)); + } + return dayTime; + } +} Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java 2014-08-13 10:23:05 UTC (rev 2211) @@ -23,7 +23,6 @@ */ package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParserFormatter; @@ -41,7 +40,7 @@ public SampleRowCodeParserFormatter(Locale locale, ObsProgram obsProgram) { this.locale = locale; - sampleRowCodePattern = WaoUtils.getSampleRowCodePattern(obsProgram); + sampleRowCodePattern = obsProgram.getSampleRowCodePattern(); } @Override Modified: branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-08-13 10:23:05 UTC (rev 2211) @@ -76,6 +76,7 @@ wao.import.contact.failure.wrongSampleRowCode=The is no sample row with code '%s' wao.import.contact.failure.wrongTerrestrialLocation=There is no location of type '%s' with code '%s' wao.import.failure=Import fail for reason\: %s. +wao.import.failure.dateBeforeWaoCreation=The is too old (before 2010-01-27) wao.import.failure.invalid.regionCode=The code '%s' is not a valid region code wao.import.failure.wrongLocationType='%s' is not a valid location type, allowed values are %s wao.import.failure.wrongObsDebCode=There is no profession code having code '%s' Modified: branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-08-13 09:36:03 UTC (rev 2210) +++ branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-08-13 10:23:05 UTC (rev 2211) @@ -73,6 +73,7 @@ wao.import.contact.failure.wrongSampleRowCode=Il n'y a pas de ligne du plan avec le code '%s' wao.import.contact.failure.wrongTerrestrialLocation=Il n'y a pas de lieu de type '%s' ayant pour code '%s' wao.import.failure=Une erreur est survenue lors de l'import \: %s. +wao.import.failure.dateBeforeWaoCreation=La date est trop ancienne (avant le 27/01/2010) wao.import.failure.invalid.regionCode=Le code '%s' n'est pas un code de région valide wao.import.failure.wrongLocationType='%s' n'est pas un type de lieu valide, les valeurs admises sont %s wao.import.failure.wrongObsDebCode=Il n'y a pas de code métier ayant pour code '%s'

1 0