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 70103b327b0f77d8d097d738d3b02aa6e3bff1ce Merge: 730d5a5 1a82216 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 14:47:32 2015 +0200 Retour sur develop Merge branch 'feature/7458-4' into develop .../observe/entities/{Set.java => ObserveSet.java} | 2 +- .../fr/ird/observe/entities/OpenableEntities.java | 142 +++--- .../ird/observe/entities/OpenableEntityImpl.java | 35 -- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../entities/constants/ReferenceLocale.java | 35 ++ .../entities/longline/ActivityLonglineImpl.java | 24 +- .../longline/ActivityLonglineTopiaDao.java | 8 +- .../entities/longline/SectionWithTemplateImpl.java | 6 +- .../fr/ird/observe/entities/longline/Sections.java | 6 +- .../entities/longline/TripLonglineImpl.java | 142 +++--- .../entities/longline/TripLonglineTopiaDao.java | 13 +- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_5_0.java | 54 +++ .../observe/entities/seine/ActivitySeineImpl.java | 23 +- .../entities/seine/ActivitySeineTopiaDao.java | 7 +- .../observe/entities/seine/FloatingObjectImpl.java | 3 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 499 ++++++++++----------- .../ird/observe/entities/seine/RouteTopiaDao.java | 8 +- .../ird/observe/entities/seine/TripSeineImpl.java | 250 +++++------ .../observe/entities/seine/TripSeineTopiaDao.java | 9 +- .../main/resources/db/5.0/remove_open_field-H2.sql | 5 + .../main/resources/db/5.0/remove_open_field-PG.sql | 5 + .../src/main/xmi/observe-common.properties | 2 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 35500 -> 35191 bytes .../src/main/xmi/observe-longline.properties | 14 +- .../src/main/xmi/observe-longline.zargo | Bin 96124 -> 95691 bytes .../src/main/xmi/observe-seine.properties | 17 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85518 -> 83247 bytes .../services/service/seine/TripSeineService.java | 6 +- .../java/fr/ird/observe/services/dto/FormDto.java | 10 + .../ird/observe/services/dto/ReferenceSetDtos.java | 13 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 55301 bytes .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../services/builder/DtoToEntityBuilder.java | 2 +- .../services/builder/EntityToDtoBuilder.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 12 +- .../service/seine/TripSeineServiceTopia.java | 40 +- .../services/ApplicationContextResource.java | 25 ++ .../ird/observe/services/DataSourceResource.java | 46 +- .../services/builder/DtoToEntityBuilderTest.java | 3 +- .../services/service/AbstractServiceTopiaTest.java | 76 ++++ .../service/DataSourceServiceTopiaTest.java | 11 +- .../service/ReferentialServiceTopiaTest.java | 36 +- .../service/seine/TripSeineServiceTopiaTest.java | 219 +++++++-- .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin 0 -> 1520436 bytes .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 0 -> 430098 bytes .../src/main/resources/db/4.0.1/test.sql.gz | Bin 5044065 -> 0 bytes pom.xml | 2 +- 48 files changed, 1088 insertions(+), 731 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.