This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3ba643f Ajout de méthodes de création des différentes datasources adds 057edb4 Ajout de la configuration pour deployer l'application web sur demo adds b474bf6 premier controleur pour le serveur web (refs #7463) adds f79fabf controleur pour seine pour le serveur web (refs #7463) adds 19a1517 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) adds e173179 Revue un peu du paquetage http (See #7463) adds b2f2af5 Introduction de constants pour les choses mises dans les headers de la requete (See #7463) adds b58240e Début de tests sur le client rest (See #7563) adds 90792e4 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation adds d48c6f3 Introduction d'un objet qui contient une connexion à une source de données (avec les droits utilisateurs) adds ce555e6 controleur pour la palangre pour le serveur web (refs #7463) adds d05cc1f controleur pour les actions pour le serveur web (refs #7463) adds a396ef2 Changement de l'API de DataSourceService pour quelle renvoie le résultat de la connexion à la source de données adds 7551bca test + correction de la communication entre le client REST et le serveur Web (refs #7463) adds 088f2d5 Revue de la manière de se connecter (introduction de ObserveDataSourceConnection) adds 25f9a39 Ajout du jeton d'authentification sur le DataSourceConnection adds bbf0592 Ajout d'un supplier de builder de Gson par default adds 0bd0e37 Revue du client reste adds 05119f9 Utilisation d'un main handler et faire fonctionner la connexion à une source de données adds 47edf5c Permettre de connecter plusieurs utilisateurs à la même source de données (un must pour une application web... adds a8b3658 Ajout de la méthode DataSourceService.canConnect adds 44b8798 Ajout traductions adds aadfbe4 Amélioration des tests sur le service DataSourceService pour bien attendre que la base est fermé adds 7908564 Ajout d'un service spécifique à l'API Rest pour tester si le serveur ping bien + une exception si une requète ne peut être jouée adds 5e21e08 Renommage méthode de vérification de configuration de source de données adds 2304c22 On teste si on peut lancer les tests sur le serveur web adds 5d91679 Ajout de nouvelles méthodes d'administration pour voir (et supprimer) les jetons d'authenfication adds 1e6036c Retour sur develop (pour tester le deployement sur demo) Merge branch 'feature/7463' into develop No new revisions were added by this update. Summary of changes: observe-application-web/pom.xml | 3 + .../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 + .../{NoDataAccess.java => ReadDataPermission.java} | 6 +- ...aAccess.java => ReadReferentialPermission.java} | 6 +- ...{NoDataAccess.java => WriteDataPermission.java} | 6 +- ...Access.java => WriteReferentialPermission.java} | 6 +- .../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 +- 133 files changed, 4162 insertions(+), 1115 deletions(-) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/GearUseFeaturesLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/DataSourceConfigurationAlreadyRegistredException.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidationResultForDto.java => ValidateResultForDto.java} (82%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => ReadDataPermission.java} (73%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => ReadReferentialPermission.java} (71%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => WriteDataPermission.java} (72%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => WriteReferentialPermission.java} (70%) create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java create mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java create mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java create mode 100644 observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialReferenceDtoAdapter.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.