This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.