This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 110f3362c3beb7c1a2cfdefa63b03656b24c2c1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 6 13:17:33 2016 +0200 Ok cette fois ci tous les noms de packages sont bien alignés avec leur group id --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 4 ++-- application-swing-validation/pom.xml | 4 ++-- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 8 ++++---- .../swing/ObserveSwingApplicationDataSourcesManager.java | 6 +++--- .../application/swing/db/ObserveSwingDataSource.java | 6 +++--- .../application/swing/ui/actions/ReloadStorageAction.java | 4 ++-- .../ui/admin/synchronize/data/DataSynchroUIHandler.java | 2 +- .../application/swing/ui/storage/ObstunaAdminAction.java | 4 ++-- .../application/swing/ui/storage/StorageUIHandler.java | 6 +++--- .../application/swing/ui/storage/StorageUIModel.java | 6 +++--- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 6 +++--- .../application/web/ObserveWebApplicationListener.java | 2 +- .../ird/observe/application/web/ObserveWebMotionFilter.java | 2 +- .../web/controller/v1/DataSourceServiceController.java | 4 ++-- .../injector/ObserveDataSourceConfigurationInjector.java | 2 +- .../application/web/injector/ObserveDtoInjector.java | 2 +- pom.xml | 6 +++--- services-configuration-rest/pom.xml | 2 +- .../{ => rest}/ObserveDataSourceConfigurationRest.java | 4 +++- .../ObserveDataSourceConfigurationRestConstants.java | 2 +- .../{ => rest}/ObserveDataSourceConnectionRest.java | 3 ++- services-configuration-topia/pom.xml | 2 +- .../{ => topia}/ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../{ => topia}/ObserveDataSourceConfigurationTopiaPG.java | 2 +- .../ObserveDataSourceConfigurationTopiaSupport.java | 4 +++- .../{ => topia}/ObserveDataSourceConnectionTopia.java | 3 ++- {services-model => services-configuration}/LICENSE.txt | 0 {services-model => services-configuration}/README.md | 0 .../pom.xml | 6 +++--- .../configuration/ObserveDataSourceConfiguration.java | 0 .../ObserveDataSourceConfigurationAndConnection.java | 0 .../services/configuration/ObserveDataSourceConnection.java | 0 .../configuration/ObserveDataSourceConnectionSupport.java | 0 .../configuration/ObserveDataSourceInformation.java | 0 .../services/configuration/ObserveDataSourceType.java | 0 .../src/test/resources/log4j.properties | 0 {services-configuration-api => services-dto}/LICENSE.txt | 0 {services-configuration-api => services-dto}/README.md | 0 {services-model => services-dto}/pom.xml | 8 ++++---- .../src/license/THIRD-PARTY.properties | 0 .../fr/ird/observe/services/dto/AbstractObserveDto.java | 0 .../java/fr/ird/observe/services/dto/AbstractReference.java | 0 .../fr/ird/observe/services/dto/AbstractReferenceSet.java | 0 .../java/fr/ird/observe/services/dto/DataReference.java | 0 .../java/fr/ird/observe/services/dto/DataReferenceSet.java | 0 .../services/dto/DataSourceCreateConfigurationDto.java | 0 .../DataSourceCreateWithNoReferentialImportException.java | 0 .../src/main/java/fr/ird/observe/services/dto/Form.java | 0 .../src/main/java/fr/ird/observe/services/dto/IdDto.java | 0 .../src/main/java/fr/ird/observe/services/dto/IdDtos.java | 0 .../IncompatibleDataSourceCreateConfigurationException.java | 0 .../java/fr/ird/observe/services/dto/ObserveDbUserDtos.java | 0 .../main/java/fr/ird/observe/services/dto/ObserveDto.java | 0 .../services/dto/ObserveSpeciesListConfiguration.java | 0 .../main/java/fr/ird/observe/services/dto/ReferenceMap.java | 0 .../services/dto/ReferenceValueNotFoundException.java | 0 .../fr/ird/observe/services/dto/UnauthorizedException.java | 0 .../ird/observe/services/dto/actions/report/DataMatrix.java | 0 .../fr/ird/observe/services/dto/actions/report/Report.java | 0 .../services/dto/actions/report/ReportOperation.java | 0 .../observe/services/dto/actions/report/ReportRequest.java | 0 .../observe/services/dto/actions/report/ReportVariable.java | 0 .../fr/ird/observe/services/dto/constants/GearType.java | 0 .../ird/observe/services/dto/constants/ObserveDbRole.java | 0 .../ird/observe/services/dto/constants/ReferenceStatus.java | 0 .../observe/services/dto/constants/ReferentialLocale.java | 0 .../observe/services/dto/constants/TripMapPointType.java | 0 .../constants/seine/NonTargetCatchComputedValueSource.java | 0 .../ird/observe/services/dto/constants/seine/Ownership.java | 0 .../observe/services/dto/constants/seine/SchoolType.java | 0 .../dto/constants/seine/TypeTransmittingBuoyOperation.java | 0 .../java/fr/ird/observe/services/dto/gson/BlobAdapter.java | 0 .../java/fr/ird/observe/services/dto/gson/ClassAdapter.java | 0 .../java/fr/ird/observe/services/dto/gson/DateAdapter.java | 0 .../java/fr/ird/observe/services/dto/gson/FormAdapter.java | 0 .../ird/observe/services/dto/gson/ImmutableListAdapter.java | 0 .../ird/observe/services/dto/gson/ImmutableMapAdapter.java | 0 .../observe/services/dto/gson/ImmutableMultimapAdapter.java | 0 .../ird/observe/services/dto/gson/ImmutableSetAdapter.java | 0 .../fr/ird/observe/services/dto/gson/IntegerAdapter.java | 0 .../observe/services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../services/dto/gson/ReferentialMultimapAdapter.java | 0 .../observe/services/dto/gson/ReportVariableAdapter.java | 0 .../fr/ird/observe/services/dto/gson/VersionAdapter.java | 0 .../dto/gson/reference/AbstractReferenceAdapter.java | 0 .../dto/gson/reference/AbstractReferenceSetAdapter.java | 0 .../services/dto/gson/reference/DataReferenceAdapter.java | 0 .../dto/gson/reference/DataReferenceSetAdapter.java | 0 .../dto/gson/reference/ReferentialReferenceAdapter.java | 0 .../dto/gson/reference/ReferentialReferenceSetAdapter.java | 0 .../dto/gson/reference/UnknownReferenceAdapter.java | 0 .../observe/services/dto/longline/ActivityLonglineDto.java | 0 .../services/dto/longline/BasketWithSectionIdDto.java | 0 .../services/dto/longline/BranchlineWithBasketIdDto.java | 0 .../dto/longline/GearUseFeaturesMeasurementLonglineDto.java | 0 .../services/dto/longline/LonglineCompositionDto.java | 0 .../services/dto/longline/LonglinePositionAwareDto.java | 0 .../services/dto/longline/LonglinePositionSetDto.java | 0 .../ird/observe/services/dto/longline/SectionTemplate.java | 0 .../observe/services/dto/longline/SectionWithTemplate.java | 0 .../observe/services/dto/longline/SectionWithTemplates.java | 0 .../dto/longline/SetLonglineGlobalCompositionDto.java | 0 .../services/dto/reference/DataReferenceSetDefinitions.java | 0 .../services/dto/reference/ReferenceBinderEngine.java | 0 .../dto/reference/ReferenceBinderEngineSupplier.java | 0 .../services/dto/reference/ReferenceSetDefinition.java | 0 .../dto/reference/ReferentialReferenceSetDefinitions.java | 0 .../reference/request/ReferenceSetRequestDefinition.java | 0 .../reference/request/ReferenceSetRequestDefinitions.java | 0 .../reference/request/ReferenceSetRequestKeyDefinition.java | 0 .../services/dto/referential/GearCaracteristicTypeDtos.java | 0 .../services/dto/referential/I18nReferentialDto.java | 0 .../services/dto/referential/I18nReferentialDtos.java | 0 .../fr/ird/observe/services/dto/referential/PersonDtos.java | 0 .../fr/ird/observe/services/dto/referential/ProgramDto.java | 0 .../ird/observe/services/dto/referential/ProgramDtos.java | 0 .../observe/services/dto/referential/ReferentialDto.java | 0 .../observe/services/dto/referential/ReferentialDtos.java | 0 .../services/dto/referential/ReferentialMultimap.java | 0 .../services/dto/referential/ReferentialReference.java | 0 .../services/dto/referential/ReferentialReferenceSet.java | 0 .../services/dto/referential/ReferentialReferences.java | 0 .../observe/services/dto/referential/SpeciesListDto.java | 0 .../fr/ird/observe/services/dto/referential/VesselDtos.java | 0 .../referential/longline/VesselActivityLonglineDtos.java | 0 .../dto/referential/seine/VesselActivitySeineDtos.java | 0 .../services/dto/referential/seine/WeightCategoryDtos.java | 0 .../fr/ird/observe/services/dto/result/SaveResultDto.java | 0 .../fr/ird/observe/services/dto/result/SaveResultDtos.java | 0 .../services/dto/result/TripChildSaveResultDtos.java | 0 .../fr/ird/observe/services/dto/seine/ActivitySeineDto.java | 0 .../observe/services/dto/seine/ActivitySeineStubDto.java | 0 .../observe/services/dto/seine/DiscardedTargetCatchDto.java | 0 .../services/dto/seine/DiscardedTargetSampleDto.java | 0 .../dto/seine/FloatingObjectTransmittingBuoyDto.java | 0 .../dto/seine/GearUseFeaturesMeasurementSeineDto.java | 0 .../ird/observe/services/dto/seine/KeptTargetCatchDto.java | 0 .../ird/observe/services/dto/seine/KeptTargetSampleDto.java | 0 .../java/fr/ird/observe/services/dto/seine/RouteDto.java | 0 .../java/fr/ird/observe/services/dto/seine/SetSeineDto.java | 0 .../fr/ird/observe/services/dto/seine/TargetCatchDtos.java | 0 .../fr/ird/observe/services/dto/seine/TargetLengthDto.java | 0 .../fr/ird/observe/services/dto/seine/TripSeineDto.java | 0 .../src/main/java/fr/ird/observe/util/GPSPoint.java | 0 .../src/main/java/fr/ird/observe/util/ObserveUtil.java | 0 .../src/main/xmi/observe-services-dto-common.properties | 0 .../src/main/xmi/observe-services-dto-common.zargo | Bin .../src/main/xmi/observe-services-dto-longline.properties | 0 .../src/main/xmi/observe-services-dto-longline.zargo | Bin .../src/main/xmi/observe-services-dto-seine.properties | 0 .../src/main/xmi/observe-services-dto-seine.zargo | Bin services-rest/pom.xml | 6 +++--- .../services/rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../observe/services/rest/ObserveServiceFactoryRest.java | 6 +++--- .../fr/ird/observe/services/rest/RestTestClassResource.java | 2 +- .../ird/observe/services/rest/RestTestMethodResource.java | 2 +- .../services/rest/service/AbstractServiceRestTest.java | 2 +- .../services/rest/service/DataSourceServiceRestTest.java | 2 +- .../observe/services/rest/service/PingServiceRestTest.java | 2 +- .../rest/service/ReferenceValuesSetServiceRestTest.java | 2 +- .../services/rest/service/ReferentialServiceRestTest.java | 2 +- services-runner/pom.xml | 4 ++-- .../runner/ObserveDataSourceConfigurationMainFactory.java | 6 +++--- services-topia-validation/pom.xml | 4 ++-- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 6 +++--- .../observe/services/topia/ObserveServiceContextTopia.java | 4 ++-- .../observe/services/topia/ObserveServiceFactoryTopia.java | 4 ++-- .../topia/ObserveTopiaApplicationContextFactory.java | 6 +++--- .../services/topia/service/DataSourceServiceTopia.java | 8 ++++---- .../observe/services/topia/DataSourcesForTestManager.java | 2 +- .../topia/ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../ird/observe/services/topia/TopiaTestClassResource.java | 2 +- .../ird/observe/services/topia/TopiaTestMethodResource.java | 2 +- .../observe/services/topia/entity/ReplicateTestSupport.java | 2 +- .../services/topia/service/DataSourceServiceTopiaTest.java | 2 +- .../fr/ird/observe/services/topia/service/RigthTest.java | 2 +- {services-api => services}/LICENSE.txt | 0 {services-api => services}/README.md | 0 {services-api => services}/pom.xml | 10 +++++----- .../src/license/THIRD-PARTY.properties | 0 .../src/main/filters/observe-reports.properties | 0 .../main/java/fr/ird/observe/services/ObserveService.java | 0 .../java/fr/ird/observe/services/ObserveServiceFactory.java | 0 .../ird/observe/services/ObserveServiceFactorySupport.java | 0 .../fr/ird/observe/services/ObserveServiceInitializer.java | 0 .../fr/ird/observe/services/ObserveServicesProvider.java | 0 .../java/fr/ird/observe/services/http/ObserveHttpError.java | 0 .../services/security/AdminApiKeyNotFoundException.java | 0 .../security/AuthenticationTokenNotFoundException.java | 0 .../security/BadObserveWebUserPasswordException.java | 0 .../services/security/InvalidAdminKeyApiException.java | 0 .../security/InvalidAuthenticationTokenException.java | 0 .../security/ObserveWebSecurityExceptionSupport.java | 0 .../security/SecurityRequestContextNotFoundException.java | 0 .../services/security/UnknownObserveWebUserException.java | 0 .../security/UnknownObserveWebUserForDatabaseException.java | 0 .../services/security/UserLoginNotFoundException.java | 0 .../services/security/UserPasswordNotFoundException.java | 0 .../services/service/AddSqlScriptProducerRequest.java | 0 .../services/service/AddSqlScriptProducerResult.java | 0 .../observe/services/service/BabModelVersionException.java | 0 .../services/service/ConcurrentModificationException.java | 0 .../observe/services/service/DataFileNotFoundException.java | 0 .../ird/observe/services/service/DataNotFoundException.java | 0 .../fr/ird/observe/services/service/DataSourceService.java | 0 .../service/DatabaseConnexionNotAuthorizedException.java | 0 .../service/DatabaseDestroyNotAuthorizedException.java | 0 .../observe/services/service/DatabaseNotFoundException.java | 0 .../services/service/DeleteSqlScriptProducerRequest.java | 0 .../ird/observe/services/service/ObserveBlobsContainer.java | 0 .../observe/services/service/ObserveReferentialCache.java | 0 .../java/fr/ird/observe/services/service/PingService.java | 0 .../ird/observe/services/service/ReferenceSetsRequest.java | 0 .../fr/ird/observe/services/service/ReferentialService.java | 0 .../observe/services/service/SqlScriptProducerService.java | 0 .../consolidate/ConsolidateActivitySeineDataResult.java | 0 .../service/actions/consolidate/ConsolidateDataService.java | 0 .../consolidate/ConsolidateTripSeineDataRequest.java | 0 .../actions/consolidate/ConsolidateTripSeineDataResult.java | 0 .../services/service/actions/report/ReportBuilder.java | 0 .../services/service/actions/report/ReportService.java | 0 .../referential/diff/ReferentialDataSourceState.java | 0 .../referential/diff/ReferentialDataSourceStates.java | 0 .../referential/diff/ReferentialSynchronizeDiff.java | 0 .../referential/diff/ReferentialSynchronizeDiffService.java | 0 .../referential/diff/ReferentialSynchronizeDiffState.java | 0 .../diff/ReferentialSynchronizeDiffStateType.java | 0 .../referential/diff/ReferentialSynchronizeDiffs.java | 0 .../referential/diff/ReferentialSynchronizeDiffsEngine.java | 0 ...UnidirectionalReferentialSynchronizeCallbackRequest.java | 0 ...nidirectionalReferentialSynchronizeCallbackRequests.java | 0 .../UnidirectionalReferentialSynchronizeCallbackResult.java | 0 ...UnidirectionalReferentialSynchronizeCallbackResults.java | 0 .../legacy/UnidirectionalReferentialSynchronizeContext.java | 0 .../legacy/UnidirectionalReferentialSynchronizeEngine.java | 0 .../UnidirectionalReferentialSynchronizeLocalService.java | 0 .../legacy/UnidirectionalReferentialSynchronizeRequest.java | 0 .../legacy/UnidirectionalReferentialSynchronizeResult.java | 0 .../referential/ng/ReferentialSynchronizeRequest.java | 0 .../referential/ng/ReferentialSynchronizeService.java | 0 .../referential/ng/ReferentialSynchronizeServiceEngine.java | 0 .../ng/ReferentialSynchronizeServiceProduceSqlsRequest.java | 0 .../ng/ReferentialSynchronizeServiceProduceSqlsResult.java | 0 .../referential/ng/ReferentialSynchronizeSqlsRequest.java | 0 .../referential/ng/task/ReferentialSynchronizeTask.java | 0 .../referential/ng/task/ReferentialSynchronizeTaskType.java | 0 .../service/actions/validate/ValidateDataRequest.java | 0 .../service/actions/validate/ValidateDataResult.java | 0 .../actions/validate/ValidateReferentialsRequest.java | 0 .../actions/validate/ValidateReferentialsResult.java | 0 .../service/actions/validate/ValidateResultForDto.java | 0 .../service/actions/validate/ValidateResultForDtoType.java | 0 .../service/actions/validate/ValidateResultForDtos.java | 0 .../services/service/actions/validate/ValidateService.java | 0 .../service/actions/validate/ValidateServiceUtils.java | 0 .../service/actions/validate/ValidationMessage.java | 0 .../services/service/actions/validate/ValidatorDto.java | 0 .../services/service/actions/validate/ValidatorDtos.java | 0 .../actions/validate/ValidatorInitializationException.java | 0 .../service/longline/ActivityLongLineEncounterService.java | 0 .../service/longline/ActivityLongLineSensorUsedService.java | 0 .../services/service/longline/ActivityLonglineService.java | 0 .../services/service/longline/BranchlineService.java | 0 .../services/service/longline/SetLonglineCatchService.java | 0 .../longline/SetLonglineDetailCompositionService.java | 0 .../longline/SetLonglineGlobalCompositionService.java | 0 .../services/service/longline/SetLonglineService.java | 0 .../ird/observe/services/service/longline/TdrService.java | 0 .../service/longline/TripLonglineGearUseService.java | 0 .../services/service/longline/TripLonglineService.java | 0 .../service/seine/ActivitySeineObservedSystemService.java | 0 .../services/service/seine/ActivitySeineService.java | 0 .../services/service/seine/FloatingObjectService.java | 0 .../services/service/seine/NonTargetCatchService.java | 0 .../services/service/seine/NonTargetSampleService.java | 0 .../service/seine/ObjectObservedSpeciesService.java | 0 .../services/service/seine/ObjectSchoolEstimateService.java | 0 .../fr/ird/observe/services/service/seine/RouteService.java | 0 .../services/service/seine/SchoolEstimateService.java | 0 .../ird/observe/services/service/seine/SetSeineService.java | 0 .../observe/services/service/seine/TargetCatchService.java | 0 .../observe/services/service/seine/TargetSampleService.java | 0 .../service/seine/TransmittingBuoyOperationService.java | 0 .../services/service/seine/TripSeineGearUseService.java | 0 .../observe/services/service/seine/TripSeineService.java | 0 .../observe/services/service/trip/DeleteTripRequest.java | 0 .../ird/observe/services/service/trip/DeleteTripResult.java | 0 .../observe/services/service/trip/ExportTripRequest.java | 0 .../ird/observe/services/service/trip/ExportTripResult.java | 0 .../observe/services/service/trip/ImportTripRequest.java | 0 .../ird/observe/services/service/trip/ImportTripResult.java | 0 .../services/service/trip/TripManagementService.java | 0 .../java/fr/ird/observe/services/spi/DeleteRequest.java | 0 .../main/java/fr/ird/observe/services/spi/NoDataAccess.java | 0 .../main/java/fr/ird/observe/services/spi/PostRequest.java | 0 .../fr/ird/observe/services/spi/ReadDataPermission.java | 0 .../ird/observe/services/spi/ReadReferentialPermission.java | 0 .../src/main/java/fr/ird/observe/services/spi/Write.java | 0 .../fr/ird/observe/services/spi/WriteDataPermission.java | 0 .../observe/services/spi/WriteReferentialPermission.java | 0 .../services/service/actions/report/ReportBuilderTest.java | 0 .../service/actions/report/observe-reports-test.properties | 0 .../src/test/resources/log4j.properties | 0 307 files changed, 110 insertions(+), 104 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index b2a1940..c21647f 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -43,7 +43,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 0311684..1e0fe7b 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -39,7 +39,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> @@ -118,7 +118,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 418327f..a5767ac 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -43,7 +43,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -132,7 +132,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index d46f5d8..6fbef19 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -43,7 +43,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index be98223..0edab40 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -86,12 +86,12 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -106,7 +106,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -474,7 +474,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java index 38bedf5..af079ae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java @@ -35,9 +35,9 @@ import fr.ird.observe.application.swing.ui.ObserveUIMode; import fr.ird.observe.application.swing.ui.actions.ChangeStorageAction; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.service.BabModelVersionException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index 495036d..3d23daa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -36,9 +36,9 @@ import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.ObserveDataSourceType; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java index fab02be..04002be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.actions; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import jaxx.runtime.SwingUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 9d18c4b..81f6577 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFro import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java index ebb0f8c..9c8bf96 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java @@ -29,8 +29,8 @@ import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 50bc695..374a17e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -44,9 +44,9 @@ import fr.ird.observe.application.swing.ui.storage.tabs.RolesTableModel; import fr.ird.observe.application.swing.ui.storage.tabs.SecurityModel; import fr.ird.observe.application.swing.ui.storage.tabs.StorageTabUI; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index a290cc1..7534458 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -33,9 +33,9 @@ import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.storage.tabs.SecurityModel; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 844e9b2..f66c84f 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -39,7 +39,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> diff --git a/application-web/pom.xml b/application-web/pom.xml index 0f3f5ff..30036cf 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -38,12 +38,12 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> <!--dependency> @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index d39de73..71e1a68 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -31,7 +31,7 @@ import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInj import fr.ird.observe.application.web.injector.ObserveDtoInjector; import fr.ird.observe.application.web.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.application.web.injector.SqlScriptProducerRequestInjector; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index 311c8b0..38617c5 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -26,7 +26,7 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.WebMotionFilter; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 8154088..1dacb70 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java index e5a0db3..1cec720 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.web.injector; import com.google.gson.Gson; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java index 7e742af..b393548 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.web.injector; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.beanutils.converters.AbstractConverter; import org.apache.commons.logging.Log; diff --git a/pom.xml b/pom.xml index 1071bc3..0ff63a8 100644 --- a/pom.xml +++ b/pom.xml @@ -115,11 +115,11 @@ <module>toolbox-maven-plugin</module> <module>topia-extension</module> <module>topia-templates-extension</module> - <module>services-configuration-api</module> + <module>services-configuration</module> <module>services-configuration-topia</module> <module>services-configuration-rest</module> - <module>services-model</module> - <module>services-api</module> + <module>services-dto</module> + <module>services</module> <module>test</module> <module>entities</module> <module>entities-migration</module> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 8df8f22..d7d416d 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -18,7 +18,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> diff --git a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java similarity index 95% rename from services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java rename to services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java index 5bc22c2..8ade07e 100644 --- a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.rest; /* * #%L @@ -23,6 +23,8 @@ package fr.ird.observe.services.configuration; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceType; import org.nuiton.version.Version; import java.net.URL; diff --git a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRestConstants.java similarity index 96% rename from services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java rename to services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRestConstants.java index e6eb55e..b7b4a1b 100644 --- a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRestConstants.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.rest; /* * #%L diff --git a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConnectionRest.java similarity index 93% rename from services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java rename to services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConnectionRest.java index 11cbc55..2bfb3f0 100644 --- a/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java +++ b/services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConnectionRest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.rest; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ +import fr.ird.observe.services.configuration.ObserveDataSourceConnectionSupport; import org.nuiton.version.Version; import java.net.URL; diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 5791f6d..ccfe558 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -18,7 +18,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java similarity index 98% rename from services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java rename to services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java index 1ff7a52..f813d42 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.topia; /* * #%L diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaPG.java similarity index 98% rename from services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java rename to services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaPG.java index 645cd3c..5f0fb17 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaPG.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.topia; /* * #%L diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java similarity index 95% rename from services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java rename to services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java index ef2ff3f..4340394 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.topia; /* * #%L @@ -22,6 +22,8 @@ package fr.ird.observe.services.configuration; * #L% */ +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceType; import org.nuiton.version.Version; /** diff --git a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConnectionTopia.java similarity index 92% rename from services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java rename to services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConnectionTopia.java index 55e1e80..36a708b 100644 --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConnectionTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.configuration; +package fr.ird.observe.services.configuration.topia; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ +import fr.ird.observe.services.configuration.ObserveDataSourceConnectionSupport; import org.nuiton.version.Version; /** diff --git a/services-model/LICENSE.txt b/services-configuration/LICENSE.txt similarity index 100% rename from services-model/LICENSE.txt rename to services-configuration/LICENSE.txt diff --git a/services-model/README.md b/services-configuration/README.md similarity index 100% rename from services-model/README.md rename to services-configuration/README.md diff --git a/services-configuration-api/pom.xml b/services-configuration/pom.xml similarity index 86% rename from services-configuration-api/pom.xml rename to services-configuration/pom.xml index ec345ca..4d34f53 100644 --- a/services-configuration-api/pom.xml +++ b/services-configuration/pom.xml @@ -8,10 +8,10 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> - <name>ObServe :: Services Configuration API</name> - <description>ObServe services Configuration API module</description> + <name>ObServe :: Services Configuration</name> + <description>ObServe services Configuration module</description> <dependencies> diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java diff --git a/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java similarity index 100% rename from services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java rename to services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java diff --git a/services-configuration-api/src/test/resources/log4j.properties b/services-configuration/src/test/resources/log4j.properties similarity index 100% rename from services-configuration-api/src/test/resources/log4j.properties rename to services-configuration/src/test/resources/log4j.properties diff --git a/services-configuration-api/LICENSE.txt b/services-dto/LICENSE.txt similarity index 100% rename from services-configuration-api/LICENSE.txt rename to services-dto/LICENSE.txt diff --git a/services-configuration-api/README.md b/services-dto/README.md similarity index 100% rename from services-configuration-api/README.md rename to services-dto/README.md diff --git a/services-model/pom.xml b/services-dto/pom.xml similarity index 95% rename from services-model/pom.xml rename to services-dto/pom.xml index aea7f25..be919ba 100644 --- a/services-model/pom.xml +++ b/services-dto/pom.xml @@ -31,17 +31,17 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> - <name>ObServe :: Services model</name> - <description>ObServe services model module</description> + <name>ObServe :: Services DTO</name> + <description>ObServe services DTO module</description> <dependencies> <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> diff --git a/services-model/src/license/THIRD-PARTY.properties b/services-dto/src/license/THIRD-PARTY.properties similarity index 100% rename from services-model/src/license/THIRD-PARTY.properties rename to services-dto/src/license/THIRD-PARTY.properties diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/Form.java b/services-dto/src/main/java/fr/ird/observe/services/dto/Form.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/Form.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/Form.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/IdDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/IdDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java b/services-dto/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java b/services-dto/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/GearType.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/GearType.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java diff --git a/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java b/services-dto/src/main/java/fr/ird/observe/util/GPSPoint.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/util/GPSPoint.java rename to services-dto/src/main/java/fr/ird/observe/util/GPSPoint.java diff --git a/services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java b/services-dto/src/main/java/fr/ird/observe/util/ObserveUtil.java similarity index 100% rename from services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java rename to services-dto/src/main/java/fr/ird/observe/util/ObserveUtil.java diff --git a/services-model/src/main/xmi/observe-services-dto-common.properties b/services-dto/src/main/xmi/observe-services-dto-common.properties similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-common.properties rename to services-dto/src/main/xmi/observe-services-dto-common.properties diff --git a/services-model/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-common.zargo rename to services-dto/src/main/xmi/observe-services-dto-common.zargo diff --git a/services-model/src/main/xmi/observe-services-dto-longline.properties b/services-dto/src/main/xmi/observe-services-dto-longline.properties similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-longline.properties rename to services-dto/src/main/xmi/observe-services-dto-longline.properties diff --git a/services-model/src/main/xmi/observe-services-dto-longline.zargo b/services-dto/src/main/xmi/observe-services-dto-longline.zargo similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-longline.zargo rename to services-dto/src/main/xmi/observe-services-dto-longline.zargo diff --git a/services-model/src/main/xmi/observe-services-dto-seine.properties b/services-dto/src/main/xmi/observe-services-dto-seine.properties similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-seine.properties rename to services-dto/src/main/xmi/observe-services-dto-seine.properties diff --git a/services-model/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo similarity index 100% rename from services-model/src/main/xmi/observe-services-dto-seine.zargo rename to services-dto/src/main/xmi/observe-services-dto-seine.zargo diff --git a/services-rest/pom.xml b/services-rest/pom.xml index da3b140..6b7a53c 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -18,17 +18,17 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java index bdb209f..27d2372 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java @@ -27,7 +27,7 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import java.lang.reflect.Type; diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java index b7ea481..dd0abc9 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java @@ -32,10 +32,10 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactorySupport; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.rest.http.ObserveRequest; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java index eeadc0b..639b685 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java @@ -26,7 +26,7 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.test.TestClassResourceSupport; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java index 8dc2a75..73c582e 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.rest; * #L% */ -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.service.PingService; import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.TestMethodResourceSupport; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java index 2c30502..c32fea3 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.rest.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.rest.RestTestClassResource; import fr.ird.observe.services.rest.RestTestMethodResource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java index c2f1c59..c476042 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.rest.service; * #L% */ -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java index 7916356..bee78fa 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.rest.service; */ import fr.ird.observe.services.rest.ObserveServiceRestNotAvailableException; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.service.PingService; import org.junit.Test; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java index 627c05f..3d5d91c 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.rest.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java index 91d093f..c820803 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.rest.service; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/services-runner/pom.xml b/services-runner/pom.xml index e16543e..7d4e8a1 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -18,12 +18,12 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-runner/src/main/java/fr/ird/observe/services/runner/ObserveDataSourceConfigurationMainFactory.java b/services-runner/src/main/java/fr/ird/observe/services/runner/ObserveDataSourceConfigurationMainFactory.java index 2b58b27..a234697 100644 --- a/services-runner/src/main/java/fr/ird/observe/services/runner/ObserveDataSourceConfigurationMainFactory.java +++ b/services-runner/src/main/java/fr/ird/observe/services/runner/ObserveDataSourceConfigurationMainFactory.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.runner; * #L% */ -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import org.nuiton.version.Version; import java.io.File; diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 1432eb0..70268c5 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -33,7 +33,7 @@ <artifactId>services-topia-validation</artifactId> - <name>ObServe :: Services ToPIA validation</name> + <name>ObServe :: Services ToPIA Validation</name> <description>ObServe Services ToPIA Validation module</description> <dependencies> @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 2360a35..b4f9f7f 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 6038e77..3aedd7f 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -18,17 +18,17 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java index 3ec6303..872bc02 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java @@ -28,9 +28,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactory; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.topia.entity.EntitiesSetFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index 6113c9d..95ebd88 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -32,9 +32,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactorySupport; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.dto.UnauthorizedException; import fr.ird.observe.services.spi.NoDataAccess; import fr.ird.observe.services.spi.ReadDataPermission; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java index 9004c3c..80ba557 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java @@ -26,9 +26,9 @@ import com.google.common.base.Preconditions; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaConfiguration; import fr.ird.observe.ObserveTopiaConfigurationFactory; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaApplicationContext; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index cd5bdb2..2c9a838 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -33,11 +33,11 @@ import fr.ird.observe.ObserveTopiaConfigurationFactory; import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java index 67b685b..665eb02 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia; */ import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.test.TestHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java index 9f20224..24e4045 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia; * #L% */ -import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; import org.nuiton.version.Version; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java index 6d681d2..95c91fe 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java @@ -26,7 +26,7 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java index de1f2f9..e20f0e5 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java index 05f82fc..ae3a239 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java @@ -27,7 +27,7 @@ import com.google.common.io.Files; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java index 3ba40c7..0640772 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java index 5e8d969..00c84e1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service; */ import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.UnauthorizedException; diff --git a/services-api/LICENSE.txt b/services/LICENSE.txt similarity index 100% rename from services-api/LICENSE.txt rename to services/LICENSE.txt diff --git a/services-api/README.md b/services/README.md similarity index 100% rename from services-api/README.md rename to services/README.md diff --git a/services-api/pom.xml b/services/pom.xml similarity index 92% rename from services-api/pom.xml rename to services/pom.xml index 8f6b06b..4fe8bad 100644 --- a/services-api/pom.xml +++ b/services/pom.xml @@ -8,22 +8,22 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>services-api</artifactId> + <artifactId>services</artifactId> - <name>ObServe :: Services API</name> - <description>ObServe services API module</description> + <name>ObServe :: Services</name> + <description>ObServe services module</description> <dependencies> <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> + <artifactId>services-dto</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-configuration-api</artifactId> + <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> diff --git a/services-api/src/license/THIRD-PARTY.properties b/services/src/license/THIRD-PARTY.properties similarity index 100% rename from services-api/src/license/THIRD-PARTY.properties rename to services/src/license/THIRD-PARTY.properties diff --git a/services-api/src/main/filters/observe-reports.properties b/services/src/main/filters/observe-reports.properties similarity index 100% rename from services-api/src/main/filters/observe-reports.properties rename to services/src/main/filters/observe-reports.properties diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveService.java b/services/src/main/java/fr/ird/observe/services/ObserveService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/ObserveService.java rename to services/src/main/java/fr/ird/observe/services/ObserveService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java b/services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java rename to services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java b/services/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java rename to services/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/services/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java rename to services/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java rename to services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java diff --git a/services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java b/services/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename to services/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java b/services/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java rename to services/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java b/services/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java rename to services/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java b/services/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java rename to services/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java b/services/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java rename to services/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java b/services/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java rename to services/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java b/services/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java rename to services/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java b/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java rename to services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java b/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java rename to services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java b/services/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java rename to services/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java b/services/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java rename to services/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java b/services/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java b/services/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java rename to services/src/main/java/fr/ird/observe/services/service/DataSourceService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java rename to services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java rename to services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java b/services/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java rename to services/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java b/services/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java rename to services/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java b/services/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java rename to services/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/PingService.java b/services/src/main/java/fr/ird/observe/services/service/PingService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/PingService.java rename to services/src/main/java/fr/ird/observe/services/service/PingService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java b/services/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java rename to services/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/services/src/main/java/fr/ird/observe/services/service/ReferentialService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java rename to services/src/main/java/fr/ird/observe/services/service/ReferentialService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java b/services/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java rename to services/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java rename to services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java b/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java b/services/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/services/src/main/java/fr/ird/observe/services/service/longline/TdrService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/TdrService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/services/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/services/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/services/src/main/java/fr/ird/observe/services/service/seine/RouteService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/RouteService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/services/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/services/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java rename to services/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java b/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java b/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java b/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java diff --git a/services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java b/services/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java rename to services/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java b/services/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java rename to services/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java b/services/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java rename to services/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java b/services/src/main/java/fr/ird/observe/services/spi/PostRequest.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java rename to services/src/main/java/fr/ird/observe/services/spi/PostRequest.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java b/services/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java rename to services/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java b/services/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java rename to services/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/Write.java b/services/src/main/java/fr/ird/observe/services/spi/Write.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/Write.java rename to services/src/main/java/fr/ird/observe/services/spi/Write.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java b/services/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java rename to services/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java diff --git a/services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java b/services/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java similarity index 100% rename from services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java rename to services/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java diff --git a/services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java b/services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java similarity index 100% rename from services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java rename to services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java diff --git a/services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties b/services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties similarity index 100% rename from services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties rename to services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties diff --git a/services-api/src/test/resources/log4j.properties b/services/src/test/resources/log4j.properties similarity index 100% rename from services-api/src/test/resources/log4j.properties rename to services/src/test/resources/log4j.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.