This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit a40330314142fa9b0fa6b23b01e75cbcd6965b89 Merge: c8785db a771eb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:02:34 2014 +0200 Fusion de la branche de release dans master .gitignore | 4 + pom.xml | 87 +++++-- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/BoatsFilter.java | 10 +- .../main/java/fr/ifremer/wao/ContactsFilter.java | 22 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 33 +-- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 60 +++++ .../src/main/java/fr/ifremer/wao/WaoUtils.java | 106 ++++---- .../java/fr/ifremer/wao/entity/ContactImpl.java | 9 +- .../java/fr/ifremer/wao/entity/ContactState.java | 108 ++++---- .../java/fr/ifremer/wao/entity/ContactStates.java} | 38 +-- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 2 +- ...2__average_tide_time_to_int,_clean_defaults.sql | 29 +++ .../i18n/wao-persistence_en_GB.properties | 2 + .../i18n/wao-persistence_fr_FR.properties | 2 + wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59675 -> 59661 bytes .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 46 ++++ .../fr/ifremer/wao/entity/ContactImplTest.java | 52 ---- .../fr/ifremer/wao/entity/ContactStateTest.java | 21 ++ .../ifremer/wao/entity/SampleRowLogImplTest.java | 2 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 4 + .../wao/services/service/AbstractFilterValues.java | 10 +- .../wao/services/service/BoatsFilterValues.java | 5 +- .../wao/services/service/ContactsFilterValues.java | 62 ++++- .../wao/services/service/ContactsService.java | 6 +- .../ifremer/wao/services/service/FilterOption.java | 22 +- .../wao/services/service/InitWaoService.java | 17 ++ .../wao/services/service/ObsMerSamplingPlan.java | 157 ++++-------- .../service/ObsMerSamplingPlanBuilder.java | 282 +++++++++------------ .../service/ObsMerSamplingPlanService.java | 153 ++++------- .../wao/services/service/ObsVenteSamplingPlan.java | 8 +- .../service/ObsVenteSamplingPlanBuilder.java | 34 +-- .../services/service/SampleRowsFilterValues.java | 16 +- .../ifremer/wao/services/service/SamplingPlan.java | 219 +++++++--------- .../wao/services/service/SamplingPlanCacheKey.java | 12 + .../wao/services/service/SamplingPlanService.java | 5 +- .../service/administration/ReferentialService.java | 74 +----- .../service/csv/ContactImportExportModel.java | 7 +- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- .../service/csv/ObsMerSamplingPlanExportModel.java | 71 +++++- .../operations/ContactStateParserFormatter.java | 83 ++++++ .../wao/services/service/mail/EmailService.java | 4 +- .../service/mail/MammalsObservationEmail.java | 8 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../service/ObsMerSamplingPlanServiceTest.java | 12 +- wao-web/pom.xml | 2 +- ...er.java => CacheInvalidationTopiaListener.java} | 6 +- .../wao/web/DefaultWaoApplicationContext.java | 8 +- .../wao/web/RedirectToContextPathRootFilter.java | 68 +++++ .../fr/ifremer/wao/web/WaoJspActionSupport.java | 20 ++ .../wao/web/action/AbstractSamplingPlanAction.java | 9 +- .../fr/ifremer/wao/web/action/BoatsAction.java | 6 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 12 +- .../web/action/ContactsFilterValuesJsonAction.java | 23 +- .../ifremer/wao/web/action/EditContactAction.java | 29 ++- .../fr/ifremer/wao/web/action/SynthesisAction.java | 4 +- .../wao/web/action/ValidateContactJsonAction.java | 9 +- .../administration/InvalidateAllCachesAction.java | 47 ++++ .../web/WaoJspActionSupport-conversion.properties | 21 ++ .../main/resources/i18n/wao-web_en_GB.properties | 6 + .../main/resources/i18n/wao-web_fr_FR.properties | 6 + .../administration/invalidate-all-caches-input.jsp | 49 ++++ .../administration/referential-management.jsp | 8 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 19 +- .../webapp/WEB-INF/content/edit-contact-input.jsp | 6 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 261 +++++++------------ .../WEB-INF/content/obsvente/sampling-plan.jsp | 125 +++------ .../src/main/webapp/WEB-INF/content/synthesis.jsp | 2 +- .../WEB-INF/content/templates/td-effort-obsmer.jsp | 33 +++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 52 ++++ .../webapp/WEB-INF/decorators/layout-login.jsp | 2 - .../src/main/webapp/WEB-INF/decorators/layout.jsp | 59 ++++- wao-web/src/main/webapp/WEB-INF/web.xml | 11 + wao-web/src/main/webapp/endpoints-js.jsp | 39 --- wao-web/src/main/webapp/wao.css | 36 +-- wao-web/src/main/webapp/wao.js | 51 ++-- 79 files changed, 1640 insertions(+), 1303 deletions(-) diff --cc pom.xml index d7130a6,74c8266..c109f10 --- a/pom.xml +++ b/pom.xml @@@ -4,8 -4,8 +4,8 @@@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> - <artifactId>pom</artifactId> ++ <artifactId>codelutinpom</artifactId> + <version>1.5</version> </parent> <groupId>fr.ifremer</groupId> diff --cc wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java index 0e2b3ae,baa8d89..9d7533a --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java @@@ -29,8 -29,8 +29,9 @@@ import com.google.common.base.Precondit import com.google.common.base.Splitter; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; + import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.common.collect.Iterables; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; diff --cc wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java index a927104,ddc28fd..a545b39 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java @@@ -346,4 -357,8 +357,8 @@@ public class EditContactAction extends } - } + public int getReturnToPageNumber() { + return returnToPageNumber; + } + -} ++} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.