This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from f9f19a0 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop new f897944 service et DTO pour les cartes de marées (refs #7620) new c30c018 Passage en list des points new cc4e981 refs #7620 Il reste encore le pb des traductions à revoir Merge branch 'feature/7620' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cc4e98127a29ff2551c9e97ba7bec42d463051b3 Merge: f9f19a0 c30c018 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:46:31 2015 +0200 refs #7620 Il reste encore le pb des traductions à revoir Merge branch 'feature/7620' into develop commit c30c01886f052588b75c9535b26d32e535f40a04 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:41:57 2015 +0200 Passage en list des points commit f897944f4dc36ee59121237f3f10e237143f4b60 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 18:06:51 2015 +0200 service et DTO pour les cartes de marées (refs #7620) Summary of changes: .../v1/longline/TripLonglineServiceController.java | 6 ++ .../v1/seine/TripSeineServiceController.java | 6 ++ observe-entities/pom.xml | 6 ++ .../entities/longline/TripLonglineTopiaDao.java | 32 +++++----- .../observe/entities/seine/TripSeineTopiaDao.java | 18 +++--- .../java/fr/ird/observe/tripMap/TripMapPoint.java | 71 --------------------- .../service/longline/TripLonglineService.java | 4 ++ .../services/service/seine/TripSeineService.java | 4 ++ .../services/dto/constants}/TripMapPointType.java | 2 +- .../xmi/observe-services-dto-common.properties | 1 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 39020 -> 41878 bytes .../services/dto/ObserveDtosInitializer.java | 10 +++ .../service/longline/TripLonglineServiceTopia.java | 16 +++++ .../service/seine/TripSeineServiceTopia.java | 16 +++++ 14 files changed, 95 insertions(+), 97 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java rename {observe-entities/src/main/java/fr/ird/observe/tripMap => observe-services-model/src/main/java/fr/ird/observe/services/dto/constants}/TripMapPointType.java (97%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.