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 cbf55f5 renommage des classes de test pour le module client Rest new ac7c587 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 7407fcd ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) new 35481cc ajout de la date de mise a jour dans les DTO (refs #7470 #7520) new a78bd4e lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) new 5b64f73 fix npe (refs #7470 #7520) new 9f17d49 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) new 2bfa227 Mise à jour du référentiel (Termine #7520). Merge branch 'feature/7520' into develop The 7 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 2bfa22757d2ec70552d1195f75aefd66d750e2e9 Merge: cbf55f5 9f17d49 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 16 08:34:12 2015 +0200 Mise à jour du référentiel (Termine #7520). Merge branch 'feature/7520' into develop commit 9f17d4914216271dd9261cda2fa3b6dc12d67e7e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 15 10:52:47 2015 +0200 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) commit 5b64f735b90cbe9baa4dd8aab5a4f77c12466af0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 11 11:20:59 2015 +0200 fix npe (refs #7470 #7520) commit a78bd4e97e995e91b8df5908873bec7230d7d735 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 11 11:09:27 2015 +0200 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) commit 35481cc6bcb3471ad7eb800162cf39ffc63f74ce Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 11 10:21:39 2015 +0200 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) commit 7407fcdbb3c0fe80c6ffcf53dd0edb098ee451d1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) commit ac7c5874a591a2e323906c69273dafda6d990c0e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) Summary of changes: .../v1/ReferentialServiceController.java | 6 + .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_5_0.java | 6 +- .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ++++++++++++++++++++ .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 +++++++++++++++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 35191 -> 37033 bytes .../src/main/xmi/observe-longline.zargo | Bin 95691 -> 96937 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 83247 -> 84597 bytes .../service/ConcurrentModificationException.java | 26 ++++ .../services/service/ReferentialService.java | 4 + .../observe/services/dto/FollowedUpdateDto.java | 14 ++ .../ird/observe/services/dto/ReferenceSetDtos.java | 8 +- .../xmi/observe-services-dto-common.properties | 6 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 34629 -> 35328 bytes .../xmi/observe-services-dto-longline.properties | 6 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 59030 -> 61407 bytes .../main/xmi/observe-services-dto-seine.properties | 6 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 56972 -> 59029 bytes .../ird/observe/services/ObserveServiceTopia.java | 80 ++++++++++- .../services/dto/ObserveDtosInitializer.java | 57 +++++--- .../services/service/ReferentialServiceTopia.java | 17 +++ .../services/service/AbstractServiceTopiaTest.java | 20 ++- .../service/ReferentialServiceTopiaTest.java | 36 +++++ .../service/seine/TripSeineServiceTopiaTest.java | 52 +++++++ 27 files changed, 619 insertions(+), 41 deletions(-) create mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.