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 a4bb28877abea83f3b676d21775a6f7f01f4a3e0 Merge: 0b1e832 fb5a769 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 20 09:43:51 2015 +0200 Merge branch 'feature/7458' into develop observe-services-api/pom.xml | 18 + .../observe/services/ObserveServiceContext.java | 4 +- .../observe/services/ObserveServiceFactory.java | 4 +- ...xt.java => ObserveDataSourceConfiguration.java} | 4 +- .../services/ObserveServiceApplicationContext.java | 24 + .../observe/services/ObserveServiceContext.java | 8 + .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveServiceFactorySupport.java | 4 +- .../services/ObserveServiceMainFactory.java | 30 +- .../services/service/DataNotFoundException.java | 30 + .../services/service/ReferentialService.java | 20 +- .../longline/ActivityLongLineEncouterService.java | 20 + .../ActivityLongLineSensorUsedService.java | 21 + .../service/longline/ActivitySeineService.java | 29 + .../service/longline/CatchLonglineService.java | 23 + .../longline/GearUseFeaturesLonglineService.java | 30 + .../SetLonglineDetailCompositionService.java | 20 + .../SetLonglineGlobalCompositionService.java | 20 + .../service/longline/SetLonglineService.java | 28 + .../service/longline/TripLonglineService.java | 30 + .../seine/ActivitySeineObservedSystemService.java | 20 + .../service/seine/ActivitySeineService.java | 29 + .../service/seine/FloatingObjectService.java | 30 + .../service/seine/GearUseFeaturesSeineService.java | 30 + .../service/seine/NonTargetCatchService.java | 19 + .../service/seine/NonTargetSampleService.java | 19 + .../seine/ObjectObservedSpeciesService.java | 20 + .../service/seine/ObjectSchoolEstimateService.java | 19 + .../services/service/seine/RouteService.java | 30 + .../service/seine/SchoolEstimateService.java | 20 + .../services/service/seine/SetSeineService.java | 28 + .../services/service/seine/TargetCatchService.java | 19 + .../service/seine/TargetSampleService.java | 20 + .../seine/TransmittingBuoyOperationService.java | 20 + .../services/service/seine/TripSeineService.java | 30 + .../services/FakeObserveServiceContext.java | 10 - .../services/FakeObserveServiceFactory.java | 19 - .../services/ObserveServiceMainFactoryTest.java | 23 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-model/pom.xml | 24 +- .../{model => dto}/AbstractObserveDto.java | 2 +- .../ReferentialFormDto.java => dto/FormDto.java} | 12 +- .../java/fr/ird/observe/services/dto/FormDtos.java | 24 + .../fr/ird/observe/services/dto/ReferenceDto.java | 51 + .../fr/ird/observe/services/dto/ReferenceDtos.java | 11 + .../ird/observe/services/dto/ReferenceSetDto.java | 17 + .../ird/observe/services/dto/ReferenceSetDtos.java | 20 + .../dto/ReferenceValueNotFoundException.java | 28 + .../{model => dto}/constants/GearType.java | 2 +- .../{model => dto}/constants/ReferenceStatus.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 124 ++ .../seine/NonTargetCatchComputedValueSource.java | 52 + .../services/dto/constants/seine/Ownership.java | 51 + .../constants/seine/SchoolType.java} | 35 +- .../seine/TypeTransmittingBuoyOperation.java | 68 ++ .../dto/referential/ReferentialReferenceDto.java | 65 + .../dto/referential/ReferentialReferenceDtos.java | 18 + .../model/referential/ReferentialFormDtos.java | 15 - .../xmi/observe-services-dto-common.properties | 13 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 0 -> 34074 bytes ...es => observe-services-dto-longline.properties} | 4 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 0 -> 77309 bytes ...rties => observe-services-dto-seine.properties} | 4 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 0 -> 54397 bytes .../xmi/observe-services-model-common.properties | 13 - .../main/xmi/observe-services-model-common.zargo | Bin 32880 -> 0 bytes .../main/xmi/observe-services-model-longline.zargo | Bin 96124 -> 0 bytes .../main/xmi/observe-services-model-seine.zargo | Bin 85518 -> 0 bytes .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 43 +- .../ObserveRestClientDataSourceConfiguration.java | 39 + .../rest/client/ObserveRestClientService.java | 23 + .../client/ObserveRestClientServiceContext.java | 38 + .../client/ObserveRestClientServiceFactory.java | 46 + .../service/ReferentialServiceRestClient.java | 54 + .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../client/service/ReferentialServiceRestTest.java | 45 + .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 59 +- .../wm/ObserveRestWebMotionApplicationContext.java | 81 ++ .../ObserveRestWebMotionApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionController.java | 11 + .../rest/wm/ObserveRestWebMotionFilter.java | 55 + .../rest/wm/ObserveRestWebMotionJsonHelper.java | 130 ++ .../rest/wm/ObserveRestWebMotionRender.java | 52 + .../rest/wm/service/ReferentialServiceRest.java | 66 + .../src/main/resources/mapping | 12 + .../src/main/webapp/WEB-INF/web.xml | 25 + .../services/ObserveServiceContextRest.java | 10 - .../services/ObserveServiceFactoryRest.java | 33 - .../ird/observe/services/ObserveServiceRest.java | 17 - .../rest/wm/ObserveRestApplicationContext.java | 42 + .../rest/wm/ObserveRestApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionFilter.java | 62 + .../services/service/ReferentialServiceRest.java | 58 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-rest/src/main/resources/mapping | 28 + .../src/main/webapp/WEB-INF/web.xml | 36 + .../referential/ReferentialServiceRestTest.java | 37 - observe-services-topia/pom.xml | 35 +- .../observe/services/AbstractObserveService.java | 5 +- .../services/ObserveServiceContextTopia.java | 33 - .../ird/observe/services/ObserveServiceTopia.java | 20 - .../services/service/ReferentialDtoBuilder.java | 171 --- .../services/service/ReferentialServiceTopia.java | 220 ---- .../observe/services/topia/ObserveDtoBinders.java | 39 + .../services/topia/ObserveDtosInitializer.java | 1262 ++++++++++++++++++++ .../services/topia/ObserveServiceTopia.java | 117 ++ .../topia/ObserveTopiaDataSourceConfiguration.java | 22 + .../services/topia/ObserveTopiaServiceContext.java | 54 + .../ObserveTopiaServiceFactory.java} | 44 +- .../services/topia/builder/DtoToEntityBuilder.java | 184 +++ .../services/topia/builder/EntityToDtoBuilder.java | 198 +++ .../topia/builder/EntityToReferenceDtoBuilder.java | 49 + .../EntityToReferentialReferenceDtoBuilder.java | 49 + .../topia/service/ReferentialServiceTopia.java | 138 +++ .../ActivitySeineObservedSystemServiceTopia.java | 27 + .../service/seine/ActivitySeineServiceTopia.java | 46 + .../service/seine/FloatingObjectServiceTopia.java | 46 + .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../service/ReferentialDtoBuilderTest.java | 72 -- .../referential/ReferentialServiceTopiaTest.java | 37 - .../service/topia/ApplicationContextResource.java | 83 ++ .../services/service/topia/DataSourceResource.java | 126 ++ .../topia/service/ReferentialServiceTopiaTest.java | 232 ++++ .../topia/builder/DtoToEntityBuilderTest.java | 117 ++ .../topia/builder/EntityToDtoBuilderTest.java | 130 ++ pom.xml | 53 +- 131 files changed, 5238 insertions(+), 993 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.