This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 84af08c026578acdf1df57e20a4cd7b0094a7c60 Merge: cab709a 46019f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 13:12:10 2016 +0100 Merge branch 'feature/casser_dependance_service_model_vers_entities' into develop observe-entities/pom.xml | 8 +- .../observe/ObserveTopiaApplicationContext.java | 52 +++-- .../observe/ObserveTopiaPersistenceContext.java | 10 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 103 +++++++++ .../java/fr/ird/observe/entities/Entities.java | 6 +- .../java/fr/ird/observe/entities/TripMapPoint.java | 59 +++++ .../{GearType.java => GearTypePersist.java} | 10 +- ...enceStatus.java => ReferenceStatusPersist.java} | 2 +- .../constants/TripMapPointTypePersist.java | 58 +++++ ... NonTargetCatchComputedValueSourcePersist.java} | 4 +- .../{Ownership.java => OwnershipPersist.java} | 10 +- .../{SchoolType.java => SchoolTypePersist.java} | 4 +- ...a => TypeTransmittingBuoyOperationPersist.java} | 10 +- .../entities/longline/ActivityLonglineImpl.java | 12 - .../entities/longline/TripLonglineImpl.java | 112 --------- .../entities/longline/TripLonglineTopiaDao.java | 158 ++++++------- .../referentiel/LengthWeightParameters.java | 6 +- .../referentiel/LengthWeightParemeterHelper.java | 6 +- .../referentiel/ObserveReferentialEntities.java | 4 +- .../referentiel/ObserveReferentialEntityImpl.java | 6 +- .../entities/referentiel/ProgramTopiaDao.java | 4 +- .../ird/observe/entities/referentiel/Programs.java | 6 +- .../observe/entities/referentiel/SpeciesImpl.java | 12 +- .../observe/entities/referentiel/VesselImpl.java | 10 +- .../observe/entities/seine/ActivitySeineImpl.java | 14 +- .../ird/observe/entities/seine/ActivitySeines.java | 10 +- .../observe/entities/seine/FloatingObjectImpl.java | 18 +- .../observe/entities/seine/NonTargetCatchImpl.java | 14 +- .../entities/seine/NonTargetLengthImpl.java | 8 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 255 +-------------------- .../ird/observe/entities/seine/SetSeineImpl.java | 12 +- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../observe/entities/seine/TargetLengthImpl.java | 10 +- .../ird/observe/entities/seine/TripSeineImpl.java | 135 ----------- .../observe/entities/seine/TripSeineTopiaDao.java | 118 +++++----- observe-entities/src/main/xmi/observe-common.zargo | Bin 37603 -> 37331 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 84567 -> 84619 bytes .../test/java/fr/ird/observe/util/NumbersTest.java | 86 ------- .../fr/ird/observe/services/dto/TripMapDtos.java | 15 -- .../longline/SetLonglineGlobalCompositionDto.java | 3 - .../seine/FloatingObjectTransmittingBuoyDto.java | 5 +- .../services/dto/seine/TargetLengthDto.java | 9 +- .../src/main/java/fr/ird/observe/util/Numbers.java | 87 ------- .../ird/observe/services/binder/BinderSupport.java | 98 +++++--- .../observe/services/entity/TripMapDtoFactory.java | 40 ++++ .../services/service/DataSourceServiceTopia.java | 31 +-- .../ConsolidateActivitySeineDataResultBuilder.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 30 +-- .../service/longline/TripLonglineServiceTopia.java | 8 +- .../service/seine/SetSeineServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 8 +- .../referentiel/LengthWeightParemetersTest.java | 4 +- pom.xml | 8 +- 53 files changed, 636 insertions(+), 1074 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.