This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 1e6036ceb2e7ec47e52c858b9c5ed126674d2975 Merge: 057edb4 5d91679 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 6 23:11:04 2015 +0200 Retour sur develop (pour tester le deployement sur demo) Merge branch 'feature/7463' into develop .../ObserveDataSourceConfigurationConverter.java | 47 ++ .../web/ObserveWebApplicationListener.java | 30 ++ .../application/web/ObserveWebMainHandler.java | 27 ++ .../application/web/ObserveWebMotionFilter.java | 32 +- .../web/ObserveWebMotionJsonHelper.java | 130 ----- .../ObserveWebApplicationConfiguration.java | 44 +- .../ObserveWebApplicationConfigurationOption.java | 2 + .../web/controller/v1/ConfigurationController.java | 39 ++ .../controller/v1/DataSourceServiceController.java | 64 +-- .../web/controller/v1/PingServiceController.java | 17 + .../v1/ReferentialServiceController.java | 4 - .../ConsolidateDataServiceController.java | 22 + .../v1/actions/report/ReportServiceController.java | 34 ++ .../validate/ValidateServiceController.java | 34 ++ .../ActivityLongLineEncouterServiceController.java | 31 ++ ...ctivityLongLineSensorUsedServiceController.java | 31 ++ .../ActivityLonglineServiceController.java | 49 ++ .../GearUseFeaturesLonglineServiceController.java | 48 ++ .../SetLonglineCatchServiceController.java | 31 ++ ...LonglineDetailCompositionServiceController.java | 31 ++ ...LonglineGlobalCompositionServiceController.java | 31 ++ .../v1/longline/SetLonglineServiceController.java | 41 ++ .../v1/longline/TdrServiceController.java | 31 ++ .../v1/longline/TripLonglineServiceController.java | 49 ++ ...tivitySeineObservedSystemServiceController.java | 31 ++ .../v1/seine/ActivitySeineServiceController.java | 49 ++ .../v1/seine/FloatingObjectServiceController.java | 49 ++ .../GearUseFeaturesSeineServiceController.java | 48 ++ .../v1/seine/NonTargetCatchServiceController.java | 31 ++ .../v1/seine/NonTargetSampleServiceController.java | 36 ++ .../ObjectObservedSpeciesServiceController.java | 31 ++ .../ObjectSchoolEstimateServiceController.java | 31 ++ .../v1/seine/RouteServiceController.java | 49 ++ .../v1/seine/SchoolEstimateServiceController.java | 31 ++ .../v1/seine/SetSeineServiceController.java | 41 ++ .../v1/seine/TargetCatchServiceController.java | 31 ++ .../v1/seine/TargetSampleServiceController.java | 36 ++ ...TransmittingBuoyOperationServiceController.java | 31 ++ .../v1/seine/TripSeineServiceController.java | 49 ++ ...urceConfigurationAlreadyRegistredException.java | 27 -- .../ObserveWebSecurityApplicationContext.java | 46 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 14 +- observe-application-web/src/main/resources/mapping | 9 +- .../observe/ObserveTopiaApplicationContext.java | 22 + .../observe/services/ObserveServiceFactory.java | 3 + .../services/ObserveServiceInitializer.java | 69 ++- .../services/service/DataSourceService.java | 11 +- .../DatabaseConnexionNotAuthorizedException.java | 5 + .../service/DatabaseNotFoundException.java | 6 +- .../ird/observe/services/service/PingService.java | 16 + .../services/service/ReferentialService.java | 11 +- .../consolidate/ConsolidateDataService.java | 4 + .../service/actions/report/ReportService.java | 8 + ...ResultForDto.java => ValidateResultForDto.java} | 4 +- .../actions/validate/ValidateResultForDtoType.java | 10 +- .../service/actions/validate/ValidateService.java | 5 + .../longline/ActivityLongLineEncouterService.java | 5 + .../ActivityLongLineSensorUsedService.java | 5 + .../service/longline/ActivityLonglineService.java | 8 + .../longline/GearUseFeaturesLonglineService.java | 8 + .../service/longline/SetLonglineCatchService.java | 5 + .../SetLonglineDetailCompositionService.java | 5 + .../SetLonglineGlobalCompositionService.java | 5 + .../service/longline/SetLonglineService.java | 7 + .../services/service/longline/TdrService.java | 5 + .../service/longline/TripLonglineService.java | 8 + .../seine/ActivitySeineObservedSystemService.java | 5 + .../service/seine/ActivitySeineService.java | 8 + .../service/seine/FloatingObjectService.java | 8 + .../service/seine/GearUseFeaturesSeineService.java | 8 + .../service/seine/NonTargetCatchService.java | 5 + .../service/seine/NonTargetSampleService.java | 9 +- .../seine/ObjectObservedSpeciesService.java | 5 + .../service/seine/ObjectSchoolEstimateService.java | 5 + .../services/service/seine/RouteService.java | 8 + .../service/seine/SchoolEstimateService.java | 5 + .../services/service/seine/SetSeineService.java | 7 + .../services/service/seine/TargetCatchService.java | 5 + .../service/seine/TargetSampleService.java | 6 + .../seine/TransmittingBuoyOperationService.java | 5 + .../services/service/seine/TripSeineService.java | 8 + .../observe/services/spi/ReadDataPermission.java | 19 + .../services/spi/ReadReferentialPermission.java | 19 + .../observe/services/spi/WriteDataPermission.java | 19 + .../services/spi/WriteReferentialPermission.java | 19 + .../ObserveDataSourceConfiguration.java | 4 +- .../configuration/ObserveDataSourceConnection.java | 37 ++ .../ObserveDataSourceConnectionSupport.java | 84 ++++ .../ObserveDataSourceConfigurationRest.java | 50 +- ...bserveDataSourceConfigurationRestConstants.java | 30 ++ .../ObserveDataSourceConnectionRest.java | 28 ++ .../ObserveDataSourceConfigurationTopiaH2.java | 13 +- .../ObserveDataSourceConfigurationTopiaPG.java | 6 - .../ObserveDataSourceConnectionTopia.java | 18 + .../java/fr/ird/observe/services/dto/FormDto.java | 12 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 14 +- .../services/dto/gson/ImmutableListAdapter.java | 25 + .../services/dto/gson/ObserveDtoGsonSupplier.java | 16 +- .../services/dto/gson/ReferenceDtoAdapter.java | 84 ++++ .../dto/gson/ReferentialReferenceDtoAdapter.java | 27 ++ .../dto/referential/ReferentialReferenceDtos.java | 8 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 34074 -> 33879 bytes observe-services-rest/pom.xml | 6 + .../ObserveDataSourceConnectionAdapter.java | 24 + .../services/ObserveServiceFactoryRest.java | 251 ++++++++-- .../ObserveServiceRestNotAvailableException.java | 26 + .../ird/observe/services/http/ObserveRequest.java | 77 +++ .../services/http/ObserveRequestBuilder.java | 134 ++++++ .../services/http/ObserveRequestMethod.java | 13 + .../ird/observe/services/http/ObserveResponse.java | 140 ++++++ .../services/http/ObserveResponseBuilder.java | 409 ++++++++++++++++ .../ird/observe/services/http/RequestBuilder.java | 531 --------------------- .../ird/observe/services/http/RequestResult.java | 112 ----- .../fr/ird/observe/services/TestClassResource.java | 155 ++++++ .../ird/observe/services/TestMethodResource.java | 124 +++++ .../service/DataSourceServiceRestTest.java | 71 +++ .../service/seine/TripSeineServiceTest.java | 327 +++++++++++++ .../ObserveDataSourceConfigurationMainFactory.java | 43 +- .../services/ObserveServiceMainFactory.java | 25 + .../services/ObserveServiceContextTopia.java | 28 +- .../services/ObserveServiceFactoryTopia.java | 60 ++- .../ird/observe/services/ObserveServiceTopia.java | 12 +- .../ObserveTopiaApplicationContextFactory.java | 18 +- .../services/service/DataSourceServiceTopia.java | 153 ++++-- .../actions/validate/ValidateServiceTopia.java | 6 +- .../service/seine/TripSeineServiceTopia.java | 3 + .../i18n/observe-services-topia_en_GB.properties | 4 + .../i18n/observe-services-topia_es_ES.properties | 4 + .../i18n/observe-services-topia_fr_FR.properties | 4 + .../ird/observe/services/DataSourceResource.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 107 ++++- .../actions/validate/ValidateServiceTopiaTest.java | 24 +- 132 files changed, 4223 insertions(+), 1103 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.