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 be31f410c5cb412cf67a621c6ab00d981d90c624 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 17:00:25 2016 +0200 use last stable of i18n --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41cec1b..5075c78 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <topiaVersion>3.1.3</topiaVersion> <jaxxVersion>2.31</jaxxVersion> - <nuitonI18nVersion>3.5.3-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>3.6</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <xworkVersion>2.3.29</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 ad6844031c7d5e516da8c1d2fc06836e498f7e3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 17:40:24 2016 +0200 remove unuseful observe artifact prefix --- .../LICENSE.txt | 0 .../README.md | 0 .../changelog.txt | 0 .../pom.xml | 4 +- .../src/license/THIRD-PARTY.properties | 0 .../swing/decoration/DecoratorService.java | 0 .../decorators/DataReferenceDecorator.java | 0 .../decorators/LengthWeightParameterDecorator.java | 0 .../decorators/NonTargetCatchDecorator.java | 0 .../decorators/NonTargetLengthDecorator.java | 0 .../decorators/ObjectObservedSpeciesDecorator.java | 0 .../decoration/decorators/ObserveDecorator.java | 0 .../decorators/ReferentialReferenceDecorator.java | 0 .../decoration/decorators/SpeciesDecorator.java | 0 .../decorators/TargetCatchDecorator.java | 0 .../decorators/TripLonglineDecorator.java | 0 .../decoration/decorators/TripSeineDecorator.java | 0 .../application-swing-decoration_en_GB.properties | 0 .../application-swing-decoration_es_ES.properties | 0 .../application-swing-decoration_fr_FR.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../changelog.txt | 0 .../pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 0 .../AbstractSpeciesFieldDtoValidator.java | 0 .../ActivityFinDeVeilleExistsDtoValidator.java | 0 .../ActivitySimpleSpeedDtoValidator.java | 0 .../validators/ActivitySpeedDtoValidator.java | 0 .../CollectionUniqueKeyDtoValidator.java | 0 .../ObserveCollectionUniqueKeyDtoValidator.java | 0 .../validators/OpenableDtoFieldValidator.java | 0 .../SetLonglineUniqueHomeIdDtoValidator.java | 0 .../SetLonglineUniqueNumberDtoValidator.java | 0 .../validators/SpeciesLengthFieldDtoValidator.java | 0 .../validators/SpeciesWeightFieldDtoValidator.java | 0 ...ivityLonglineDto-ui-create-error-validation.xml | 0 ...ityLonglineDto-ui-create-warning-validation.xml | 0 ...ivityLonglineDto-ui-update-error-validation.xml | 0 ...ityLonglineDto-ui-update-warning-validation.xml | 0 ...lineEncounterDto-ui-update-error-validation.xml | 0 ...ineSensorUsedDto-ui-update-error-validation.xml | 0 ...tsCompositionDto-ui-update-error-validation.xml | 0 .../BasketDto-ui-update-table-error-validation.xml | 0 ...to-ui-update-catchLongline-error-validation.xml | 0 .../BranchlineDto-ui-update-error-validation.xml | 0 ...nchlineDto-ui-update-table-error-validation.xml | 0 .../BranchlineDto-ui-update-warning-validation.xml | 0 ...esCompositionDto-ui-update-error-validation.xml | 0 ...CatchLonglineDto-ui-update-error-validation.xml | 0 ...tchLonglineDto-ui-update-warning-validation.xml | 0 .../EncounterDto-ui-update-error-validation.xml | 0 .../EncounterDto-ui-update-warning-validation.xml | 0 ...esCompositionDto-ui-update-error-validation.xml | 0 ...turesLonglineDto-ui-update-error-validation.xml | 0 ...ksCompositionDto-ui-update-error-validation.xml | 0 ...SectionDto-ui-update-table-error-validation.xml | 0 .../SensorUsedDto-ui-update-error-validation.xml | 0 .../SensorUsedDto-ui-update-warning-validation.xml | 0 .../SetLonglineDto-ui-create-error-validation.xml | 0 ...SetLonglineDto-ui-create-warning-validation.xml | 0 .../SetLonglineDto-ui-update-error-validation.xml | 0 ...SetLonglineDto-ui-update-warning-validation.xml | 0 ...ui-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...i-update-globalComposition-error-validation.xml | 0 ...ui-update-hooksComposition-error-validation.xml | 0 .../longline/TdrDto-ui-update-error-validation.xml | 0 .../TdrDto-ui-update-warning-validation.xml | 0 .../TripLonglineDto-ui-create-error-validation.xml | 0 ...ripLonglineDto-ui-create-warning-validation.xml | 0 .../TripLonglineDto-ui-update-error-validation.xml | 0 ...ripLonglineDto-ui-update-warning-validation.xml | 0 ...lineGearUseDto-ui-update-warning-validation.xml | 0 .../CountryDto-ui-create-error-validation.xml | 0 .../CountryDto-ui-create-warning-validation.xml | 0 .../CountryDto-ui-update-error-validation.xml | 0 .../CountryDto-ui-update-warning-validation.xml | 0 .../FpaZoneDto-ui-create-error-validation.xml | 0 .../FpaZoneDto-ui-create-warning-validation.xml | 0 .../FpaZoneDto-ui-update-error-validation.xml | 0 .../FpaZoneDto-ui-update-warning-validation.xml | 0 ...CaracteristicDto-ui-create-error-validation.xml | 0 ...racteristicDto-ui-create-warning-validation.xml | 0 ...CaracteristicDto-ui-update-error-validation.xml | 0 ...racteristicDto-ui-update-warning-validation.xml | 0 ...cteristicTypeDto-ui-create-error-validation.xml | 0 ...eristicTypeDto-ui-create-warning-validation.xml | 0 ...cteristicTypeDto-ui-update-error-validation.xml | 0 ...eristicTypeDto-ui-update-warning-validation.xml | 0 .../GearDto-ui-create-error-validation.xml | 0 .../GearDto-ui-create-warning-validation.xml | 0 .../GearDto-ui-update-error-validation.xml | 0 .../GearDto-ui-update-warning-validation.xml | 0 .../HarbourDto-ui-create-error-validation.xml | 0 .../HarbourDto-ui-create-warning-validation.xml | 0 .../HarbourDto-ui-update-error-validation.xml | 0 .../HarbourDto-ui-update-warning-validation.xml | 0 ...ightParameterDto-ui-create-error-validation.xml | 0 ...htParameterDto-ui-create-warning-validation.xml | 0 ...ightParameterDto-ui-update-error-validation.xml | 0 ...htParameterDto-ui-update-warning-validation.xml | 0 .../OceanDto-ui-create-error-validation.xml | 0 .../OceanDto-ui-create-warning-validation.xml | 0 .../OceanDto-ui-update-error-validation.xml | 0 .../OceanDto-ui-update-warning-validation.xml | 0 .../OrganismDto-ui-create-error-validation.xml | 0 .../OrganismDto-ui-create-warning-validation.xml | 0 .../OrganismDto-ui-update-error-validation.xml | 0 .../OrganismDto-ui-update-warning-validation.xml | 0 .../PersonDto-ui-create-error-validation.xml | 0 .../PersonDto-ui-create-warning-validation.xml | 0 .../PersonDto-ui-update-error-validation.xml | 0 .../PersonDto-ui-update-warning-validation.xml | 0 .../ProgramDto-ui-create-error-validation.xml | 0 .../ProgramDto-ui-create-warning-validation.xml | 0 .../ProgramDto-ui-update-error-validation.xml | 0 .../ProgramDto-ui-update-warning-validation.xml | 0 .../SexDto-ui-create-error-validation.xml | 0 .../SexDto-ui-create-warning-validation.xml | 0 .../SexDto-ui-update-error-validation.xml | 0 .../SexDto-ui-update-warning-validation.xml | 0 .../SpeciesDto-ui-create-error-validation.xml | 0 .../SpeciesDto-ui-create-warning-validation.xml | 0 .../SpeciesDto-ui-update-error-validation.xml | 0 .../SpeciesDto-ui-update-warning-validation.xml | 0 .../SpeciesGroupDto-ui-create-error-validation.xml | 0 ...peciesGroupDto-ui-create-warning-validation.xml | 0 .../SpeciesGroupDto-ui-update-error-validation.xml | 0 ...peciesGroupDto-ui-update-warning-validation.xml | 0 .../SpeciesListDto-ui-create-error-validation.xml | 0 ...SpeciesListDto-ui-create-warning-validation.xml | 0 .../SpeciesListDto-ui-update-error-validation.xml | 0 ...SpeciesListDto-ui-update-warning-validation.xml | 0 .../VesselDto-ui-create-error-validation.xml | 0 .../VesselDto-ui-create-warning-validation.xml | 0 .../VesselDto-ui-update-error-validation.xml | 0 .../VesselDto-ui-update-warning-validation.xml | 0 ...lSizeCategoryDto-ui-create-error-validation.xml | 0 ...izeCategoryDto-ui-create-warning-validation.xml | 0 ...lSizeCategoryDto-ui-update-error-validation.xml | 0 ...izeCategoryDto-ui-update-warning-validation.xml | 0 .../VesselTypeDto-ui-create-error-validation.xml | 0 .../VesselTypeDto-ui-create-warning-validation.xml | 0 .../VesselTypeDto-ui-update-error-validation.xml | 0 .../VesselTypeDto-ui-update-warning-validation.xml | 0 ...HaulingStatusDto-ui-create-error-validation.xml | 0 ...ulingStatusDto-ui-create-warning-validation.xml | 0 ...HaulingStatusDto-ui-update-error-validation.xml | 0 ...ulingStatusDto-ui-update-warning-validation.xml | 0 ...SettingStatusDto-ui-create-error-validation.xml | 0 ...ttingStatusDto-ui-create-warning-validation.xml | 0 ...SettingStatusDto-ui-update-error-validation.xml | 0 ...ttingStatusDto-ui-update-warning-validation.xml | 0 .../BaitTypeDto-ui-create-error-validation.xml | 0 .../BaitTypeDto-ui-create-warning-validation.xml | 0 .../BaitTypeDto-ui-update-error-validation.xml | 0 .../BaitTypeDto-ui-update-warning-validation.xml | 0 ...hFateLonglineDto-ui-create-error-validation.xml | 0 ...ateLonglineDto-ui-create-warning-validation.xml | 0 ...hFateLonglineDto-ui-update-error-validation.xml | 0 ...ateLonglineDto-ui-update-warning-validation.xml | 0 ...EncounterTypeDto-ui-create-error-validation.xml | 0 ...counterTypeDto-ui-create-warning-validation.xml | 0 ...EncounterTypeDto-ui-update-error-validation.xml | 0 ...counterTypeDto-ui-update-warning-validation.xml | 0 .../HealthnessDto-ui-create-error-validation.xml | 0 .../HealthnessDto-ui-create-warning-validation.xml | 0 .../HealthnessDto-ui-update-error-validation.xml | 0 .../HealthnessDto-ui-update-warning-validation.xml | 0 .../HookPositionDto-ui-create-error-validation.xml | 0 ...ookPositionDto-ui-create-warning-validation.xml | 0 .../HookPositionDto-ui-update-error-validation.xml | 0 ...ookPositionDto-ui-update-warning-validation.xml | 0 .../HookSizeDto-ui-create-error-validation.xml | 0 .../HookSizeDto-ui-create-warning-validation.xml | 0 .../HookSizeDto-ui-update-error-validation.xml | 0 .../HookSizeDto-ui-update-warning-validation.xml | 0 .../HookTypeDto-ui-create-error-validation.xml | 0 .../HookTypeDto-ui-create-warning-validation.xml | 0 .../HookTypeDto-ui-update-error-validation.xml | 0 .../HookTypeDto-ui-update-warning-validation.xml | 0 ...ontalPositionDto-ui-create-error-validation.xml | 0 ...talPositionDto-ui-create-warning-validation.xml | 0 ...ontalPositionDto-ui-update-error-validation.xml | 0 ...talPositionDto-ui-update-warning-validation.xml | 0 ...ticalPositionDto-ui-create-error-validation.xml | 0 ...calPositionDto-ui-create-warning-validation.xml | 0 ...ticalPositionDto-ui-update-error-validation.xml | 0 ...calPositionDto-ui-update-warning-validation.xml | 0 ...htsticksColorDto-ui-create-error-validation.xml | 0 ...sticksColorDto-ui-create-warning-validation.xml | 0 ...htsticksColorDto-ui-update-error-validation.xml | 0 ...sticksColorDto-ui-update-warning-validation.xml | 0 ...ghtsticksTypeDto-ui-create-error-validation.xml | 0 ...tsticksTypeDto-ui-create-warning-validation.xml | 0 ...ghtsticksTypeDto-ui-update-error-validation.xml | 0 ...tsticksTypeDto-ui-update-warning-validation.xml | 0 .../LineTypeDto-ui-create-error-validation.xml | 0 .../LineTypeDto-ui-create-warning-validation.xml | 0 .../LineTypeDto-ui-update-error-validation.xml | 0 .../LineTypeDto-ui-update-warning-validation.xml | 0 ...aturityStatusDto-ui-create-error-validation.xml | 0 ...urityStatusDto-ui-create-warning-validation.xml | 0 ...aturityStatusDto-ui-update-error-validation.xml | 0 ...urityStatusDto-ui-update-warning-validation.xml | 0 ...itigationTypeDto-ui-create-error-validation.xml | 0 ...igationTypeDto-ui-create-warning-validation.xml | 0 ...itigationTypeDto-ui-update-error-validation.xml | 0 ...igationTypeDto-ui-update-warning-validation.xml | 0 .../SensorBrandDto-ui-create-error-validation.xml | 0 ...SensorBrandDto-ui-create-warning-validation.xml | 0 .../SensorBrandDto-ui-update-error-validation.xml | 0 ...SensorBrandDto-ui-update-warning-validation.xml | 0 ...sorDataFormatDto-ui-create-error-validation.xml | 0 ...rDataFormatDto-ui-create-warning-validation.xml | 0 ...sorDataFormatDto-ui-update-error-validation.xml | 0 ...rDataFormatDto-ui-update-warning-validation.xml | 0 .../SensorTypeDto-ui-create-error-validation.xml | 0 .../SensorTypeDto-ui-create-warning-validation.xml | 0 .../SensorTypeDto-ui-update-error-validation.xml | 0 .../SensorTypeDto-ui-update-warning-validation.xml | 0 .../SettingShapeDto-ui-create-error-validation.xml | 0 ...ettingShapeDto-ui-create-warning-validation.xml | 0 .../SettingShapeDto-ui-update-error-validation.xml | 0 ...ettingShapeDto-ui-update-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...tomacFullnessDto-ui-create-error-validation.xml | 0 ...macFullnessDto-ui-create-warning-validation.xml | 0 ...tomacFullnessDto-ui-update-error-validation.xml | 0 ...macFullnessDto-ui-update-warning-validation.xml | 0 .../TripTypeDto-ui-create-error-validation.xml | 0 .../TripTypeDto-ui-create-warning-validation.xml | 0 .../TripTypeDto-ui-update-error-validation.xml | 0 .../TripTypeDto-ui-update-warning-validation.xml | 0 ...ivityLonglineDto-ui-create-error-validation.xml | 0 ...ityLonglineDto-ui-create-warning-validation.xml | 0 ...ivityLonglineDto-ui-update-error-validation.xml | 0 ...ityLonglineDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...DetectionModeDto-ui-create-error-validation.xml | 0 ...tectionModeDto-ui-create-warning-validation.xml | 0 ...DetectionModeDto-ui-update-error-validation.xml | 0 ...tectionModeDto-ui-update-warning-validation.xml | 0 .../ObjectFateDto-ui-create-error-validation.xml | 0 .../ObjectFateDto-ui-create-warning-validation.xml | 0 .../ObjectFateDto-ui-update-error-validation.xml | 0 .../ObjectFateDto-ui-update-warning-validation.xml | 0 ...jectOperationDto-ui-create-error-validation.xml | 0 ...ctOperationDto-ui-create-warning-validation.xml | 0 ...jectOperationDto-ui-update-error-validation.xml | 0 ...ctOperationDto-ui-update-warning-validation.xml | 0 .../ObjectTypeDto-ui-create-error-validation.xml | 0 .../ObjectTypeDto-ui-create-warning-validation.xml | 0 .../ObjectTypeDto-ui-update-error-validation.xml | 0 .../ObjectTypeDto-ui-update-warning-validation.xml | 0 ...bservedSystemDto-ui-create-error-validation.xml | 0 ...ervedSystemDto-ui-create-warning-validation.xml | 0 ...bservedSystemDto-ui-update-error-validation.xml | 0 ...ervedSystemDto-ui-update-warning-validation.xml | 0 ...sonForDiscardDto-ui-create-error-validation.xml | 0 ...nForDiscardDto-ui-create-warning-validation.xml | 0 ...sonForDiscardDto-ui-update-error-validation.xml | 0 ...nForDiscardDto-ui-update-warning-validation.xml | 0 ...nForNoFishingDto-ui-create-error-validation.xml | 0 ...orNoFishingDto-ui-create-warning-validation.xml | 0 ...nForNoFishingDto-ui-update-error-validation.xml | 0 ...orNoFishingDto-ui-update-warning-validation.xml | 0 ...sonForNullSetDto-ui-create-error-validation.xml | 0 ...nForNullSetDto-ui-create-warning-validation.xml | 0 ...sonForNullSetDto-ui-update-error-validation.xml | 0 ...nForNullSetDto-ui-update-warning-validation.xml | 0 .../SpeciesFateDto-ui-create-error-validation.xml | 0 ...SpeciesFateDto-ui-create-warning-validation.xml | 0 .../SpeciesFateDto-ui-update-error-validation.xml | 0 ...SpeciesFateDto-ui-update-warning-validation.xml | 0 ...SpeciesStatusDto-ui-create-error-validation.xml | 0 ...eciesStatusDto-ui-create-warning-validation.xml | 0 ...SpeciesStatusDto-ui-update-error-validation.xml | 0 ...eciesStatusDto-ui-update-warning-validation.xml | 0 ...ndingActivityDto-ui-create-error-validation.xml | 0 ...ingActivityDto-ui-create-warning-validation.xml | 0 ...ndingActivityDto-ui-update-error-validation.xml | 0 ...ingActivityDto-ui-update-warning-validation.xml | 0 ...BuoyOperationDto-ui-create-error-validation.xml | 0 ...oyOperationDto-ui-create-warning-validation.xml | 0 ...BuoyOperationDto-ui-update-error-validation.xml | 0 ...oyOperationDto-ui-update-warning-validation.xml | 0 ...ttingBuoyTypeDto-ui-create-error-validation.xml | 0 ...ingBuoyTypeDto-ui-create-warning-validation.xml | 0 ...ttingBuoyTypeDto-ui-update-error-validation.xml | 0 ...ingBuoyTypeDto-ui-update-warning-validation.xml | 0 ...ActivitySeineDto-ui-create-error-validation.xml | 0 ...tivitySeineDto-ui-create-warning-validation.xml | 0 ...ActivitySeineDto-ui-update-error-validation.xml | 0 ...tivitySeineDto-ui-update-warning-validation.xml | 0 ...eightCategoryDto-ui-create-error-validation.xml | 0 ...ghtCategoryDto-ui-create-warning-validation.xml | 0 ...eightCategoryDto-ui-update-error-validation.xml | 0 ...ghtCategoryDto-ui-update-warning-validation.xml | 0 .../seine/WindDto-ui-create-error-validation.xml | 0 .../seine/WindDto-ui-create-warning-validation.xml | 0 .../seine/WindDto-ui-update-error-validation.xml | 0 .../seine/WindDto-ui-update-warning-validation.xml | 0 ...ActivitySeineDto-ui-create-error-validation.xml | 0 ...tivitySeineDto-ui-create-warning-validation.xml | 0 ...ActivitySeineDto-ui-update-error-validation.xml | 0 ...tivitySeineDto-ui-update-warning-validation.xml | 0 ...bservedSystemDto-ui-update-error-validation.xml | 0 ...ervedSystemDto-ui-update-warning-validation.xml | 0 ...loatingObjectDto-ui-create-error-validation.xml | 0 ...atingObjectDto-ui-create-warning-validation.xml | 0 ...loatingObjectDto-ui-update-error-validation.xml | 0 ...atingObjectDto-ui-update-warning-validation.xml | 0 ...choolEstimateDto-ui-update-error-validation.xml | 0 ...nsmittingBuoyDto-ui-update-error-validation.xml | 0 ...FeaturesSeineDto-ui-update-error-validation.xml | 0 ...onTargetCatchDto-ui-update-error-validation.xml | 0 ...TargetCatchDto-ui-update-warning-validation.xml | 0 ...nTargetLengthDto-ui-update-error-validation.xml | 0 ...argetLengthDto-ui-update-warning-validation.xml | 0 ...nTargetSampleDto-ui-update-error-validation.xml | 0 ...servedSpeciesDto-ui-update-error-validation.xml | 0 ...choolEstimateDto-ui-update-error-validation.xml | 0 ...oolEstimateDto-ui-update-warning-validation.xml | 0 .../seine/RouteDto-ui-create-error-validation.xml | 0 .../RouteDto-ui-create-warning-validation.xml | 0 .../seine/RouteDto-ui-update-error-validation.xml | 0 .../RouteDto-ui-update-warning-validation.xml | 0 ...choolEstimateDto-ui-update-error-validation.xml | 0 .../SetSeineDto-ui-create-error-validation.xml | 0 .../SetSeineDto-ui-create-warning-validation.xml | 0 .../SetSeineDto-ui-update-error-validation.xml | 0 .../SetSeineDto-ui-update-warning-validation.xml | 0 ...onTargetCatchDto-ui-update-error-validation.xml | 0 ...choolEstimateDto-ui-update-error-validation.xml | 0 ...hDto-ui-update-targetCatch-error-validation.xml | 0 ...-ui-update-targetDiscarded-error-validation.xml | 0 ...hDto-ui-update-targetCatch-error-validation.xml | 0 ...to-ui-update-targetCatch-warning-validation.xml | 0 ...-ui-update-targetDiscarded-error-validation.xml | 0 ...i-update-targetDiscarded-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 0 ...argetLengthDto-ui-update-warning-validation.xml | 0 .../TargetSampleDto-ui-update-error-validation.xml | 0 ...nsmittingBuoyDto-ui-update-error-validation.xml | 0 ...mittingBuoyDto-ui-update-warning-validation.xml | 0 .../TripSeineDto-ui-create-error-validation.xml | 0 .../TripSeineDto-ui-create-warning-validation.xml | 0 .../TripSeineDto-ui-update-error-validation.xml | 0 .../TripSeineDto-ui-update-warning-validation.xml | 0 ...eineGearUseDto-ui-update-warning-validation.xml | 0 .../application-swing-validation_en_GB.properties | 0 .../application-swing-validation_es_ES.properties | 0 .../application-swing-validation_fr_FR.properties | 0 .../validation/BeanValidatorDetectorTest.java | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/validators.xml | 0 .../LICENSE.txt | 0 .../README.md | 0 .../changelog.txt | 0 .../pom.xml | 24 ++--- .../src/license/THIRD-PARTY.properties | 0 .../src/main/assembly/bin.xml | 0 .../dist/doc/observe_manuel_administration.pdf | Bin .../dist/doc/observe_manuel_observateur.pdf | Bin .../src/main/assembly/dist/go.bat | 0 .../src/main/assembly/dist/go.sh | 0 .../main/assembly/dist/obstuna-admin/README.txt | 0 .../assembly/dist/obstuna-admin/apply-extra.sh | 0 .../assembly/dist/obstuna-admin/create-obstuna.bat | 0 .../assembly/dist/obstuna-admin/create-obstuna.sh | 0 .../obstuna-admin/createdb/create-empty-obstuna.sh | 0 .../obstuna-admin/createdb/create-ird_obstuna.sh | 0 .../obstuna-admin/createdb/create-test_obstuna.sh | 0 .../assembly/dist/obstuna-admin/drop-obstuna.bat | 0 .../assembly/dist/obstuna-admin/drop-obstuna.sh | 0 .../extra/create-postgis-1-activity.sql | 0 .../extra/create-postgis-2-harbour.sql | 0 .../extra/create-postgis-3-activity-seine.sql | 0 .../extra/create-postgis-4-activity-longine.sql | 0 .../extra/function_enhanced_sets_school_types.sql | 0 .../assembly/dist/obstuna-admin/update-obstuna.bat | 0 .../assembly/dist/obstuna-admin/update-obstuna.sh | 0 .../dist/obstuna-admin/update-security-obstuna.bat | 0 .../dist/obstuna-admin/update-security-obstuna.sh | 0 .../src/main/assembly/dist/util/README.txt | 0 .../src/main/assembly/dist/util/backup-obstuna.sh | 0 .../src/main/assembly/dist/util/create-postgis.sh | 0 .../src/main/assembly/dist/util/generate-id.bat | 0 .../src/main/assembly/dist/util/generate-id.sh | 0 .../main/assembly/dist/util/tables/data-tables.txt | 0 .../dist/util/tables/referentiel-tables.txt | 0 .../src/main/assembly/map.xml | 0 .../src/main/assembly/sql/v1/README.txt | 0 .../main/assembly/sql/v1/create-obstuna-linux.sh | 0 .../main/assembly/sql/v1/create-obstuna-solaris.sh | 0 .../src/main/assembly/sql/v1/create-postgis.sh | 0 .../src/main/assembly/sql/v1/createdb-script.sh | 0 .../v1/security/create-admin-security-script.sh | 0 .../v1/security/create-default-security-script.sh | 0 .../v1/security/create-reader-security-script.sh | 0 .../sql/v1/security/create-security-script.sh | 0 .../security/create-technicien-security-script.sh | 0 .../src/main/assembly/sql/v1/security/tables.txt | 0 .../src/main/assembly/sql/v1/sql/obstuna.sql | 0 .../src/main/assembly/sql/v2/README.txt | 0 .../main/filters/observe-application.properties | 0 .../src/main/filters/observe-ui.properties | 0 .../application/swing/ObserveActionExecutor.java | 0 .../observe/application/swing/ObserveAdminCLI.java | 0 .../observe/application/swing/ObserveCLAction.java | 0 .../application/swing/ObserveOpenDataManager.java | 0 .../application/swing/ObserveResourceManager.java | 0 .../observe/application/swing/ObserveRunner.java | 0 .../swing/ObserveSwingApplicationContext.java | 0 .../ObserveSwingApplicationDataSourcesManager.java | 0 .../swing/ObserveSwingBinderService.java | 0 .../swing/ObserveSwingTechnicalException.java | 0 .../application/swing/ObserveTextGenerator.java | 0 .../ObserveSwingApplicationConfig.java | 0 .../ObserveSwingApplicationConfigOption.java | 0 .../ObserveSwingApplicationConfigProvider.java | 0 .../observe/application/swing/db/DataContext.java | 0 .../swing/db/ObserveSwingDataSource.java | 0 .../swing/db/constants/ConnexionStatus.java | 0 .../swing/db/constants/CreationMode.java | 0 .../swing/db/constants/DataContextType.java | 0 .../application/swing/db/constants/DbMode.java | 0 .../db/event/ObserveSwingDataSourceEvent.java | 0 .../db/event/ObserveSwingDataSourceListener.java | 0 .../ObserveSwingDataSourceListenerAdapter.java | 0 .../fr/ird/observe/application/swing/package.html | 0 .../application/swing/ui/ObserveCommon.jcss | 0 .../application/swing/ui/ObserveMainUI.jaxx | 0 .../application/swing/ui/ObserveMainUI.jcss | 0 .../application/swing/ui/ObserveMainUIHandler.java | 0 .../application/swing/ui/ObserveUICallback.java | 0 .../application/swing/ui/ObserveUIMode.java | 0 .../ird/observe/application/swing/ui/UIHelper.java | 0 .../swing/ui/actions/AbstractObserveAction.java | 0 .../actions/ChangeApplicationLanguageAction.java | 0 .../swing/ui/actions/ChangeDbLanguageAction.java | 0 .../swing/ui/actions/ChangeStorageAction.java | 0 .../swing/ui/actions/CloseApplicationAction.java | 0 .../swing/ui/actions/CloseHelpAction.java | 0 .../swing/ui/actions/CloseStorageAction.java | 0 .../swing/ui/actions/GotoSiteAction.java | 0 .../ui/actions/ImportStorageFromFileAction.java | 0 .../swing/ui/actions/LaunchAdminAction.java | 0 .../swing/ui/actions/ReloadApplicationAction.java | 0 .../actions/ReloadDefaultConfigurationAction.java | 0 .../swing/ui/actions/ReloadResourcesAction.java | 0 .../swing/ui/actions/ReloadStorageAction.java | 0 .../swing/ui/actions/SaveStorageToFileAction.java | 0 .../swing/ui/actions/ShowAboutAction.java | 0 .../swing/ui/actions/ShowConfigAction.java | 0 .../swing/ui/actions/ShowStorageInfoAction.java | 0 .../swing/ui/actions/StartH2WebServerAction.java | 0 .../swing/ui/actions/StartServerModeAction.java | 0 .../swing/ui/actions/StopH2WebServerAction.java | 0 .../swing/ui/actions/StopServerModeAction.java | 0 .../swing/ui/actions/shared/AbstractUIAction.java | 0 .../ui/actions/shared/CancelCreateUIAction.java | 0 .../ui/actions/shared/CloseAndCreateUIAction.java | 0 .../swing/ui/actions/shared/CloseOpenUIAction.java | 0 .../ui/actions/shared/DeleteDataUIAction.java | 0 .../ui/actions/shared/DeleteReferenceUIAction.java | 0 .../swing/ui/actions/shared/GoDownUIAction.java | 0 .../swing/ui/actions/shared/GoUpUIAction.java | 0 .../shared/MoveActivityLonglinesUIAction.java | 0 .../actions/shared/MoveActivitySeinesUIAction.java | 0 .../ui/actions/shared/MoveRoutesUIAction.java | 0 .../actions/shared/MoveTripLonglinesUIAction.java | 0 .../ui/actions/shared/MoveTripSeinesUIAction.java | 0 .../swing/ui/actions/shared/MoveTripsUIAction.java | 0 .../swing/ui/actions/shared/ReOpenUIAction.java | 0 .../swing/ui/actions/shared/ResetEditUIAction.java | 0 .../swing/ui/actions/shared/SaveEditUIAction.java | 0 .../ui/actions/shared/SelectNodeUIAction.java | 0 .../ui/actions/shared/SelectOpenNodeUIAction.java | 0 .../swing/ui/admin/AdminActionModel.java | 0 .../swing/ui/admin/AdminActionWorker.java | 0 .../application/swing/ui/admin/AdminStep.java | 0 .../application/swing/ui/admin/AdminTabUI.jaxx | 0 .../application/swing/ui/admin/AdminTabUI.jcss | 0 .../swing/ui/admin/AdminTabUIHandler.java | 0 .../application/swing/ui/admin/AdminUI.jaxx | 0 .../application/swing/ui/admin/AdminUI.jcss | 0 .../application/swing/ui/admin/AdminUIHandler.java | 0 .../swing/ui/admin/AdminUILauncher.java | 0 .../application/swing/ui/admin/AdminUIModel.java | 0 .../swing/ui/admin/config/ConfigUI.jaxx | 0 .../swing/ui/admin/config/ConfigUI.jcss | 0 .../swing/ui/admin/config/ConfigUIHandler.java | 0 .../swing/ui/admin/config/SelectDataUI.jaxx | 0 .../swing/ui/admin/config/SelectDataUI.jcss | 0 .../ui/admin/consolidate/ConsolidateModel.java | 0 .../swing/ui/admin/consolidate/ConsolidateUI.jaxx | 0 .../swing/ui/admin/consolidate/ConsolidateUI.jcss | 0 .../ui/admin/consolidate/ConsolidateUIHandler.java | 0 .../swing/ui/admin/export/ExportModel.java | 0 .../swing/ui/admin/export/ExportUI.jaxx | 0 .../swing/ui/admin/export/ExportUI.jcss | 0 .../swing/ui/admin/export/ExportUIHandler.java | 0 .../swing/ui/admin/export/TripEntry.java | 0 .../ui/admin/export/TripToExportTableModel.java | 0 .../swing/ui/admin/report/ReportConfigUI.jaxx | 0 .../swing/ui/admin/report/ReportConfigUI.jcss | 0 .../swing/ui/admin/report/ReportModel.java | 0 .../swing/ui/admin/report/ReportUI.jaxx | 0 .../swing/ui/admin/report/ReportUI.jcss | 0 .../swing/ui/admin/report/ReportUIHandler.java | 0 .../swing/ui/admin/report/ResultTableModel.java | 0 .../swing/ui/admin/resume/ShowResumeUI.jaxx | 0 .../swing/ui/admin/resume/ShowResumeUI.jcss | 0 .../swing/ui/admin/resume/ShowResumeUIHandler.java | 0 .../swing/ui/admin/save/SaveLocalModel.java | 0 .../swing/ui/admin/save/SaveLocalUI.jaxx | 0 .../swing/ui/admin/save/SaveLocalUI.jcss | 0 .../swing/ui/admin/save/SaveLocalUIHandler.java | 0 .../admin/synchronize/data/DataSynchroModel.java | 0 .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 0 .../ui/admin/synchronize/data/DataSynchroUI.jcss | 0 .../synchronize/data/DataSynchroUIHandler.java | 0 .../data/DataSynchronizeTaskListCellRenderer.java | 0 .../data/task/CopyToLeftDataSynchronizeTask.java | 0 .../data/task/CopyToRightDataSynchronizeTask.java | 0 .../data/task/DataSynchronizeTaskSupport.java | 0 .../task/DeleteFromLeftDataSynchronizeTask.java | 0 .../task/DeleteFromRightDataSynchronizeTask.java | 0 .../legacy/ObsoleteReferentialReference.java | 0 ...soleteReferentialReferenceListCellRenderer.java | 0 .../referential/legacy/SynchronizeModel.java | 0 .../referential/legacy/SynchronizeUI.jaxx | 0 .../referential/legacy/SynchronizeUI.jcss | 0 .../referential/legacy/SynchronizeUIHandler.java | 0 .../referential/ng/ReferentialReplaceUI.jaxx | 0 .../referential/ng/ReferentialReplaceUI.jcss | 0 .../ng/ReferentialReplaceUIHandler.java | 0 .../referential/ng/ReferentialSynchroConfigUI.jaxx | 0 .../referential/ng/ReferentialSynchroConfigUI.jcss | 0 .../referential/ng/ReferentialSynchroModel.java | 0 .../referential/ng/ReferentialSynchroUI.jaxx | 0 .../referential/ng/ReferentialSynchroUI.jcss | 0 .../ng/ReferentialSynchroUIHandler.java | 0 .../ng/ReferentialSynchronizeResources.java | 0 ...ReferentialSynchronizeTaskListCellRenderer.java | 0 .../ng/ReferentialSynchronizeTaskListModel.java | 0 .../referential/ng/action/ApplyAction.java | 0 .../ng/action/RegisterAddTaskAction.java | 0 .../ng/action/RegisterCopyTaskAction.java | 0 .../ng/action/RegisterDeleteTaskAction.java | 0 .../ng/action/RegisterDesactivateTaskAction.java | 0 .../ng/action/RegisterRevertTaskAction.java | 0 .../ng/action/RegisterSkipTaskAction.java | 0 .../ng/action/RegisterTasksActionSupport.java | 0 .../ng/action/RegisterUpdateTaskAction.java | 0 .../ng/task/AddReferentialSynchronizeTask.java | 0 .../ng/task/DeleteReferentialSynchronizeTask.java | 0 .../DesactivateReferentialSynchronizeTask.java | 0 .../ng/task/ReferentialSynchronizeTaskSupport.java | 0 ...ferentialSynchronizeTaskWithReplaceSupport.java | 0 .../ng/task/RevertReferentialSynchronizeTask.java | 0 .../ng/task/SkipReferentialSynchronizeTask.java | 0 .../ng/task/UpdateReferentialSynchronizeTask.java | 0 .../ReferentialSynchronizeTreeCellRenderer.java | 0 .../ng/tree/ReferentialSynchronizeTreeModel.java | 0 .../ReferentialSynchronizeTreeModelsBuilder.java | 0 .../node/AddedReferenceReferentialSynchroNode.java | 0 .../ReferenceReferentialSynchroNodeSupport.java | 0 .../tree/node/ReferentialSynchroNodeSupport.java | 0 .../ng/tree/node/RootReferentialSynchroNode.java | 0 .../ng/tree/node/TypeReferentialSynchroNode.java | 0 .../UpdatedReferenceReferentialSynchroNode.java | 0 .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 0 .../swing/ui/admin/validate/ValidateConfigUI.jcss | 0 .../validate/ValidateEntityListCellRenderer.java | 0 .../swing/ui/admin/validate/ValidateModel.java | 0 .../swing/ui/admin/validate/ValidateUI.jaxx | 0 .../swing/ui/admin/validate/ValidateUI.jcss | 0 .../swing/ui/admin/validate/ValidateUIHandler.java | 0 .../validate/ValidationMessageTableModel.java | 0 .../application/swing/ui/content/Common.jcss | 0 .../application/swing/ui/content/ContentMode.java | 0 .../application/swing/ui/content/ContentUI.jaxx | 0 .../application/swing/ui/content/ContentUI.jcss | 0 .../swing/ui/content/ContentUIHandler.java | 0 .../swing/ui/content/ContentUIInitializer.java | 0 .../swing/ui/content/ContentUIManager.java | 0 .../swing/ui/content/ContentUIModel.java | 0 .../swing/ui/content/ObserveContentUI.java | 0 .../content/impl/longline/BasketsTableModel.java | 0 .../ui/content/impl/longline/BranchlineUI.jaxx | 0 .../ui/content/impl/longline/BranchlineUI.jcss | 0 .../content/impl/longline/BranchlineUIHandler.java | 0 .../content/impl/longline/BranchlineUIModel.java | 0 .../impl/longline/BranchlinesTableModel.java | 0 .../LonglineCompositionTableModelSupport.java | 0 .../impl/longline/LonglineDetailCompositionUI.jaxx | 0 .../impl/longline/LonglineDetailCompositionUI.jcss | 0 .../LonglineDetailCompositionUIHandler.java | 0 .../LonglineDetailCompositionUIInitializer.java | 0 .../longline/LonglineDetailCompositionUIModel.java | 0 ...onglineDetailCompositionUIValidationHelper.java | 0 ...LonglineDetailCompositionValidationContext.java | 0 .../LonglineDetailCompositionValidatorService.java | 0 .../impl/longline/LonglineGlobalCompositionUI.jaxx | 0 .../impl/longline/LonglineGlobalCompositionUI.jcss | 0 .../LonglineGlobalCompositionUIHandler.java | 0 .../longline/LonglineGlobalCompositionUIModel.java | 0 .../impl/longline/SectionTemplatesTableModel.java | 0 .../content/impl/longline/SectionsTableModel.java | 0 .../ui/content/impl/longline/SetLonglineUI.jaxx | 0 .../ui/content/impl/longline/SetLonglineUI.jcss | 0 .../impl/longline/SetLonglineUIHandler.java | 0 .../content/impl/longline/SetLonglineUIModel.java | 0 .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 0 .../impl/seine/ActivitySeineObservedSystemUI.jcss | 0 .../ActivitySeineObservedSystemUIHandler.java | 0 .../seine/ActivitySeineObservedSystemUIModel.java | 0 .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 0 .../FloatingObjectTransmittingBuoyOperationUI.jcss | 0 ...ngObjectTransmittingBuoyOperationUIHandler.java | 0 ...tingObjectTransmittingBuoyOperationUIModel.java | 0 .../ui/content/impl/seine/FloatingObjectUI.jaxx | 0 .../ui/content/impl/seine/FloatingObjectUI.jcss | 0 .../impl/seine/FloatingObjectUIHandler.java | 0 .../content/impl/seine/FloatingObjectUIModel.java | 0 .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 0 .../swing/ui/content/impl/seine/SetSeineUI.jcss | 0 .../ui/content/impl/seine/SetSeineUIHandler.java | 0 .../ui/content/impl/seine/SetSeineUIModel.java | 0 .../swing/ui/content/impl/seine/package.html | 0 .../swing/ui/content/list/ContentListUI.jaxx | 0 .../swing/ui/content/list/ContentListUI.jcss | 0 .../ui/content/list/ContentListUIHandler.java | 0 .../swing/ui/content/list/ContentListUIModel.java | 0 .../list/impl/longline/ActivityLonglinesUI.jaxx | 0 .../list/impl/longline/ActivityLonglinesUI.jcss | 0 .../impl/longline/ActivityLonglinesUIHandler.java | 0 .../impl/longline/ActivityLonglinesUIModel.java | 0 .../content/list/impl/longline/CommonListUI.jcss | 0 .../list/impl/longline/TripLonglinesUI.jaxx | 0 .../list/impl/longline/TripLonglinesUI.jcss | 0 .../list/impl/longline/TripLonglinesUIHandler.java | 0 .../list/impl/longline/TripLonglinesUIModel.java | 0 .../content/list/impl/seine/ActivitySeinesUI.jaxx | 0 .../content/list/impl/seine/ActivitySeinesUI.jcss | 0 .../list/impl/seine/ActivitySeinesUIHandler.java | 0 .../list/impl/seine/ActivitySeinesUIModel.java | 0 .../ui/content/list/impl/seine/CommonListUI.jcss | 0 .../swing/ui/content/list/impl/seine/RoutesUI.jaxx | 0 .../swing/ui/content/list/impl/seine/RoutesUI.jcss | 0 .../content/list/impl/seine/RoutesUIHandler.java | 0 .../ui/content/list/impl/seine/RoutesUIModel.java | 0 .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 0 .../ui/content/list/impl/seine/TripSeinesUI.jcss | 0 .../list/impl/seine/TripSeinesUIHandler.java | 0 .../content/list/impl/seine/TripSeinesUIModel.java | 0 .../application/swing/ui/content/list/package.html | 0 .../swing/ui/content/open/ContentOpenableUI.jaxx | 0 .../swing/ui/content/open/ContentOpenableUI.jcss | 0 .../ui/content/open/ContentOpenableUIHandler.java | 0 .../ui/content/open/ContentOpenableUIModel.java | 0 .../open/impl/longline/ActivityLonglineUI.jaxx | 0 .../open/impl/longline/ActivityLonglineUI.jcss | 0 .../impl/longline/ActivityLonglineUIHandler.java | 0 .../impl/longline/ActivityLonglineUIModel.java | 0 .../content/open/impl/longline/TripLonglineUI.jaxx | 0 .../content/open/impl/longline/TripLonglineUI.jcss | 0 .../open/impl/longline/TripLonglineUIHandler.java | 0 .../open/impl/longline/TripLonglineUIModel.java | 0 .../content/open/impl/seine/ActivitySeineUI.jaxx | 0 .../content/open/impl/seine/ActivitySeineUI.jcss | 0 .../open/impl/seine/ActivitySeineUIHandler.java | 0 .../open/impl/seine/ActivitySeineUIModel.java | 0 .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 0 .../swing/ui/content/open/impl/seine/RouteUI.jcss | 0 .../ui/content/open/impl/seine/RouteUIHandler.java | 0 .../ui/content/open/impl/seine/RouteUIModel.java | 0 .../ui/content/open/impl/seine/TripSeineUI.jaxx | 0 .../ui/content/open/impl/seine/TripSeineUI.jcss | 0 .../open/impl/seine/TripSeineUIHandler.java | 0 .../content/open/impl/seine/TripSeineUIModel.java | 0 .../application/swing/ui/content/package.html | 0 .../swing/ui/content/ref/ContentReferenceUI.jaxx | 0 .../swing/ui/content/ref/ContentReferenceUI.jcss | 0 .../ui/content/ref/ContentReferenceUIHandler.java | 0 .../ui/content/ref/ContentReferenceUIModel.java | 0 .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 0 .../swing/ui/content/ref/ReferenceHomeUI.jcss | 0 .../ui/content/ref/ReferenceHomeUIHandler.java | 0 .../swing/ui/content/ref/ReferenceHomeUIModel.java | 0 .../ref/ReferentialContentUIInitializer.java | 0 .../swing/ui/content/ref/UniqueKeyTableModel.java | 0 .../swing/ui/content/ref/impl/CountryUI.jaxx | 0 .../swing/ui/content/ref/impl/CountryUI.jcss | 0 .../swing/ui/content/ref/impl/CountryUIModel.java | 0 .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 0 .../swing/ui/content/ref/impl/FpaZoneUI.jcss | 0 .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 0 .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 0 .../ref/impl/GearCaracteristicTypeUIModel.java | 0 .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 0 .../ui/content/ref/impl/GearCaracteristicUI.jcss | 0 .../content/ref/impl/GearCaracteristicUIModel.java | 0 .../swing/ui/content/ref/impl/GearUI.jaxx | 0 .../swing/ui/content/ref/impl/GearUI.jcss | 0 .../swing/ui/content/ref/impl/GearUIHandler.java | 0 .../swing/ui/content/ref/impl/GearUIModel.java | 0 .../swing/ui/content/ref/impl/HarbourUI.jaxx | 0 .../swing/ui/content/ref/impl/HarbourUI.jcss | 0 .../swing/ui/content/ref/impl/HarbourUIModel.java | 0 .../ui/content/ref/impl/I18nReferenceEntity.jcss | 0 .../content/ref/impl/LengthWeightParameterUI.jaxx | 0 .../content/ref/impl/LengthWeightParameterUI.jcss | 0 .../ref/impl/LengthWeightParameterUIHandler.java | 0 .../ref/impl/LengthWeightParameterUIModel.java | 0 .../ref/impl/NeedCommentReferenceEntity.jcss | 0 .../swing/ui/content/ref/impl/OceanUI.jaxx | 0 .../swing/ui/content/ref/impl/OceanUIModel.java | 0 .../swing/ui/content/ref/impl/OrganismUI.jaxx | 0 .../swing/ui/content/ref/impl/OrganismUI.jcss | 0 .../swing/ui/content/ref/impl/OrganismUIModel.java | 0 .../swing/ui/content/ref/impl/PersonUI.jaxx | 0 .../swing/ui/content/ref/impl/PersonUI.jcss | 0 .../swing/ui/content/ref/impl/PersonUIModel.java | 0 .../content/ref/impl/ProgramObservationEnum.java | 0 .../swing/ui/content/ref/impl/ProgramUI.jaxx | 0 .../swing/ui/content/ref/impl/ProgramUI.jcss | 0 .../ui/content/ref/impl/ProgramUIHandler.java | 0 .../swing/ui/content/ref/impl/ProgramUIModel.java | 0 .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 0 .../swing/ui/content/ref/impl/SexUI.jaxx | 0 .../swing/ui/content/ref/impl/SexUIModel.java | 0 .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 0 .../swing/ui/content/ref/impl/SpeciesGroupUI.jcss | 0 .../ui/content/ref/impl/SpeciesGroupUIModel.java | 0 .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 0 .../swing/ui/content/ref/impl/SpeciesListUI.jcss | 0 .../ui/content/ref/impl/SpeciesListUIHandler.java | 0 .../ui/content/ref/impl/SpeciesListUIModel.java | 0 .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 0 .../swing/ui/content/ref/impl/SpeciesUI.jcss | 0 .../ui/content/ref/impl/SpeciesUIHandler.java | 0 .../swing/ui/content/ref/impl/SpeciesUIModel.java | 0 .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 0 .../ui/content/ref/impl/VesselSizeCategoryUI.jcss | 0 .../ref/impl/VesselSizeCategoryUIModel.java | 0 .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 0 .../ui/content/ref/impl/VesselTypeUIModel.java | 0 .../swing/ui/content/ref/impl/VesselUI.jaxx | 0 .../swing/ui/content/ref/impl/VesselUI.jcss | 0 .../swing/ui/content/ref/impl/VesselUIHandler.java | 0 .../swing/ui/content/ref/impl/VesselUIModel.java | 0 .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 0 .../impl/longline/BaitHaulingStatusUIModel.java | 0 .../ref/impl/longline/BaitSettingStatusUI.jaxx | 0 .../impl/longline/BaitSettingStatusUIModel.java | 0 .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 0 .../content/ref/impl/longline/BaitTypeUIModel.java | 0 .../ref/impl/longline/CatchFateLonglineUI.jaxx | 0 .../impl/longline/CatchFateLonglineUIModel.java | 0 .../content/ref/impl/longline/EncounterTypeUI.jaxx | 0 .../ref/impl/longline/EncounterTypeUIModel.java | 0 .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 0 .../ref/impl/longline/HealthnessUIModel.java | 0 .../content/ref/impl/longline/HookPositionUI.jaxx | 0 .../ref/impl/longline/HookPositionUIModel.java | 0 .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 0 .../content/ref/impl/longline/HookSizeUIModel.java | 0 .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 0 .../content/ref/impl/longline/HookTypeUIModel.java | 0 .../impl/longline/ItemHorizontalPositionUI.jaxx | 0 .../longline/ItemHorizontalPositionUIModel.java | 0 .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 0 .../impl/longline/ItemVerticalPositionUIModel.java | 0 .../ref/impl/longline/LightsticksColorUI.jaxx | 0 .../ref/impl/longline/LightsticksColorUIModel.java | 0 .../ref/impl/longline/LightsticksTypeUI.jaxx | 0 .../ref/impl/longline/LightsticksTypeUIModel.java | 0 .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 0 .../content/ref/impl/longline/LineTypeUIModel.java | 0 .../ref/impl/longline/MaturityStatusUI.jaxx | 0 .../ref/impl/longline/MaturityStatusUI.jcss | 0 .../ref/impl/longline/MaturityStatusUIModel.java | 0 .../ref/impl/longline/MitigationTypeUI.jaxx | 0 .../ref/impl/longline/MitigationTypeUIModel.java | 0 .../content/ref/impl/longline/SensorBrandUI.jaxx | 0 .../content/ref/impl/longline/SensorBrandUI.jcss | 0 .../ref/impl/longline/SensorBrandUIModel.java | 0 .../ref/impl/longline/SensorDataFormatUI.jaxx | 0 .../ref/impl/longline/SensorDataFormatUIModel.java | 0 .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 0 .../ref/impl/longline/SensorTypeUIModel.java | 0 .../content/ref/impl/longline/SettingShapeUI.jaxx | 0 .../ref/impl/longline/SettingShapeUIModel.java | 0 .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 0 .../ref/impl/longline/SizeMeasureTypeUIModel.java | 0 .../ref/impl/longline/StomacFullnessUI.jaxx | 0 .../ref/impl/longline/StomacFullnessUIModel.java | 0 .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 0 .../content/ref/impl/longline/TripTypeUIModel.java | 0 .../impl/longline/VesselActivityLonglineUI.jaxx | 0 .../longline/VesselActivityLonglineUIModel.java | 0 .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 0 .../impl/longline/WeightMeasureTypeUIModel.java | 0 .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 0 .../ref/impl/seine/DetectionModeUIModel.java | 0 .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 0 .../content/ref/impl/seine/ObjectFateUIModel.java | 0 .../content/ref/impl/seine/ObjectOperationUI.jaxx | 0 .../ref/impl/seine/ObjectOperationUIModel.java | 0 .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 0 .../content/ref/impl/seine/ObjectTypeUIModel.java | 0 .../content/ref/impl/seine/ObservedSystemUI.jaxx | 0 .../content/ref/impl/seine/ObservedSystemUI.jcss | 0 .../ref/impl/seine/ObservedSystemUIModel.java | 0 .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 0 .../ref/impl/seine/ReasonForDiscardUIModel.java | 0 .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 0 .../ref/impl/seine/ReasonForNoFishingUIModel.java | 0 .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 0 .../ref/impl/seine/ReasonForNullSetUIModel.java | 0 .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 0 .../content/ref/impl/seine/SpeciesFateUIModel.java | 0 .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 0 .../ref/impl/seine/SpeciesStatusUIModel.java | 0 .../ref/impl/seine/SurroundingActivityUI.jaxx | 0 .../ref/impl/seine/SurroundingActivityUIModel.java | 0 .../impl/seine/TransmittingBuoyOperationUI.jaxx | 0 .../seine/TransmittingBuoyOperationUIModel.java | 0 .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 0 .../impl/seine/TransmittingBuoyTypeUIModel.java | 0 .../ref/impl/seine/VesselActivitySeineUI.jaxx | 0 .../ref/impl/seine/VesselActivitySeineUIModel.java | 0 .../content/ref/impl/seine/WeightCategoryUI.jaxx | 0 .../content/ref/impl/seine/WeightCategoryUI.jcss | 0 .../ref/impl/seine/WeightCategoryUIModel.java | 0 .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 0 .../swing/ui/content/ref/impl/seine/WindUI.jcss | 0 .../ui/content/ref/impl/seine/WindUIModel.java | 0 .../application/swing/ui/content/ref/package.html | 0 .../swing/ui/content/table/CommonTable.jcss | 0 .../swing/ui/content/table/ContentTableMeta.java | 0 .../swing/ui/content/table/ContentTableModel.java | 0 .../swing/ui/content/table/ContentTableUI.jaxx | 0 .../swing/ui/content/table/ContentTableUI.jcss | 0 .../ui/content/table/ContentTableUIHandler.java | 0 .../content/table/ContentTableUIInitializer.java | 0 .../ui/content/table/ContentTableUIModel.java | 0 .../ui/content/table/ObserveContentTableUI.java | 0 .../table/impl/longline/BaitsCompositionUI.jaxx | 0 .../table/impl/longline/BaitsCompositionUI.jcss | 0 .../impl/longline/BaitsCompositionUIHandler.java | 0 .../impl/longline/BaitsCompositionUIModel.java | 0 .../impl/longline/BranchlinesCompositionUI.jaxx | 0 .../impl/longline/BranchlinesCompositionUI.jcss | 0 .../longline/BranchlinesCompositionUIHandler.java | 0 .../longline/BranchlinesCompositionUIModel.java | 0 .../impl/longline/CatchAcquisitionModeEnum.java | 0 .../CatchLonglineContentTableUIInitializer.java | 0 .../impl/longline/CatchLonglineTableModel.java | 0 .../table/impl/longline/CatchLonglineUI.jaxx | 0 .../table/impl/longline/CatchLonglineUI.jcss | 0 .../impl/longline/CatchLonglineUIHandler.java | 0 .../table/impl/longline/CatchLonglineUIModel.java | 0 .../content/table/impl/longline/EncounterUI.jaxx | 0 .../content/table/impl/longline/EncounterUI.jcss | 0 .../table/impl/longline/EncounterUIHandler.java | 0 .../table/impl/longline/EncounterUIModel.java | 0 .../impl/longline/FloatlinesCompositionUI.jaxx | 0 .../impl/longline/FloatlinesCompositionUI.jcss | 0 .../longline/FloatlinesCompositionUIHandler.java | 0 .../longline/FloatlinesCompositionUIModel.java | 0 .../GearUseFeaturesLonglineTableModel.java | 0 .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 0 .../impl/longline/GearUseFeaturesLonglineUI.jcss | 0 .../longline/GearUseFeaturesLonglineUIHandler.java | 0 .../longline/GearUseFeaturesLonglineUIModel.java | 0 ...rUseFeaturesMeasurementLonglinesTableModel.java | 0 .../table/impl/longline/HooksCompositionUI.jaxx | 0 .../table/impl/longline/HooksCompositionUI.jcss | 0 .../impl/longline/HooksCompositionUIHandler.java | 0 .../impl/longline/HooksCompositionUIModel.java | 0 .../impl/longline/LonglinePositionHelper.java | 0 .../content/table/impl/longline/SensorUsedUI.jaxx | 0 .../content/table/impl/longline/SensorUsedUI.jcss | 0 .../table/impl/longline/SensorUsedUIHandler.java | 0 .../table/impl/longline/SensorUsedUIModel.java | 0 .../impl/longline/SizeMeasuresTableModel.java | 0 .../ui/content/table/impl/longline/TdrUI.jaxx | 0 .../ui/content/table/impl/longline/TdrUI.jcss | 0 .../content/table/impl/longline/TdrUIHandler.java | 0 .../ui/content/table/impl/longline/TdrUIModel.java | 0 .../impl/longline/WeightMeasuresTableModel.java | 0 .../content/table/impl/seine/AbstractSampleUI.jcss | 0 .../content/table/impl/seine/CodeMesureEnum.java | 0 .../seine/GearUseFeatureMeasurementCellEditor.java | 0 .../GearUseFeatureMeasurementCellRenderer.java | 0 ...GearUseFeaturesMeasurementSeinesTableModel.java | 0 .../impl/seine/GearUseFeaturesSeineTableModel.java | 0 .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 0 .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 0 .../impl/seine/GearUseFeaturesSeineUIHandler.java | 0 .../impl/seine/GearUseFeaturesSeineUIModel.java | 0 .../impl/seine/ModeSaisieEchantillonEnum.java | 0 .../content/table/impl/seine/NonTargetCatchUI.jaxx | 0 .../content/table/impl/seine/NonTargetCatchUI.jcss | 0 .../table/impl/seine/NonTargetCatchUIHandler.java | 0 .../table/impl/seine/NonTargetCatchUIModel.java | 0 .../table/impl/seine/NonTargetSampleUI.jaxx | 0 .../table/impl/seine/NonTargetSampleUI.jcss | 0 .../table/impl/seine/NonTargetSampleUIHandler.java | 0 .../table/impl/seine/NonTargetSampleUIModel.java | 0 .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 0 .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 0 .../impl/seine/ObjectObservedSpeciesUIHandler.java | 0 .../impl/seine/ObjectObservedSpeciesUIModel.java | 0 .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 0 .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 0 .../impl/seine/ObjectSchoolEstimateUIHandler.java | 0 .../impl/seine/ObjectSchoolEstimateUIModel.java | 0 .../content/table/impl/seine/SchoolEstimateUI.jaxx | 0 .../content/table/impl/seine/SchoolEstimateUI.jcss | 0 .../table/impl/seine/SchoolEstimateUIHandler.java | 0 .../table/impl/seine/SchoolEstimateUIModel.java | 0 .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 0 .../ui/content/table/impl/seine/TargetCatchUI.jcss | 0 .../table/impl/seine/TargetCatchUIHandler.java | 0 .../table/impl/seine/TargetCatchUIModel.java | 0 .../table/impl/seine/TargetDiscardCatchUI.jaxx | 0 .../table/impl/seine/TargetDiscardCatchUI.jcss | 0 .../impl/seine/TargetDiscardCatchUIHandler.java | 0 .../impl/seine/TargetDiscardCatchUIModel.java | 0 .../table/impl/seine/TargetSampleCaptureUI.jaxx | 0 .../table/impl/seine/TargetSampleCaptureUI.jcss | 0 .../table/impl/seine/TargetSampleRejeteUI.jaxx | 0 .../table/impl/seine/TargetSampleRejeteUI.jcss | 0 .../content/table/impl/seine/TargetSampleUI.jaxx | 0 .../content/table/impl/seine/TargetSampleUI.jcss | 0 .../table/impl/seine/TargetSampleUIHandler.java | 0 .../table/impl/seine/TargetSampleUIModel.java | 0 .../swing/ui/content/table/package.html | 0 .../ird/observe/application/swing/ui/package.html | 0 .../swing/ui/storage/ObstunaAdminAction.java | 0 .../swing/ui/storage/RemoteUILauncher.java | 0 .../swing/ui/storage/StorageBackupUILauncher.java | 0 .../application/swing/ui/storage/StorageStep.java | 0 .../application/swing/ui/storage/StorageUI.jaxx | 0 .../application/swing/ui/storage/StorageUI.jcss | 0 .../swing/ui/storage/StorageUIHandler.java | 0 .../swing/ui/storage/StorageUILauncher.java | 0 .../swing/ui/storage/StorageUIModel.java | 0 .../application/swing/ui/storage/package.html | 0 .../swing/ui/storage/tabs/BackupUI.jaxx | 0 .../swing/ui/storage/tabs/BackupUI.jcss | 0 .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 0 .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 0 .../swing/ui/storage/tabs/ConfigDataUI.jaxx | 0 .../swing/ui/storage/tabs/ConfigDataUI.jcss | 0 .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 0 .../swing/ui/storage/tabs/ConfigReferentielUI.jcss | 0 .../swing/ui/storage/tabs/ConfigUI.jaxx | 0 .../swing/ui/storage/tabs/ConfigUI.jcss | 0 .../swing/ui/storage/tabs/ConfirmUI.jaxx | 0 .../swing/ui/storage/tabs/ConfirmUI.jcss | 0 .../swing/ui/storage/tabs/DataSelectionModel.java | 0 .../swing/ui/storage/tabs/RolesTableModel.java | 0 .../application/swing/ui/storage/tabs/RolesUI.jaxx | 0 .../application/swing/ui/storage/tabs/RolesUI.jcss | 0 .../swing/ui/storage/tabs/SecurityModel.java | 0 .../swing/ui/storage/tabs/SelectDataUI.jaxx | 0 .../swing/ui/storage/tabs/SelectDataUI.jcss | 0 .../swing/ui/storage/tabs/StorageTabUI.jaxx | 0 .../swing/ui/storage/tabs/StorageTabUI.jcss | 0 .../swing/ui/storage/tabs/StorageTabUIHandler.java | 0 .../application/swing/ui/storage/tabs/package.html | 0 .../ui/tree/AbstractObserveTreeCellRenderer.java | 0 .../swing/ui/tree/AbstrctReferenceNodeSupport.java | 0 .../swing/ui/tree/ActivityLonglineNode.java | 0 .../swing/ui/tree/ActivitySeineNode.java | 0 .../swing/ui/tree/DataReferenceNodeSupport.java | 0 .../ui/tree/DataSelectionTreeCellRenderer.java | 0 .../ui/tree/DataSelectionTreeSelectionModel.java | 0 .../swing/ui/tree/FloatingObjectSeineNode.java | 0 .../swing/ui/tree/NavigationTreeCellRenderer.java | 0 .../ui/tree/NavigationTreeSelectionModel.java | 0 .../swing/ui/tree/ObserveDataProvider.java | 0 .../tree/ObserveNavigationTreeShowPopupAction.java | 0 .../application/swing/ui/tree/ObserveNode.java | 0 .../swing/ui/tree/ObserveTreeBridge.java | 0 .../swing/ui/tree/ObserveTreeHelper.java | 0 .../swing/ui/tree/ProgramLonglineNode.java | 0 .../swing/ui/tree/ProgramSeineNode.java | 0 .../ui/tree/ReferentialReferenceNodeSupport.java | 0 .../application/swing/ui/tree/RouteSeineNode.java | 0 .../application/swing/ui/tree/SetLonglineNode.java | 0 .../application/swing/ui/tree/SetSeineNode.java | 0 .../swing/ui/tree/TripLonglineNode.java | 0 .../application/swing/ui/tree/TripSeineNode.java | 0 .../actions/ChangeActivityRouteActionListener.java | 0 .../actions/ChangeActivityTripActionListener.java | 0 .../actions/ChangeRouteTripActionListener.java | 0 .../actions/ChangeTripProgramActionListener.java | 0 .../ui/tree/actions/NodeChangeActionListener.java | 0 .../loadors/AbstractDataReferenceChildLoador.java | 0 .../ui/tree/loadors/AbstractNodeChildLoador.java | 0 .../loadors/ActivityLonglineNodeChildLoador.java | 0 .../loadors/ActivityLonglinesNodeChildLoador.java | 0 .../tree/loadors/ActivitySeineNodeChildLoador.java | 0 .../loadors/ActivitySeinesNodeChildLoador.java | 0 .../loadors/FloatingObjectNodeChildLoador.java | 0 .../loadors/ProgramLonglineNodeChildLoador.java | 0 .../tree/loadors/ProgramSeineNodeChildLoador.java | 0 .../loadors/ReferenceCommonNodeChildLoador.java | 0 .../loadors/ReferenceLonglineNodeChildLoador.java | 0 .../loadors/ReferenceSeineNodeChildLoador.java | 0 .../swing/ui/tree/loadors/RootNodeChildLoador.java | 0 .../ui/tree/loadors/RoutesNodeChildLoador.java | 0 .../tree/loadors/SetLonglineNodeChildLoador.java | 0 .../ui/tree/loadors/SetSeineNodeChildLoador.java | 0 .../MoveActivityLonglineNodeMenuPopulator.java | 0 .../menu/MoveActivitySeineNodeMenuPopulator.java | 0 .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 0 .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 0 .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 0 .../application/swing/ui/usage/UsagesUI.jaxx | 0 .../swing/ui/usage/UsagesUIHandler.java | 0 .../application/swing/ui/util/BooleanEditor.java | 0 .../swing/ui/util/DecoratedNodeEntity.java | 0 .../application/swing/ui/util/FloatConverter.java | 0 .../swing/ui/util/JVetoableTabbedPane.java | 0 .../ObserveSwingValidatorMessageTableModel.java | 0 .../ObserveValidationMessageTableRenderer.java | 0 .../util/ObserveValidatorMessageTableRenderer.java | 0 .../application/swing/ui/util/SpringUtilities.java | 0 .../ui/util/table/AbstractSelectTableAction.java | 0 .../AutotSelectRowAndShowPopupActionSupport.java | 0 .../swing/ui/util/table/EditableList.java | 0 .../ui/util/table/EditableTableModelSupport.java | 0 .../EditableTableWithCacheTableModelSupport.java | 0 ...nlineTableAutotSelectRowAndShowPopupAction.java | 0 .../util/table/MoveToNextEditableCellAction.java | 0 .../ui/util/table/MoveToNextEditableRowAction.java | 0 .../table/MoveToPreviousEditableCellAction.java | 0 .../table/MoveToPreviousEditableRowAction.java | 0 .../table/ObserveBooleanTableCellRenderer.java | 0 .../swing/ui/util/tree/BeanTreeHeader.jaxx | 0 .../swing/ui/util/tree/BeanTreeHeader.jcss | 0 .../swing/ui/util/tree/BeanTreeHeaderHandler.java | 0 .../swing/ui/util/tripMap/ObserveMapPane.java | 0 .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 0 .../util/tripMap/ObserverMapPanLegendDrawer.java | 0 .../ui/util/tripMap/TripMapContentBuilder.java | 0 .../swing/ui/util/tripMap/TripMapUI.jaxx | 0 .../swing/ui/util/tripMap/TripMapUI.jcss | 0 .../swing/ui/util/tripMap/TripMapUIHandler.java | 0 .../swing/validation/ObserveSwingValidator.java | 0 .../swing/validation/ValidationContext.java | 0 .../swing/validation/ValidationModelMode.java | 0 .../swing/validation/ValidationService.java | 0 .../swing/validation/ValidatorsMap.java | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.prj | 0 .../main/map/shapeFiles/continents/GSHHS_l_L1.shp | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.shx | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.prj | 0 .../main/map/shapeFiles/continents/GSHHS_l_L6.shp | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.shx | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 0 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.prj | 0 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin .../src/main/map/style.xml | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../main/resources/ftl/connexionTestResult_fr.ftl | 0 .../ftl/dataSourceConnectionReport_fr.ftl | 0 .../resources/ftl/dataSourceInformation_fr.ftl | 0 .../src/main/resources/ftl/dataSourcePolicy_fr.ftl | 0 .../ftl/dataSourceSelectModeResume_fr.ftl | 0 .../ftl/storageModelDataSourceConfiguration_fr.ftl | 0 .../i18n/application-swing_en_GB.properties | 102 +++++++-------------- .../i18n/application-swing_es_ES.properties | 102 +++++++-------------- .../i18n/application-swing_fr_FR.properties | 0 .../src/main/resources/icons/action-about.png | Bin .../src/main/resources/icons/action-accept.png | Bin .../src/main/resources/icons/action-add.png | Bin .../resources/icons/action-application-reload.png | Bin .../main/resources/icons/action-bean-sort-down.png | Bin .../main/resources/icons/action-bean-sort-up.png | Bin .../src/main/resources/icons/action-bean-sort.png | Bin .../src/main/resources/icons/action-calculator.png | Bin .../src/main/resources/icons/action-cancel.png | Bin .../src/main/resources/icons/action-center.png | Bin .../src/main/resources/icons/action-close.png | Bin .../src/main/resources/icons/action-closeTab.png | Bin .../src/main/resources/icons/action-collapse.png | Bin .../main/resources/icons/action-combobox-reset.png | Bin .../resources/icons/action-combobox-reset2.png | Bin .../main/resources/icons/action-combobox-sort.png | Bin .../src/main/resources/icons/action-config.png | Bin .../resources/icons/action-connect_creating.png | Bin .../src/main/resources/icons/action-connect_no.png | Bin .../src/main/resources/icons/action-connect_ok.png | Bin .../resources/icons/action-connect_untested.png | Bin .../src/main/resources/icons/action-connected.png | Bin .../src/main/resources/icons/action-copyToBoth.png | Bin .../src/main/resources/icons/action-copyToLeft.png | Bin .../main/resources/icons/action-copyToRight.png | Bin .../main/resources/icons/action-data-calcule.png | Bin .../main/resources/icons/action-data-export.png | Bin .../main/resources/icons/action-data-import.png | Bin .../main/resources/icons/action-data-observe.png | Bin .../src/main/resources/icons/action-db-change.png | Bin .../src/main/resources/icons/action-db-local.png | Bin .../src/main/resources/icons/action-db-none.png | Bin .../src/main/resources/icons/action-db-reload.png | Bin .../src/main/resources/icons/action-db-remote.png | Bin .../src/main/resources/icons/action-db-server.png | Bin .../resources/icons/action-db-start-server.png | Bin .../main/resources/icons/action-db-stop-server.png | Bin .../src/main/resources/icons/action-delete.png | Bin .../main/resources/icons/action-deleteFromLeft.png | Bin .../resources/icons/action-deleteFromRight.png | Bin .../resources/icons/action-desactivateFromLeft.png | Bin .../icons/action-desactivateFromRight.png | Bin .../action-desactivateWithReplaceFromLeft.png | Bin .../action-desactivateWithReplaceFromRight.png | Bin .../resources/icons/action-edit-measurements.png | Bin .../src/main/resources/icons/action-exit.png | Bin .../src/main/resources/icons/action-expand.png | Bin .../main/resources/icons/action-fileChooser.png | Bin .../src/main/resources/icons/action-generate.png | Bin .../src/main/resources/icons/action-go-back.png | Bin .../src/main/resources/icons/action-go-detail.png | Bin .../src/main/resources/icons/action-go-down.png | Bin .../src/main/resources/icons/action-go-jump.png | Bin .../src/main/resources/icons/action-go-up.png | Bin .../src/main/resources/icons/action-help.png | Bin .../src/main/resources/icons/action-i18n-en.png | Bin .../src/main/resources/icons/action-i18n-es.png | Bin .../src/main/resources/icons/action-i18n-fr.png | Bin .../src/main/resources/icons/action-i18n-uk.png | Bin .../src/main/resources/icons/action-import-gps.png | Bin .../main/resources/icons/action-information.png | Bin .../main/resources/icons/action-insert-after.png | Bin .../main/resources/icons/action-insert-before.png | Bin .../main/resources/icons/action-local-export.png | Bin .../main/resources/icons/action-local-import.png | Bin .../main/resources/icons/action-mode-create.png | Bin .../src/main/resources/icons/action-mode-read.png | Bin .../main/resources/icons/action-mode-update.png | Bin .../resources/icons/action-move-activities.png | Bin .../main/resources/icons/action-move-routes.png | Bin .../src/main/resources/icons/action-move-trips.png | Bin .../src/main/resources/icons/action-next-step.png | Bin .../src/main/resources/icons/action-openLink.png | Bin .../main/resources/icons/action-previous-step.png | Bin .../main/resources/icons/action-remote-export.png | Bin .../main/resources/icons/action-remote-import.png | Bin .../src/main/resources/icons/action-reopen.png | Bin .../main/resources/icons/action-report-copy.png | Bin .../src/main/resources/icons/action-report-run.png | Bin .../src/main/resources/icons/action-report.png | Bin .../src/main/resources/icons/action-revert.png | Bin .../main/resources/icons/action-revertFromLeft.png | Bin .../resources/icons/action-revertFromRight.png | Bin .../src/main/resources/icons/action-save.png | Bin .../resources/icons/action-select-ssl-cert.png | Bin .../src/main/resources/icons/action-select.png | Bin .../src/main/resources/icons/action-show-help.png | Bin .../resources/icons/action-show-informations.png | Bin .../src/main/resources/icons/action-show-keys.png | Bin .../main/resources/icons/action-show-usages.png | Bin .../src/main/resources/icons/action-site.png | Bin .../main/resources/icons/action-skipFromLeft.png | Bin .../main/resources/icons/action-skipFromRight.png | Bin .../src/main/resources/icons/action-synch.png | Bin .../main/resources/icons/action-synchro-pause.png | Bin .../main/resources/icons/action-synchro-start.png | Bin .../main/resources/icons/action-synchro-stop.png | Bin .../src/main/resources/icons/action-synchroAdd.png | Bin .../main/resources/icons/action-synchroDelete.png | Bin .../main/resources/icons/action-synchroRevert.png | Bin .../main/resources/icons/action-synchroUpdate.png | Bin .../src/main/resources/icons/action-translate.png | Bin .../src/main/resources/icons/action-ui-reload.png | Bin .../main/resources/icons/action-unconnected.png | Bin .../src/main/resources/icons/action-unselect.png | Bin .../src/main/resources/icons/action-validate.png | Bin .../resources/icons/action-verify-equation.png | Bin .../src/main/resources/icons/logo OT_rvb.png | Bin .../src/main/resources/icons/logo-OT_web.png | Bin .../src/main/resources/icons/logo_ird.png | Bin .../main/resources/icons/navigation/activite.png | Bin .../src/main/resources/icons/navigation/bateau.png | Bin .../src/main/resources/icons/navigation/calee.png | Bin .../resources/icons/navigation/ird/activity16.png | Bin .../resources/icons/navigation/ird/activity24.png | Bin .../icons/navigation/ird/floatingObject16.png | Bin .../icons/navigation/ird/floatingObject24.png | Bin .../icons/navigation/ird/observedSystem16.png | Bin .../icons/navigation/ird/observedSystem24.png | Bin .../resources/icons/navigation/ird/program16.png | Bin .../resources/icons/navigation/ird/program24.png | Bin .../icons/navigation/ird/referentiel16.png | Bin .../icons/navigation/ird/referentiel24.png | Bin .../resources/icons/navigation/ird/route16.png | Bin .../resources/icons/navigation/ird/route24.png | Bin .../main/resources/icons/navigation/ird/set16.png | Bin .../main/resources/icons/navigation/ird/set24.png | Bin .../icons/navigation/ird/sub_floatingObject16.png | Bin .../icons/navigation/ird/sub_floatingObject24.png | Bin .../icons/navigation/ird/sub_referentiel16.png | Bin .../resources/icons/navigation/ird/sub_set16.png | Bin .../resources/icons/navigation/ird/sub_set24.png | Bin .../main/resources/icons/navigation/ird/trip16.png | Bin .../main/resources/icons/navigation/ird/trip24.png | Bin .../src/main/resources/icons/navigation/maree.png | Bin .../resources/icons/navigation/objetFlottant.png | Bin .../resources/icons/navigation/observateur.png | Bin .../src/main/resources/icons/navigation/ocean.png | Bin .../main/resources/icons/navigation/picto_a 24.png | Bin .../main/resources/icons/navigation/picto_b 16.png | Bin .../main/resources/icons/navigation/picto_b 24.png | Bin .../main/resources/icons/navigation/picto_c 16.png | Bin .../main/resources/icons/navigation/picto_c 24.png | Bin .../main/resources/icons/navigation/picto_d 16.png | Bin .../main/resources/icons/navigation/picto_d 24.png | Bin .../main/resources/icons/navigation/picto_e 24.png | Bin .../main/resources/icons/navigation/picto_f 16.png | Bin .../main/resources/icons/navigation/picto_f 24.png | Bin .../main/resources/icons/navigation/programme.png | Bin .../src/main/resources/icons/navigation/route.png | Bin .../src/main/resources/icons/navigation/senne.png | Bin .../resources/icons/navigation/systemeObserve.png | Bin .../src/main/resources/log4j.properties | 0 .../src/main/resources/observe-log4j.properties | 0 .../src/main/resources/observeSwing.conf | 0 .../src/main/resources/validators.xml | 0 .../src/main/ssl/cacert.jks | Bin .../src/main/ssl/server.crt | 0 .../src/main/ssl/server.key | 0 ...glineDetailCompositionValidatorServiceTest.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 16 ++-- .../src/jetty/jetty-context.xml | 0 .../src/license/THIRD-PARTY.properties | 0 .../web/ObserveWebApplicationContext.java | 0 .../ObserveWebApplicationContextInitException.java | 0 .../web/ObserveWebApplicationListener.java | 0 .../application/web/ObserveWebMainHandler.java | 0 .../application/web/ObserveWebMotionFilter.java | 0 .../application/web/ObserveWebMotionRender.java | 0 .../ObserveWebApplicationConfiguration.java | 0 ...veWebApplicationConfigurationInitException.java | 0 .../ObserveWebApplicationConfigurationOption.java | 0 ...ObserveWebApplicationConfigurationProvider.java | 0 .../db/InvalidObserveWebDatabaseException.java | 0 .../db/InvalidObserveWebDatabaseRoleException.java | 0 .../db/InvalidObserveWebDatabasesException.java | 0 .../web/configuration/db/ObserveWebDatabase.java | 0 .../configuration/db/ObserveWebDatabaseRole.java | 0 .../web/configuration/db/ObserveWebDatabases.java | 0 .../db/ObserveWebDatabasesHelper.java | 0 .../db/impl/ObserveWebDatabaseBean.java | 0 .../db/impl/ObserveWebDatabaseImmutable.java | 0 .../db/impl/ObserveWebDatabaseRoleBean.java | 0 .../db/impl/ObserveWebDatabaseRoleImmutable.java | 0 .../db/impl/ObserveWebDatabasesBean.java | 0 .../db/impl/ObserveWebDatabasesImmutable.java | 0 .../user/InvalidObserveWebUserException.java | 0 .../InvalidObserveWebUserPermissionException.java | 0 .../user/InvalidObserveWebUsersException.java | 0 .../web/configuration/user/ObserveWebUser.java | 0 .../user/ObserveWebUserPermission.java | 0 .../web/configuration/user/ObserveWebUsers.java | 0 .../configuration/user/ObserveWebUsersHelper.java | 0 .../user/impl/ObserveWebUserBean.java | 0 .../user/impl/ObserveWebUserImmutable.java | 0 .../user/impl/ObserveWebUserPermissionBean.java | 0 .../impl/ObserveWebUserPermissionImmutable.java | 0 .../user/impl/ObserveWebUsersBean.java | 0 .../user/impl/ObserveWebUsersImmutable.java | 0 .../web/controller/ObserveWebMotionController.java | 0 .../web/controller/v1/ConfigurationController.java | 0 .../controller/v1/DataSourceServiceController.java | 0 ...serveAuthenticatedServiceControllerSupport.java | 0 .../v1/ObserveServiceControllerSupport.java | 0 .../controller/v1/ObserveWebErrorController.java | 0 .../web/controller/v1/PingServiceController.java | 0 .../v1/ReferentialServiceController.java | 0 .../v1/SqlScriptProducerServiceController.java | 0 .../ConsolidateDataServiceController.java | 0 .../v1/actions/report/ReportServiceController.java | 0 ...eferentialSynchronizeDiffServiceController.java | 0 ...ferentialSynchronizeLocalServiceController.java | 0 .../ReferentialSynchronizeServiceController.java | 0 .../validate/ValidateServiceController.java | 0 ...ActivityLongLineEncounterServiceController.java | 0 ...ctivityLongLineSensorUsedServiceController.java | 0 .../ActivityLonglineServiceController.java | 0 .../v1/longline/BranchlineServiceController.java | 0 .../SetLonglineCatchServiceController.java | 0 ...LonglineDetailCompositionServiceController.java | 0 ...LonglineGlobalCompositionServiceController.java | 0 .../v1/longline/SetLonglineServiceController.java | 0 .../v1/longline/TdrServiceController.java | 0 .../TripLonglineGearUseServiceController.java | 0 .../v1/longline/TripLonglineServiceController.java | 0 ...tivitySeineObservedSystemServiceController.java | 0 .../v1/seine/ActivitySeineServiceController.java | 0 .../v1/seine/FloatingObjectServiceController.java | 0 .../v1/seine/NonTargetCatchServiceController.java | 0 .../v1/seine/NonTargetSampleServiceController.java | 0 .../ObjectObservedSpeciesServiceController.java | 0 .../ObjectSchoolEstimateServiceController.java | 0 .../v1/seine/RouteServiceController.java | 0 .../v1/seine/SchoolEstimateServiceController.java | 0 .../v1/seine/SetSeineServiceController.java | 0 .../v1/seine/TargetCatchServiceController.java | 0 .../v1/seine/TargetSampleServiceController.java | 0 ...TransmittingBuoyOperationServiceController.java | 0 .../seine/TripSeineGearUseServiceController.java | 0 .../v1/seine/TripSeineServiceController.java | 0 .../v1/trip/TripManagementServiceController.java | 0 .../web/converter/ObserveDtoConverter.java | 0 .../application/web/injector/DateInjector.java | 0 .../web/injector/ImmutableSetInjector.java | 0 .../web/injector/ObserveClassInjector.java | 0 .../ObserveDataSourceConfigurationInjector.java | 0 .../web/injector/ObserveDtoInjector.java | 0 .../ObserveReferenceSetRequestInjector.java | 0 .../injector/SqlScriptProducerRequestInjector.java | 0 .../web/request/ObserveWebRequestContext.java | 0 .../ObserveWebSecurityApplicationContext.java | 0 ...ObserveWebSecurityAuthenticationTokenCache.java | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/mapping | 0 .../src/main/resources/observeweb-log4j.conf | 0 .../src/main/resources/observeweb.conf | 0 .../src/main/resources/validators.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../db/ObserveWebDatabasesHelperTest.java | 0 .../user/ObserveWebUsersHelperTest.java | 0 .../src/test/resources/observeweb-test.conf | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 0 .../maven/plugins/checkapi/CheckApiMojo.java | 0 .../MismatchMethodParameterNameException.java | 0 .../plugins/checkapi/MissingClassException.java | 0 .../plugins/checkapi/MissingMethodException.java | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 4 +- .../src/license/THIRD-PARTY.properties | 0 .../migration/AbstractDataSourceMigration.java | 0 .../AbstractObserveMigrationCallBack.java | 0 .../entities/migration/H2DataSourceMigration.java | 0 ...ObserveMigrationCallBackForVersionResolver.java | 0 .../ObserveMigrationConfigurationProviderImpl.java | 0 .../entities/migration/PGDataSourceMigration.java | 0 .../DataSourceMigrationForVersion_3_1.java | 0 .../DataSourceMigrationForVersion_3_10.java | 0 .../DataSourceMigrationForVersion_3_11.java | 0 .../DataSourceMigrationForVersion_3_12.java | 0 .../DataSourceMigrationForVersion_3_14.java | 0 .../DataSourceMigrationForVersion_3_15.java | 0 .../DataSourceMigrationForVersion_3_16.java | 0 .../DataSourceMigrationForVersion_3_5.java | 0 .../DataSourceMigrationForVersion_3_7.java | 0 .../DataSourceMigrationForVersion_3_8.java | 0 .../DataSourceMigrationForVersion_3_9.java | 0 .../DataSourceMigrationForVersion_4_0.java | 0 .../DataSourceMigrationForVersion_4_0_1.java | 0 .../DataSourceMigrationForVersion_4_0_2.java | 0 .../DataSourceMigrationForVersion_4_0_4.java | 0 .../DataSourceMigrationForVersion_4_0_RC2.java | 0 .../DataSourceMigrationForVersion_4_0_RC3.java | 0 .../DataSourceMigrationForVersion_4_0_RC4.java | 0 .../DataSourceMigrationForVersion_4_0_RC6.java | 0 .../DataSourceMigrationForVersion_4_0_RC7.java | 0 .../DataSourceMigrationForVersion_4_900.java | 0 .../DataSourceMigrationForVersion_4_901.java | 0 .../DataSourceMigrationForVersion_4_902.java | 0 .../DataSourceMigrationForVersion_4_903.java | 0 .../DataSourceMigrationForVersion_4_904.java | 0 .../DataSourceMigrationForVersion_5_0.java | 0 ...migration.ObserveMigrationConfigurationProvider | 0 .../src/main/resources/db/3.5/constrainsts.csv | 0 .../resources/db/3.5/traduction_attributes.csv | 0 .../main/resources/db/3.5/traduction_tables.csv | 0 .../main/resources/db/3.5/traduction_tables2.csv | 0 .../db/migration/V3_10_01_remove-person-H2.sql | 0 .../db/migration/V3_10_01_remove-person-PG.sql | 0 .../db/migration/V3_10_02_add-missing-fk-H2.sql | 0 .../db/migration/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../migration/V3_10_05_normalize-sections-H2.sql | 0 .../migration/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../db/migration/V3_11_03_add-fpaZones-H2.sql | 0 .../db/migration/V3_11_03_add-fpaZones-PG.sql | 0 .../migration/V3_11_04_add-activity-ersId-H2.sql | 0 .../migration/V3_11_04_add-activity-ersId-PG.sql | 0 .../migration/V3_11_05_add-person-country-H2.sql | 0 .../migration/V3_11_05_add-person-country-PG.sql | 0 .../db/migration/V3_11_06_add-harbours-H2.sql | 0 .../db/migration/V3_11_06_add-harbours-PG.sql | 0 .../db/migration/V3_12_01_add-missing-boat-H2.sql | 0 .../db/migration/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../migration/V3_16_01_add-gear-referential-H2.sql | 0 .../migration/V3_16_01_add-gear-referential-PG.sql | 0 .../db/migration/V3_16_02_add-gear-data-H2.sql | 0 .../db/migration/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../db/migration/V3_5_01_migration-H2.sql | 0 .../db/migration/V3_5_01_migration-PG.sql | 0 .../migration/V3_5_02_add-longline-schema-H2.sql | 0 .../migration/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../db/migration/V3_7_01_rename-seine-model-H2.sql | 0 .../db/migration/V3_7_01_rename-seine-model-PG.sql | 0 .../migration/V3_7_02_remove-trip-organism-H2.sql | 0 .../migration/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../migration/V3_7_06_normalize-setlongline-H2.sql | 0 .../migration/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../db/migration/V3_7_08_normalize-tdr-H2.sql | 0 .../db/migration/V3_7_08_normalize-tdr-PG.sql | 0 .../db/migration/V3_7_09_add-species-list-H2.sql | 0 .../db/migration/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../db/migration/V3_8_01_fix-person-H2.sql | 0 .../db/migration/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../migration/V3_8_03_normalize-sensorused-H2.sql | 0 .../migration/V3_8_03_normalize-sensorused-PG.sql | 0 .../db/migration/V3_8_04_normalize-tdr-H2.sql | 0 .../db/migration/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../resources/db/migration/V4_0_01_empty-H2.sql | 0 .../resources/db/migration/V4_0_01_empty-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../migration/V4_900_01_remove_open_field-H2.sql | 0 .../migration/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../migration/V4_903_01_remove_unit_field-H2.sql | 0 .../migration/V4_903_01_remove_unit_field-PG.sql | 0 .../migration/V4_903_02_remove_gender_field-H2.sql | 0 .../migration/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...rveMigrationCallBackForVersionResolverTest.java | 0 .../src/test/resources/log4j.properties | 0 {observe-services-rest => entities}/LICENSE.txt | 0 .../README.md | 0 {observe-entities => entities}/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 0 .../fr/ird/observe/AbstractObserveTopiaDao.java | 0 .../observe/ObserveTopiaApplicationContext.java | 0 .../fr/ird/observe/ObserveTopiaConfiguration.java | 0 .../observe/ObserveTopiaConfigurationFactory.java | 0 .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 0 .../observe/ObserveTopiaPersistenceContext.java | 0 .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 0 .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 0 .../java/fr/ird/observe/entities/Activity.java | 0 .../java/fr/ird/observe/entities/Entities.java | 0 .../java/fr/ird/observe/entities/EntityMap.java | 0 .../main/java/fr/ird/observe/entities/GPSAble.java | 0 .../observe/entities/LastUpdateDateTopiaDao.java | 0 .../observe/entities/LengthWeightComputable.java | 0 .../java/fr/ird/observe/entities/ObserveSet.java | 0 .../main/java/fr/ird/observe/entities/Trip.java | 0 .../java/fr/ird/observe/entities/TripMapPoint.java | 0 .../main/java/fr/ird/observe/entities/Trips.java | 0 .../entities/constants/GearTypePersist.java | 0 .../entities/constants/ReferenceStatusPersist.java | 0 .../constants/TripMapPointTypePersist.java | 0 .../NonTargetCatchComputedValueSourcePersist.java | 0 .../entities/constants/seine/OwnershipPersist.java | 0 .../constants/seine/SchoolTypePersist.java | 0 .../TypeTransmittingBuoyOperationPersist.java | 0 .../ird/observe/entities/gps/CoordinateHelper.java | 0 .../entities/longline/ActivityLonglineImpl.java | 0 .../longline/ActivityLonglineTopiaDao.java | 0 .../entities/longline/ActivityLonglines.java | 0 .../observe/entities/longline/BasketTopiaDao.java | 0 .../fr/ird/observe/entities/longline/Baskets.java | 0 .../observe/entities/longline/BranchlineImpl.java | 0 .../entities/longline/BranchlineTopiaDao.java | 0 .../ird/observe/entities/longline/Branchlines.java | 0 .../longline/LonglineCompositionEntity.java | 0 .../entities/longline/LonglinePositionAware.java | 0 .../observe/entities/longline/SectionTemplate.java | 0 .../observe/entities/longline/SectionTopiaDao.java | 0 .../entities/longline/SectionWithTemplate.java | 0 .../entities/longline/SectionWithTemplateImpl.java | 0 .../entities/longline/SectionWithTemplates.java | 0 .../fr/ird/observe/entities/longline/Sections.java | 0 .../observe/entities/longline/SetLonglineImpl.java | 0 .../fr/ird/observe/entities/longline/TdrImpl.java | 0 .../ird/observe/entities/longline/TdrTopiaDao.java | 0 .../entities/longline/TripLonglineImpl.java | 0 .../entities/longline/TripLonglineTopiaDao.java | 0 .../observe/entities/longline/TripLonglines.java | 0 .../ObserveMigrationConfigurationProvider.java | 0 .../entities/migration/ObserveMigrationEngine.java | 0 .../DuplicateLengthWeightParameterException.java | 0 .../referentiel/GearCaracteristicTypes.java | 0 .../observe/entities/referentiel/HarbourImpl.java | 0 .../referentiel/I18nReferenceEntities.java | 0 .../referentiel/LengthWeightParameterImpl.java | 0 .../LengthWeightParameterNotFoundException.java | 0 .../referentiel/LengthWeightParameters.java | 0 .../referentiel/LengthWeightParemeterHelper.java | 0 .../referentiel/ObserveReferentialEntities.java | 0 .../referentiel/ObserveReferentialEntityImpl.java | 0 .../ird/observe/entities/referentiel/Persons.java | 0 .../observe/entities/referentiel/ProgramImpl.java | 0 .../entities/referentiel/ProgramTopiaDao.java | 0 .../ird/observe/entities/referentiel/Programs.java | 0 .../ird/observe/entities/referentiel/Species2.java | 0 .../observe/entities/referentiel/SpeciesImpl.java | 0 .../observe/entities/referentiel/VesselImpl.java | 0 .../ird/observe/entities/referentiel/Vessels.java | 0 .../observe/entities/seine/ActivitySeineImpl.java | 0 .../entities/seine/ActivitySeineTopiaDao.java | 0 .../ird/observe/entities/seine/ActivitySeines.java | 0 .../observe/entities/seine/FloatingObjectImpl.java | 0 .../entities/seine/FloatingObjectTopiaDao.java | 0 .../observe/entities/seine/NonTargetCatchImpl.java | 0 .../observe/entities/seine/NonTargetCatches.java | 0 .../entities/seine/NonTargetLengthImpl.java | 0 .../fr/ird/observe/entities/seine/RouteImpl.java | 0 .../ird/observe/entities/seine/RouteTopiaDao.java | 0 .../java/fr/ird/observe/entities/seine/Routes.java | 0 .../ird/observe/entities/seine/SetSeineImpl.java | 0 .../fr/ird/observe/entities/seine/SetSeines.java | 0 .../observe/entities/seine/TargetCatchImpl.java | 0 .../ird/observe/entities/seine/TargetCatchs.java | 0 .../observe/entities/seine/TargetLengthImpl.java | 0 .../ird/observe/entities/seine/TripSeineImpl.java | 0 .../observe/entities/seine/TripSeineTopiaDao.java | 0 .../fr/ird/observe/entities/seine/TripSeines.java | 0 .../src/main/xmi/observe-common.properties | 0 .../src/main/xmi/observe-common.zargo | Bin .../src/main/xmi/observe-longline.properties | 0 .../src/main/xmi/observe-longline.zargo | Bin .../src/main/xmi/observe-seine.properties | 0 .../src/main/xmi/observe-seine.zargo | Bin .../java/fr/ird/observe/RelationRegexTest.java | 0 .../src/test/java/fr/ird/observe/ScriptTest.java | 0 .../entities/longline/SectionTemplateTest.java | 0 .../LengthWeightParemeterHelperTest.java | 0 .../src/test/resources/log4j.properties | 0 pom.xml | 38 ++++---- .../LICENSE.txt | 0 .../README.md | 0 {observe-services-api => services-api}/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 0 .../src/main/filters/observe-reports.properties | 0 .../fr/ird/observe/services/ObserveService.java | 0 .../observe/services/ObserveServiceFactory.java | 0 .../services/ObserveServiceFactorySupport.java | 0 .../services/ObserveServiceInitializer.java | 0 .../observe/services/ObserveServicesProvider.java | 0 .../services/ObserveSpeciesListConfiguration.java | 0 .../observe/services/http/ObserveHttpError.java | 0 .../security/AdminApiKeyNotFoundException.java | 0 .../AuthenticationTokenNotFoundException.java | 0 .../BadObserveWebUserPasswordException.java | 0 .../security/InvalidAdminKeyApiException.java | 0 .../InvalidAuthenticationTokenException.java | 0 .../ObserveWebSecurityExceptionSupport.java | 0 .../SecurityRequestContextNotFoundException.java | 0 .../security/UnknownObserveWebUserException.java | 0 .../UnknownObserveWebUserForDatabaseException.java | 0 .../security/UserLoginNotFoundException.java | 0 .../security/UserPasswordNotFoundException.java | 0 .../service/AddSqlScriptProducerRequest.java | 0 .../service/AddSqlScriptProducerResult.java | 0 .../services/service/BabModelVersionException.java | 0 .../service/ConcurrentModificationException.java | 0 .../service/DataFileNotFoundException.java | 0 .../services/service/DataNotFoundException.java | 0 .../services/service/DataSourceService.java | 0 .../DatabaseConnexionNotAuthorizedException.java | 0 .../DatabaseDestroyNotAuthorizedException.java | 0 .../service/DatabaseNotFoundException.java | 0 .../service/DeleteSqlScriptProducerRequest.java | 0 .../services/service/ObserveBlobsContainer.java | 0 .../services/service/ObserveReferentialCache.java | 0 .../ird/observe/services/service/PingService.java | 0 .../services/service/ReferenceSetsRequest.java | 0 .../services/service/ReferentialService.java | 0 .../services/service/SqlScriptProducerService.java | 0 .../ConsolidateActivitySeineDataResult.java | 0 .../consolidate/ConsolidateDataService.java | 0 .../ConsolidateTripSeineDataRequest.java | 0 .../ConsolidateTripSeineDataResult.java | 0 .../service/actions/report/ReportBuilder.java | 0 .../service/actions/report/ReportService.java | 0 .../referential/ReferentialSynchronizeMode.java | 0 .../diff/ReferentialDataSourceState.java | 0 .../diff/ReferentialDataSourceStates.java | 0 .../diff/ReferentialSynchronizeDiff.java | 0 .../diff/ReferentialSynchronizeDiffService.java | 0 .../diff/ReferentialSynchronizeDiffState.java | 0 .../diff/ReferentialSynchronizeDiffStateType.java | 0 .../diff/ReferentialSynchronizeDiffs.java | 0 .../diff/ReferentialSynchronizeDiffsEngine.java | 0 ...ionalReferentialSynchronizeCallbackRequest.java | 0 ...onalReferentialSynchronizeCallbackRequests.java | 0 ...tionalReferentialSynchronizeCallbackResult.java | 0 ...ionalReferentialSynchronizeCallbackResults.java | 0 ...nidirectionalReferentialSynchronizeContext.java | 0 ...UnidirectionalReferentialSynchronizeEngine.java | 0 ...ectionalReferentialSynchronizeLocalService.java | 0 ...nidirectionalReferentialSynchronizeRequest.java | 0 ...UnidirectionalReferentialSynchronizeResult.java | 0 .../ng/ReferentialSynchronizeRequest.java | 0 .../ng/ReferentialSynchronizeService.java | 0 .../ng/ReferentialSynchronizeServiceEngine.java | 0 ...entialSynchronizeServiceProduceSqlsRequest.java | 0 ...rentialSynchronizeServiceProduceSqlsResult.java | 0 .../ng/ReferentialSynchronizeSqlsRequest.java | 0 .../ng/task/ReferentialSynchronizeTask.java | 0 .../ng/task/ReferentialSynchronizeTaskType.java | 0 .../actions/validate/ValidateDataRequest.java | 0 .../actions/validate/ValidateDataResult.java | 0 .../validate/ValidateReferentialsRequest.java | 0 .../validate/ValidateReferentialsResult.java | 0 .../actions/validate/ValidateResultForDto.java | 0 .../actions/validate/ValidateResultForDtoType.java | 0 .../actions/validate/ValidateResultForDtos.java | 0 .../service/actions/validate/ValidateService.java | 0 .../actions/validate/ValidateServiceUtils.java | 0 .../actions/validate/ValidationMessage.java | 0 .../service/actions/validate/ValidatorDto.java | 0 .../service/actions/validate/ValidatorDtos.java | 0 .../validate/ValidatorInitializationException.java | 0 .../longline/ActivityLongLineEncounterService.java | 0 .../ActivityLongLineSensorUsedService.java | 0 .../service/longline/ActivityLonglineService.java | 0 .../service/longline/BranchlineService.java | 0 .../service/longline/SetLonglineCatchService.java | 0 .../SetLonglineDetailCompositionService.java | 0 .../SetLonglineGlobalCompositionService.java | 0 .../service/longline/SetLonglineService.java | 0 .../services/service/longline/TdrService.java | 0 .../longline/TripLonglineGearUseService.java | 0 .../service/longline/TripLonglineService.java | 0 .../seine/ActivitySeineObservedSystemService.java | 0 .../service/seine/ActivitySeineService.java | 0 .../service/seine/FloatingObjectService.java | 0 .../service/seine/NonTargetCatchService.java | 0 .../service/seine/NonTargetSampleService.java | 0 .../seine/ObjectObservedSpeciesService.java | 0 .../service/seine/ObjectSchoolEstimateService.java | 0 .../services/service/seine/RouteService.java | 0 .../service/seine/SchoolEstimateService.java | 0 .../services/service/seine/SetSeineService.java | 0 .../services/service/seine/TargetCatchService.java | 0 .../service/seine/TargetSampleService.java | 0 .../seine/TransmittingBuoyOperationService.java | 0 .../service/seine/TripSeineGearUseService.java | 0 .../services/service/seine/TripSeineService.java | 0 .../services/service/trip/DeleteTripRequest.java | 0 .../services/service/trip/DeleteTripResult.java | 0 .../services/service/trip/ExportTripRequest.java | 0 .../services/service/trip/ExportTripResult.java | 0 .../services/service/trip/ImportTripRequest.java | 0 .../services/service/trip/ImportTripResult.java | 0 .../service/trip/TripManagementService.java | 0 .../fr/ird/observe/services/spi/DeleteRequest.java | 0 .../fr/ird/observe/services/spi/NoDataAccess.java | 0 .../fr/ird/observe/services/spi/PostRequest.java | 0 .../observe/services/spi/ReadDataPermission.java | 0 .../services/spi/ReadReferentialPermission.java | 0 .../java/fr/ird/observe/services/spi/Write.java | 0 .../observe/services/spi/WriteDataPermission.java | 0 .../services/spi/WriteReferentialPermission.java | 0 ...es.service.actions.report.model.ReportOperation | 0 .../service/actions/validate/validators.json | 0 .../service/actions/report/ReportBuilderTest.java | 0 .../actions/report/observe-reports-test.properties | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 2 +- .../ObserveDataSourceConfiguration.java | 0 ...bserveDataSourceConfigurationAndConnection.java | 0 .../configuration/ObserveDataSourceConnection.java | 0 .../ObserveDataSourceConnectionSupport.java | 0 .../ObserveDataSourceInformation.java | 0 .../configuration/ObserveDataSourceType.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 4 +- .../ObserveDataSourceConfigurationRest.java | 0 ...bserveDataSourceConfigurationRestConstants.java | 0 .../ObserveDataSourceConnectionRest.java | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 4 +- .../ObserveDataSourceConfigurationTopiaH2.java | 0 .../ObserveDataSourceConfigurationTopiaPG.java | 0 ...ObserveDataSourceConfigurationTopiaSupport.java | 0 .../ObserveDataSourceConnectionTopia.java | 0 .../LICENSE.txt | 0 .../README.md | 0 {observe-services-model => services-model}/pom.xml | 4 +- .../src/license/THIRD-PARTY.properties | 0 .../observe/services/dto/AbstractObserveDto.java | 0 .../observe/services/dto/AbstractReference.java | 0 .../observe/services/dto/AbstractReferenceSet.java | 0 .../fr/ird/observe/services/dto/DataReference.java | 0 .../ird/observe/services/dto/DataReferenceSet.java | 0 .../dto/DataSourceCreateConfigurationDto.java | 0 ...urceCreateWithNoReferentialImportException.java | 0 .../java/fr/ird/observe/services/dto/Form.java | 0 .../java/fr/ird/observe/services/dto/IdDto.java | 0 .../java/fr/ird/observe/services/dto/IdDtos.java | 0 ...ibleDataSourceCreateConfigurationException.java | 0 .../observe/services/dto/ObserveDbUserDtos.java | 0 .../fr/ird/observe/services/dto/ObserveDto.java | 0 .../fr/ird/observe/services/dto/ReferenceMap.java | 0 .../dto/ReferenceValueNotFoundException.java | 0 .../services/dto/UnauthorizedException.java | 0 .../services/dto/actions/report/DataMatrix.java | 0 .../services/dto/actions/report/Report.java | 0 .../dto/actions/report/ReportOperation.java | 0 .../services/dto/actions/report/ReportRequest.java | 0 .../dto/actions/report/ReportVariable.java | 0 .../observe/services/dto/constants/GearType.java | 0 .../services/dto/constants/ObserveDbRole.java | 0 .../services/dto/constants/ReferenceStatus.java | 0 .../services/dto/constants/ReferentialLocale.java | 0 .../services/dto/constants/TripMapPointType.java | 0 .../seine/NonTargetCatchComputedValueSource.java | 0 .../services/dto/constants/seine/Ownership.java | 0 .../services/dto/constants/seine/SchoolType.java | 0 .../seine/TypeTransmittingBuoyOperation.java | 0 .../ird/observe/services/dto/gson/BlobAdapter.java | 0 .../observe/services/dto/gson/ClassAdapter.java | 0 .../ird/observe/services/dto/gson/DateAdapter.java | 0 .../ird/observe/services/dto/gson/FormAdapter.java | 0 .../services/dto/gson/ImmutableListAdapter.java | 0 .../services/dto/gson/ImmutableMapAdapter.java | 0 .../dto/gson/ImmutableMultimapAdapter.java | 0 .../services/dto/gson/ImmutableSetAdapter.java | 0 .../observe/services/dto/gson/IntegerAdapter.java | 0 .../services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../dto/gson/ReferentialMultimapAdapter.java | 0 .../services/dto/gson/ReportVariableAdapter.java | 0 .../observe/services/dto/gson/VersionAdapter.java | 0 .../gson/reference/AbstractReferenceAdapter.java | 0 .../reference/AbstractReferenceSetAdapter.java | 0 .../dto/gson/reference/DataReferenceAdapter.java | 0 .../gson/reference/DataReferenceSetAdapter.java | 0 .../reference/ReferentialReferenceAdapter.java | 0 .../reference/ReferentialReferenceSetAdapter.java | 0 .../gson/reference/UnknownReferenceAdapter.java | 0 .../services/dto/longline/ActivityLonglineDto.java | 0 .../dto/longline/BasketWithSectionIdDto.java | 0 .../dto/longline/BranchlineWithBasketIdDto.java | 0 .../GearUseFeaturesMeasurementLonglineDto.java | 0 .../dto/longline/LonglineCompositionDto.java | 0 .../dto/longline/LonglinePositionAwareDto.java | 0 .../dto/longline/LonglinePositionSetDto.java | 0 .../services/dto/longline/SectionTemplate.java | 0 .../services/dto/longline/SectionWithTemplate.java | 0 .../dto/longline/SectionWithTemplates.java | 0 .../longline/SetLonglineGlobalCompositionDto.java | 0 .../dto/reference/DataReferenceSetDefinitions.java | 0 .../dto/reference/ReferenceBinderEngine.java | 0 .../reference/ReferenceBinderEngineSupplier.java | 0 .../dto/reference/ReferenceSetDefinition.java | 0 .../ReferentialReferenceSetDefinitions.java | 0 .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 0 .../request/ReferenceSetRequestKeyDefinition.java | 0 .../dto/referential/GearCaracteristicTypeDtos.java | 0 .../dto/referential/I18nReferentialDto.java | 0 .../dto/referential/I18nReferentialDtos.java | 0 .../services/dto/referential/PersonDtos.java | 0 .../services/dto/referential/ProgramDto.java | 0 .../services/dto/referential/ProgramDtos.java | 0 .../services/dto/referential/ReferentialDto.java | 0 .../services/dto/referential/ReferentialDtos.java | 0 .../dto/referential/ReferentialMultimap.java | 0 .../dto/referential/ReferentialReference.java | 0 .../dto/referential/ReferentialReferenceSet.java | 0 .../dto/referential/ReferentialReferences.java | 0 .../services/dto/referential/SpeciesListDto.java | 0 .../services/dto/referential/VesselDtos.java | 0 .../longline/VesselActivityLonglineDtos.java | 0 .../referential/seine/VesselActivitySeineDtos.java | 0 .../dto/referential/seine/WeightCategoryDtos.java | 0 .../observe/services/dto/result/SaveResultDto.java | 0 .../services/dto/result/SaveResultDtos.java | 0 .../dto/result/TripChildSaveResultDtos.java | 0 .../services/dto/seine/ActivitySeineDto.java | 0 .../services/dto/seine/ActivitySeineStubDto.java | 0 .../seine/FloatingObjectTransmittingBuoyDto.java | 0 .../seine/GearUseFeaturesMeasurementSeineDto.java | 0 .../ird/observe/services/dto/seine/RouteDto.java | 0 .../observe/services/dto/seine/SetSeineDto.java | 0 .../services/dto/seine/TargetCatchDtos.java | 0 .../services/dto/seine/TargetLengthDto.java | 0 .../observe/services/dto/seine/TripSeineDto.java | 0 .../main/java/fr/ird/observe/util/GPSPoint.java | 0 .../xmi/observe-services-dto-common.properties | 0 .../src/main/xmi/observe-services-dto-common.zargo | Bin .../xmi/observe-services-dto-longline.properties | 0 .../main/xmi/observe-services-dto-longline.zargo | Bin .../main/xmi/observe-services-dto-seine.properties | 0 .../src/main/xmi/observe-services-dto-seine.zargo | Bin {observe-entities => services-rest}/LICENSE.txt | 0 .../README.md | 0 {observe-services-rest => services-rest}/pom.xml | 12 +-- .../src/license/THIRD-PARTY.properties | 0 .../ObserveDataSourceConnectionAdapter.java | 0 .../observe/services/ObserveHttpErrorAdapter.java | 0 .../services/ObserveServiceFactoryRest.java | 0 .../services/ObserveServiceRestErrorException.java | 0 .../ObserveServiceRestNotAvailableException.java | 0 .../ird/observe/services/http/ObserveRequest.java | 0 .../services/http/ObserveRequestBuilder.java | 0 .../services/http/ObserveRequestMethod.java | 0 .../ird/observe/services/http/ObserveResponse.java | 0 .../services/http/ObserveResponseBuilder.java | 0 .../fr.ird.observe.services.ObserveServiceFactory | 0 .../fr/ird/observe/services/TestClassResource.java | 0 .../ird/observe/services/TestMethodResource.java | 0 .../services/service/AbstractServiceRestTest.java | 0 .../service/DataSourceServiceRestTest.java | 0 .../services/service/PingServiceRestTest.java | 0 .../service/ReferenceValuesSetServiceRestTest.java | 0 .../service/ReferentialServiceRestTest.java | 0 .../ConsolidateDataServiceRestTest.java | 0 .../report/AbstractReportServiceRestTest.java | 0 .../report/ReportAccessoryCatchRestTest.java | 0 .../actions/validate/ValidateServiceRestTest.java | 0 .../seine/TripSeineGearUseServiceRestTest.java | 0 .../service/seine/TripSeineServiceRestTest.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 14 +-- .../src/license/THIRD-PARTY.properties | 0 .../ObserveDataSourceConfigurationMainFactory.java | 0 .../services/ObserveServiceMainFactory.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 8 +- .../src/license/THIRD-PARTY.properties | 0 .../validators/AbstractSpeciesFieldValidator.java | 0 .../ActivityFinDeVeilleExistsValidator.java | 0 .../validators/ActivitySimpleSpeedValidator.java | 0 .../validators/ActivitySpeedValidator.java | 0 .../validators/CollectionUniqueKeyValidator2.java | 0 .../ObserveCollectionUniqueKeyValidator.java | 0 .../SetLonglineUniqueHomeIdValidator.java | 0 .../SetLonglineUniqueNumberValidator.java | 0 .../validators/SpeciesLengthFieldValidator.java | 0 .../validators/SpeciesWeightFieldValidator.java | 0 ...Longline-service-encounter-error-validation.xml | 0 .../ActivityLongline-service-error-validation.xml | 0 ...ongline-service-sensorUsed-error-validation.xml | 0 ...ActivityLongline-service-warning-validation.xml | 0 .../BaitsComposition-service-error-validation.xml | 0 .../Basket-service-table-error-validation.xml | 0 ...line-service-catchLongline-error-validation.xml | 0 .../Branchline-service-error-validation.xml | 0 .../Branchline-service-table-error-validation.xml | 0 .../Branchline-service-warning-validation.xml | 0 ...chlinesComposition-service-error-validation.xml | 0 .../CatchLongline-service-error-validation.xml | 0 .../CatchLongline-service-warning-validation.xml | 0 .../Encounter-service-error-validation.xml | 0 .../Encounter-service-warning-validation.xml | 0 ...atlinesComposition-service-error-validation.xml | 0 ...seFeaturesLongline-service-error-validation.xml | 0 .../HooksComposition-service-error-validation.xml | 0 .../Section-service-table-error-validation.xml | 0 .../SensorUsed-service-error-validation.xml | 0 .../SensorUsed-service-warning-validation.xml | 0 ...e-service-baitsComposition-error-validation.xml | 0 ...ice-branchlinesComposition-error-validation.xml | 0 .../SetLongline-service-error-validation.xml | 0 ...vice-floatlinesComposition-error-validation.xml | 0 ...-service-globalComposition-error-validation.xml | 0 ...e-service-hooksComposition-error-validation.xml | 0 .../SetLongline-service-warning-validation.xml | 0 .../longline/Tdr-service-error-validation.xml | 0 .../longline/Tdr-service-warning-validation.xml | 0 .../TripLongline-service-error-validation.xml | 0 .../TripLongline-service-warning-validation.xml | 0 .../Country-service-error-validation.xml | 0 .../Country-service-warning-validation.xml | 0 .../FpaZone-service-error-validation.xml | 0 .../FpaZone-service-warning-validation.xml | 0 .../referentiel/Gear-service-error-validation.xml | 0 .../Gear-service-warning-validation.xml | 0 .../GearCaracteristic-service-error-validation.xml | 0 ...earCaracteristic-service-warning-validation.xml | 0 ...rCaracteristicType-service-error-validation.xml | 0 ...aracteristicType-service-warning-validation.xml | 0 .../Harbour-service-error-validation.xml | 0 .../Harbour-service-warning-validation.xml | 0 ...gthWeightParameter-service-error-validation.xml | 0 ...hWeightParameter-service-warning-validation.xml | 0 .../referentiel/Ocean-service-error-validation.xml | 0 .../Ocean-service-warning-validation.xml | 0 .../Organism-service-error-validation.xml | 0 .../Organism-service-warning-validation.xml | 0 .../Person-service-error-validation.xml | 0 .../Person-service-warning-validation.xml | 0 .../Program-service-error-validation.xml | 0 .../Program-service-warning-validation.xml | 0 .../referentiel/Sex-service-error-validation.xml | 0 .../referentiel/Sex-service-warning-validation.xml | 0 .../Species-service-error-validation.xml | 0 .../Species-service-warning-validation.xml | 0 .../SpeciesGroup-service-error-validation.xml | 0 .../SpeciesGroup-service-warning-validation.xml | 0 .../SpeciesList-service-error-validation.xml | 0 .../SpeciesList-service-warning-validation.xml | 0 .../Vessel-service-error-validation.xml | 0 .../Vessel-service-warning-validation.xml | 0 ...VesselSizeCategory-service-error-validation.xml | 0 ...sselSizeCategory-service-warning-validation.xml | 0 .../VesselType-service-error-validation.xml | 0 .../VesselType-service-warning-validation.xml | 0 .../BaitHaulingStatus-service-error-validation.xml | 0 ...aitHaulingStatus-service-warning-validation.xml | 0 .../BaitSettingStatus-service-error-validation.xml | 0 ...aitSettingStatus-service-warning-validation.xml | 0 .../longline/BaitType-service-error-validation.xml | 0 .../BaitType-service-warning-validation.xml | 0 .../CatchFateLongline-service-error-validation.xml | 0 ...atchFateLongline-service-warning-validation.xml | 0 .../EncounterType-service-error-validation.xml | 0 .../EncounterType-service-warning-validation.xml | 0 .../Healthness-service-error-validation.xml | 0 .../Healthness-service-warning-validation.xml | 0 .../HookPosition-service-error-validation.xml | 0 .../HookPosition-service-warning-validation.xml | 0 .../longline/HookSize-service-error-validation.xml | 0 .../HookSize-service-warning-validation.xml | 0 .../longline/HookType-service-error-validation.xml | 0 .../HookType-service-warning-validation.xml | 0 ...HorizontalPosition-service-error-validation.xml | 0 ...rizontalPosition-service-warning-validation.xml | 0 ...emVerticalPosition-service-error-validation.xml | 0 ...VerticalPosition-service-warning-validation.xml | 0 .../LightsticksColor-service-error-validation.xml | 0 ...LightsticksColor-service-warning-validation.xml | 0 .../LightsticksType-service-error-validation.xml | 0 .../LightsticksType-service-warning-validation.xml | 0 .../longline/LineType-service-error-validation.xml | 0 .../LineType-service-warning-validation.xml | 0 .../MaturityStatus-service-error-validation.xml | 0 .../MaturityStatus-service-warning-validation.xml | 0 .../MitigationType-service-error-validation.xml | 0 .../MitigationType-service-warning-validation.xml | 0 .../SensorBrand-service-error-validation.xml | 0 .../SensorBrand-service-warning-validation.xml | 0 .../SensorDataFormat-service-error-validation.xml | 0 ...SensorDataFormat-service-warning-validation.xml | 0 .../SensorType-service-error-validation.xml | 0 .../SensorType-service-warning-validation.xml | 0 .../SettingShape-service-error-validation.xml | 0 .../SettingShape-service-warning-validation.xml | 0 .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../StomacFullness-service-error-validation.xml | 0 .../StomacFullness-service-warning-validation.xml | 0 .../longline/TripType-service-error-validation.xml | 0 .../TripType-service-warning-validation.xml | 0 ...elActivityLongline-service-error-validation.xml | 0 ...ActivityLongline-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../DetectionMode-service-error-validation.xml | 0 .../DetectionMode-service-warning-validation.xml | 0 .../seine/ObjectFate-service-error-validation.xml | 0 .../ObjectFate-service-warning-validation.xml | 0 .../ObjectOperation-service-error-validation.xml | 0 .../ObjectOperation-service-warning-validation.xml | 0 .../seine/ObjectType-service-error-validation.xml | 0 .../ObjectType-service-warning-validation.xml | 0 .../ObservedSystem-service-error-validation.xml | 0 .../ObservedSystem-service-warning-validation.xml | 0 .../ReasonForDiscard-service-error-validation.xml | 0 ...ReasonForDiscard-service-warning-validation.xml | 0 ...ReasonForNoFishing-service-error-validation.xml | 0 ...asonForNoFishing-service-warning-validation.xml | 0 .../ReasonForNullSet-service-error-validation.xml | 0 ...ReasonForNullSet-service-warning-validation.xml | 0 .../seine/SpeciesFate-service-error-validation.xml | 0 .../SpeciesFate-service-warning-validation.xml | 0 .../SpeciesStatus-service-error-validation.xml | 0 .../SpeciesStatus-service-warning-validation.xml | 0 ...urroundingActivity-service-error-validation.xml | 0 ...roundingActivity-service-warning-validation.xml | 0 ...ttingBuoyOperation-service-error-validation.xml | 0 ...ingBuoyOperation-service-warning-validation.xml | 0 ...ansmittingBuoyType-service-error-validation.xml | 0 ...smittingBuoyType-service-warning-validation.xml | 0 ...esselActivitySeine-service-error-validation.xml | 0 ...selActivitySeine-service-warning-validation.xml | 0 .../WeightCategory-service-error-validation.xml | 0 .../WeightCategory-service-warning-validation.xml | 0 .../seine/Wind-service-error-validation.xml | 0 .../seine/Wind-service-warning-validation.xml | 0 .../ActivitySeine-service-error-validation.xml | 0 ...ine-service-observedSystem-error-validation.xml | 0 ...e-service-observedSystem-warning-validation.xml | 0 .../ActivitySeine-service-warning-validation.xml | 0 .../FloatingObject-service-error-validation.xml | 0 ...rvice-objectSchoolEstimate-error-validation.xml | 0 ...-transmittingBuoyOperation-error-validation.xml | 0 .../FloatingObject-service-warning-validation.xml | 0 ...arUseFeaturesSeine-service-error-validation.xml | 0 .../NonTargetCatch-service-error-validation.xml | 0 .../NonTargetCatch-service-warning-validation.xml | 0 .../NonTargetLength-service-error-validation.xml | 0 .../NonTargetLength-service-warning-validation.xml | 0 .../NonTargetSample-service-error-validation.xml | 0 ...ectObservedSpecies-service-error-validation.xml | 0 ...jectSchoolEstimate-service-error-validation.xml | 0 ...ctSchoolEstimate-service-warning-validation.xml | 0 .../seine/Route-service-error-validation.xml | 0 .../seine/Route-service-warning-validation.xml | 0 .../SchoolEstimate-service-error-validation.xml | 0 .../seine/SetSeine-service-error-validation.xml | 0 ...ine-service-nonTargetCatch-error-validation.xml | 0 ...ine-service-schoolEstimate-error-validation.xml | 0 ...tSeine-service-targetCatch-error-validation.xml | 0 ...ne-service-targetDiscarded-error-validation.xml | 0 .../seine/SetSeine-service-warning-validation.xml | 0 ...tCatch-service-targetCatch-error-validation.xml | 0 ...atch-service-targetCatch-warning-validation.xml | 0 ...ch-service-targetDiscarded-error-validation.xml | 0 ...-service-targetDiscarded-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 0 .../TargetLength-service-warning-validation.xml | 0 .../TargetSample-service-error-validation.xml | 0 .../TransmittingBuoy-service-error-validation.xml | 0 ...TransmittingBuoy-service-warning-validation.xml | 0 .../seine/TripSeine-service-error-validation.xml | 0 ...-service-gearUseFeatures-warning-validation.xml | 0 .../seine/TripSeine-service-warning-validation.xml | 0 .../services-topia-validation_en_GB.properties | 0 .../services-topia-validation_es_ES.properties | 0 .../services-topia-validation_fr_FR.properties | 0 .../validation/BeanValidatorDetectorTest.java | 0 .../ActivitySeineSpeedValidatorTest.java | 0 .../seine/Route-testSpeed-error-validation.xml | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/validators.xml | 0 .../LICENSE.txt | 0 .../README.md | 0 {observe-services-topia => services-topia}/pom.xml | 20 ++-- .../src/license/THIRD-PARTY.properties | 0 .../fr/ird/observe/services/ObserveJdbcHelper.java | 0 .../observe/services/ObserveSecurityHelper.java | 0 .../services/ObserveServiceContextTopia.java | 0 .../services/ObserveServiceFactoryTopia.java | 0 .../ird/observe/services/ObserveServiceTopia.java | 0 .../ObserveTopiaApplicationContextFactory.java | 0 .../ird/observe/services/binder/BinderEngine.java | 0 .../services/binder/BinderEngineInitializer.java | 0 .../ird/observe/services/binder/BinderSupport.java | 0 .../binder/ReferenceBinderEngineSupplierTopia.java | 0 .../binder/data/ActivityLonglineBinder.java | 0 .../data/ActivityLonglineEncouterDtoBinder.java | 0 .../data/ActivityLonglineSensorUsedDtoBinder.java | 0 .../binder/data/ActivityLonglineStubDtoBinder.java | 0 .../services/binder/data/ActivitySeineBinder.java | 0 .../data/ActivitySeineObservedSystemDtoBinder.java | 0 .../binder/data/ActivitySeineStubDtoBinder.java | 0 .../binder/data/BaitsCompositionBinder.java | 0 .../observe/services/binder/data/BasketBinder.java | 0 .../services/binder/data/BranchlineBinder.java | 0 .../binder/data/BranchlinesCompositionBinder.java | 0 .../services/binder/data/CatchLonglineBinder.java | 0 .../services/binder/data/DataBinderSupport.java | 0 .../services/binder/data/EncounterBinder.java | 0 .../services/binder/data/FloatingObjectBinder.java | 0 .../FloatingObjectObservedSpeciesDtoBinder.java | 0 .../FloatingObjectSchoolEstimateDtoBinder.java | 0 .../FloatingObjectTransmittingBuoyDtoBinder.java | 0 .../binder/data/FloatlinesCompositionBinder.java | 0 .../binder/data/GearUseFeaturesLonglineBinder.java | 0 .../GearUseFeaturesMeasurementLonglineBinder.java | 0 .../GearUseFeaturesMeasurementSeineBinder.java | 0 .../binder/data/GearUseFeaturesSeineBinder.java | 0 .../binder/data/HooksCompositionBinder.java | 0 .../services/binder/data/NonTargetCatchBinder.java | 0 .../binder/data/NonTargetLengthBinder.java | 0 .../binder/data/NonTargetSampleBinder.java | 0 .../binder/data/ObjectObservedSpeciesBinder.java | 0 .../binder/data/ObjectSchoolEstimateBinder.java | 0 .../observe/services/binder/data/RouteBinder.java | 0 .../services/binder/data/RouteStubDtoBinder.java | 0 .../services/binder/data/SchoolEstimateBinder.java | 0 .../services/binder/data/SectionBinder.java | 0 .../services/binder/data/SensorUsedBinder.java | 0 .../services/binder/data/SetLonglineBinder.java | 0 .../binder/data/SetLonglineCatchDtoBinder.java | 0 .../SetLonglineDetailCompositionDtoBinder.java | 0 .../SetLonglineGlobalCompositionDtoBinder.java | 0 .../binder/data/SetLonglineStubDtoBinder.java | 0 .../binder/data/SetLonglineTdrDtoBinder.java | 0 .../services/binder/data/SetSeineBinder.java | 0 .../data/SetSeineNonTargetCatchDtoBinder.java | 0 .../data/SetSeineSchoolEstimateDtoBinder.java | 0 .../binder/data/SetSeineTargetCatchDtoBinder.java | 0 .../services/binder/data/SizeMeasureBinder.java | 0 .../services/binder/data/TargetCatchBinder.java | 0 .../services/binder/data/TargetLengthBinder.java | 0 .../services/binder/data/TargetSampleBinder.java | 0 .../observe/services/binder/data/TdrBinder.java | 0 .../binder/data/TransmittingBuoyBinder.java | 0 .../binder/data/TripLonglineActivityDtoBinder.java | 0 .../services/binder/data/TripLonglineBinder.java | 0 .../binder/data/TripLonglineGearUseDtoBinder.java | 0 .../services/binder/data/TripSeineBinder.java | 0 .../binder/data/TripSeineGearUseDtoBinder.java | 0 .../services/binder/data/WeightMeasureBinder.java | 0 .../referential/BaitHaulingStatusBinder.java | 0 .../referential/BaitSettingStatusBinder.java | 0 .../binder/referential/BaitTypeBinder.java | 0 .../referential/CatchFateLonglineBinder.java | 0 .../services/binder/referential/CountryBinder.java | 0 .../binder/referential/DetectionModeBinder.java | 0 .../binder/referential/EncounterTypeBinder.java | 0 .../services/binder/referential/FpaZoneBinder.java | 0 .../services/binder/referential/GearBinder.java | 0 .../referential/GearCaracteristicBinder.java | 0 .../referential/GearCaracteristicTypeBinder.java | 0 .../services/binder/referential/HarbourBinder.java | 0 .../binder/referential/HealthnessBinder.java | 0 .../binder/referential/HookPositionBinder.java | 0 .../binder/referential/HookSizeBinder.java | 0 .../binder/referential/HookTypeBinder.java | 0 .../referential/ItemHorizontalPositionBinder.java | 0 .../referential/ItemVerticalPositionBinder.java | 0 .../referential/LengthWeightParameterBinder.java | 0 .../binder/referential/LightsticksColorBinder.java | 0 .../binder/referential/LightsticksTypeBinder.java | 0 .../binder/referential/LineTypeBinder.java | 0 .../binder/referential/MaturityStatusBinder.java | 0 .../binder/referential/MitigationTypeBinder.java | 0 .../binder/referential/ObjectFateBinder.java | 0 .../binder/referential/ObjectOperationBinder.java | 0 .../binder/referential/ObjectTypeBinder.java | 0 .../binder/referential/ObservedSystemBinder.java | 0 .../services/binder/referential/OceanBinder.java | 0 .../binder/referential/OrganismBinder.java | 0 .../services/binder/referential/PersonBinder.java | 0 .../services/binder/referential/ProgramBinder.java | 0 .../binder/referential/ReasonForDiscardBinder.java | 0 .../referential/ReasonForNoFishingBinder.java | 0 .../binder/referential/ReasonForNullSetBinder.java | 0 .../referential/ReferentialBinderSupport.java | 0 .../binder/referential/SensorBrandBinder.java | 0 .../binder/referential/SensorDataFormatBinder.java | 0 .../binder/referential/SensorTypeBinder.java | 0 .../binder/referential/SettingShapeBinder.java | 0 .../services/binder/referential/SexBinder.java | 0 .../binder/referential/SizeMeasureTypeBinder.java | 0 .../services/binder/referential/SpeciesBinder.java | 0 .../binder/referential/SpeciesFateBinder.java | 0 .../binder/referential/SpeciesGroupBinder.java | 0 .../binder/referential/SpeciesListBinder.java | 0 .../binder/referential/SpeciesStatusBinder.java | 0 .../binder/referential/StomacFullnessBinder.java | 0 .../referential/SurroundingActivityBinder.java | 0 .../TransmittingBuoyOperationBinder.java | 0 .../referential/TransmittingBuoyTypeBinder.java | 0 .../binder/referential/TripTypeBinder.java | 0 .../referential/VesselActivityLonglineBinder.java | 0 .../referential/VesselActivitySeineBinder.java | 0 .../services/binder/referential/VesselBinder.java | 0 .../referential/VesselSizeCategoryBinder.java | 0 .../binder/referential/VesselTypeBinder.java | 0 .../binder/referential/WeightCategoryBinder.java | 0 .../referential/WeightMeasureTypeBinder.java | 0 .../services/binder/referential/WindBinder.java | 0 .../services/entity/BasketEntitiesExtractor.java | 0 .../entity/BranchlineEntitiesExtractor.java | 0 .../observe/services/entity/EntitiesExtractor.java | 0 .../services/entity/EntitiesSetFactory.java | 0 .../services/entity/SectionEntitiesExtractor.java | 0 .../entity/SpeciesListEntitiesExtractor.java | 0 .../entity/SpeciesListOceanEntitiesExtractor.java | 0 .../observe/services/entity/TripMapDtoFactory.java | 0 .../services/service/DataSourceServiceTopia.java | 0 .../services/service/ReferentialServiceTopia.java | 0 .../service/SqlScriptProducerServiceTopia.java | 0 .../ConsolidateActivitySeineDataResultBuilder.java | 0 .../consolidate/ConsolidateDataServiceTopia.java | 0 .../service/actions/report/ReportServiceTopia.java | 0 .../ReferentialSynchronizeDiffServiceTopia.java | 0 ...nalReferentialSynchronizeLocalServiceTopia.java | 0 .../ng/ReferentialSynchronizeServiceTopia.java | 0 .../ReferentialSynchronizeSqlsRequestBuilder.java | 0 .../referential/sql/ApplySqlRequestWork.java | 0 .../sql/DeleteSqlStatementGenerator.java | 0 .../sql/DesactivateSqlStatementGenerator.java | 0 .../sql/InsertSqlStatementGenerator.java | 0 .../InsertSqlWithCascadeStatementGenerator.java | 0 .../sql/ReplaceSqlStatementGenerator.java | 0 .../sql/UpdateSqlStatementGenerator.java | 0 .../UpdateSqlWithCascadeStatementGenerator.java | 0 .../GenerateValidatorDescriptorsFileTool.java | 0 .../service/actions/validate/ObserveValidator.java | 0 .../actions/validate/ValidateServiceTopia.java | 0 .../actions/validate/ValidationDataContext.java | 0 .../validate/ValidationMessageDetector.java | 0 .../service/actions/validate/ValidatorsMap.java | 0 .../ActivityLongLineEncounterServiceTopia.java | 0 .../ActivityLongLineSensorUsedServiceTopia.java | 0 .../longline/ActivityLonglineServiceTopia.java | 0 .../service/longline/BranchlineServiceTopia.java | 0 .../longline/LonglinePositionSetDtoHelper.java | 0 .../longline/SetLonglineCatchServiceTopia.java | 0 .../SetLonglineDetailCompositionServiceTopia.java | 0 .../SetLonglineGlobalCompositionServiceTopia.java | 0 .../service/longline/SetLonglineServiceTopia.java | 0 .../services/service/longline/TdrServiceTopia.java | 0 .../longline/TripLonglineGearUseServiceTopia.java | 0 .../service/longline/TripLonglineServiceTopia.java | 0 .../ActivitySeineObservedSystemServiceTopia.java | 0 .../service/seine/ActivitySeineServiceTopia.java | 0 .../service/seine/FloatingObjectServiceTopia.java | 0 .../service/seine/NonTargetCatchServiceTopia.java | 0 .../service/seine/NonTargetSampleServiceTopia.java | 0 .../seine/ObjectObservedSpeciesServiceTopia.java | 0 .../seine/ObjectSchoolEstimateServiceTopia.java | 0 .../services/service/seine/RouteServiceTopia.java | 0 .../service/seine/SchoolEstimateServiceTopia.java | 0 .../service/seine/SetSeineServiceTopia.java | 0 .../service/seine/TargetCatchServiceTopia.java | 0 .../service/seine/TargetSampleServiceTopia.java | 0 .../TransmittingBuoyOperationServiceTopia.java | 0 .../seine/TripSeineGearUseServiceTopia.java | 0 .../service/seine/TripSeineServiceTopia.java | 0 .../service/trip/ImportTripScriptTopiaSqlWork.java | 0 .../service/trip/TripManagementServiceTopia.java | 0 .../fr.ird.observe.services.ObserveServiceFactory | 0 ...ces.dto.reference.ReferenceBinderEngineSupplier | 0 .../resources/i18n/services-topia_en_GB.properties | 0 .../resources/i18n/services-topia_es_ES.properties | 0 .../resources/i18n/services-topia_fr_FR.properties | 0 .../referentiel/LengthWeightParemetersTest.java | 0 .../replication/ReplicateReferentialsTest.java | 0 .../entities/replication/ReplicateTestSupport.java | 0 .../replication/ReplicateTripLonglineTest.java | 0 .../replication/ReplicateTripSeineTest.java | 0 .../services/ApplicationContextResource.java | 0 .../ird/observe/services/DataSourceResource.java | 0 .../ObserveDataSourceConnectionTopiaTaiste.java | 0 .../services/ObserveServiceContextTopiaTaiste.java | 0 .../services/binder/BinderEngineMetadataTest.java | 0 .../observe/services/binder/BinderEngineTest.java | 0 .../services/binder/ReferenceBinderEngineTest.java | 0 .../services/service/AbstractServiceTopiaTest.java | 0 .../AddSqlScriptProducerServiceTopiaTest.java | 0 .../service/DataSourceServiceTopiaTest.java | 0 .../services/service/MigrateTestsDatabases.java | 0 .../service/ReferentialServiceTopiaTest.java | 0 .../fr/ird/observe/services/service/RigthTest.java | 0 .../ConsolidateDataServiceTopiaTest.java | 0 .../report/AbstractReportServiceTopiaTest.java | 0 .../actions/report/ReportAccessoryCatch2Test.java | 0 .../report/ReportAccessoryCatchByGroup2Test.java | 0 .../report/ReportAccessoryCatchByGroupTest.java | 0 .../actions/report/ReportAccessoryCatchTest.java | 0 .../report/ReportActivityWithCommentTest.java | 0 .../actions/report/ReportAllActivitysTest.java | 0 .../actions/report/ReportDailySetAndCatchTest.java | 0 .../service/actions/report/ReportDcpUsageTest.java | 0 .../actions/report/ReportSetByAssociationTest.java | 0 .../report/ReportTargetCatchByAssociationTest.java | 0 .../ReportTargetDiscardedByAssociationTest.java | 0 .../UnidirectionalSynchronizeReferentialTest.java | 0 .../actions/validate/ValidateServiceTopiaTest.java | 0 ...tLonglineDetailCompositionServiceTopiaTest.java | 0 .../service/seine/RouteServiceTopiaTest.java | 0 .../seine/TargetSampleServiceTopiaTest.java | 0 .../seine/TripSeineGearUseServiceTopiaTest.java | 0 .../service/seine/TripSeineServiceTopiaTest.java | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/validators.xml | 0 .../LICENSE.txt | 0 {observe-test-data => test-data}/README.md | 0 {observe-test-data => test-data}/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 0 .../java/fr/ird/observe/test/DatabaseName.java | 0 .../java/fr/ird/observe/test/ObserveFixtures.java | 0 .../main/java/fr/ird/observe/test/TestHelper.java | 0 .../test/spi/CopyDatabaseConfiguration.java | 0 .../test/spi/CopyDatabaseConfigurations.java | 0 .../ird/observe/test/spi/DatabaseClassifier.java | 0 .../test/spi/DatabaseNameConfiguration.java | 0 .../test/spi/DatabaseNameConfigurations.java | 0 .../test/spi/DatabaseVersionConfiguration.java | 0 .../test/spi/DatabaseVersionConfigurations.java | 0 .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin .../src/main/resources/db/4.0.1/empty_h2.sql.gz | Bin .../src/main/resources/db/4.0.1/empty_pg.sql.gz | Bin .../src/main/resources/db/4.0.1/referentiel.sql.gz | Bin .../src/main/resources/db/4.0/referentiel.sql.gz | Bin .../resources/db/4.902/dataForTestLongline.sql.gz | Bin .../resources/db/4.902/dataForTestSeine.sql.gz | Bin .../src/main/resources/db/4.902}/empty_h2.sql.gz | Bin .../src/main/resources/db/4.902}/empty_pg.sql.gz | Bin .../src/main/resources/db/4.902/referentiel.sql.gz | Bin .../resources/db/4.903/dataForTestLongline.sql.gz | Bin .../resources/db/4.903/dataForTestSeine.sql.gz | Bin ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin .../src/main/resources/db/4.903}/empty_h2.sql.gz | Bin .../src/main/resources/db/4.903}/empty_pg.sql.gz | Bin .../src/main/resources/db/4.903/referentiel.sql.gz | Bin .../resources/db/4.904/dataForTestLongline.sql.gz | Bin .../resources/db/4.904/dataForTestSeine.sql.gz | Bin ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin .../src/main/resources/db/4.904/empty_h2.sql.gz | Bin .../src/main/resources/db/4.904/empty_pg.sql.gz | Bin .../src/main/resources/db/4.904/referentiel.sql.gz | Bin .../src/main/resources/db/replication/data.sql.gz | Bin .../src/main/resources/observetest.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 0 .../support/TopiaMetadataModelSupportImpl.java | 0 .../persistence/metadata/TopiaMetadataEntity.java | 0 .../persistence/metadata/TopiaMetadataModel.java | 0 .../metadata/TopiaMetadataModelVisitor.java | 0 .../support/TopiaMetadataModelSupport.java | 0 .../topia/service/sql/batch/SqlRequests.java | 0 .../nuiton/topia/service/sql/batch/SqlResult.java | 0 .../service/sql/batch/TopiaSqlBatchService.java | 0 .../batch/TopiaSqlBatchServiceConfiguration.java | 0 .../sql/batch/TopiaSqlBatchServiceImpl.java | 0 .../sql/batch/actions/AbstractSchemaAction.java | 0 .../sql/batch/actions/AbstractSchemaRequest.java | 0 .../sql/batch/actions/AbstractSqlAction.java | 0 .../sql/batch/actions/AbstractSqlRequest.java | 0 .../sql/batch/actions/AbstractTablesAction.java | 0 .../sql/batch/actions/AbstractTablesRequest.java | 0 .../service/sql/batch/actions/BlobsContainer.java | 0 .../sql/batch/actions/CreateSchemaAction.java | 0 .../sql/batch/actions/CreateSchemaRequest.java | 0 .../sql/batch/actions/DeleteTablesAction.java | 0 .../sql/batch/actions/DeleteTablesRequest.java | 0 .../sql/batch/actions/DropSchemaAction.java | 0 .../sql/batch/actions/DropSchemaRequest.java | 0 .../sql/batch/actions/ReplicateTablesAction.java | 0 .../sql/batch/actions/ReplicateTablesRequest.java | 0 .../batch/actions/TopiaSqlTableSelectArgument.java | 0 .../sql/batch/actions/UpdateTablesAction.java | 0 .../sql/batch/actions/UpdateTablesRequest.java | 0 .../service/sql/batch/tables/TopiaSqlTable.java | 0 .../service/sql/batch/tables/TopiaSqlTables.java | 0 .../sql/batch/tables/TopiaSqlTablesFactory.java | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 4 +- .../src/license/THIRD-PARTY.properties | 0 .../templates/TopiaMetadataModelGenerator.java | 0 2469 files changed, 159 insertions(+), 227 deletions(-) diff --git a/observe-topia-templates-extension/LICENSE.txt b/application-swing-decoration/LICENSE.txt similarity index 100% rename from observe-topia-templates-extension/LICENSE.txt rename to application-swing-decoration/LICENSE.txt diff --git a/observe-services-topia/README.md b/application-swing-decoration/README.md similarity index 100% rename from observe-services-topia/README.md rename to application-swing-decoration/README.md diff --git a/observe-application-swing/changelog.txt b/application-swing-decoration/changelog.txt similarity index 100% rename from observe-application-swing/changelog.txt rename to application-swing-decoration/changelog.txt diff --git a/observe-application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml similarity index 96% rename from observe-application-swing-decoration/pom.xml rename to application-swing-decoration/pom.xml index 85f011e..8e9de18 100644 --- a/observe-application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -29,7 +29,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-application-swing-decoration</artifactId> + <artifactId>application-swing-decoration</artifactId> <name>ObServe :: Application Swing Decoration</name> <description>ObServe Application Swing Decoration</description> @@ -39,7 +39,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-application-swing-decoration/src/license/THIRD-PARTY.properties b/application-swing-decoration/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-application-swing-decoration/src/license/THIRD-PARTY.properties rename to application-swing-decoration/src/license/THIRD-PARTY.properties diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java similarity index 100% rename from observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java rename to application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties similarity index 100% rename from observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties rename to application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties similarity index 100% rename from observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties rename to application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties similarity index 100% rename from observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties rename to application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties diff --git a/observe-topia-extension/LICENSE.txt b/application-swing-validation/LICENSE.txt similarity index 100% rename from observe-topia-extension/LICENSE.txt rename to application-swing-validation/LICENSE.txt diff --git a/observe-services-rest/README.md b/application-swing-validation/README.md similarity index 100% rename from observe-services-rest/README.md rename to application-swing-validation/README.md diff --git a/observe-application-swing-validation/changelog.txt b/application-swing-validation/changelog.txt similarity index 100% rename from observe-application-swing-validation/changelog.txt rename to application-swing-validation/changelog.txt diff --git a/observe-application-swing-validation/pom.xml b/application-swing-validation/pom.xml similarity index 95% rename from observe-application-swing-validation/pom.xml rename to application-swing-validation/pom.xml index fb95364..ea05fd2 100644 --- a/observe-application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -29,7 +29,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-application-swing-validation</artifactId> + <artifactId>application-swing-validation</artifactId> <name>ObServe :: Application Swing Validation</name> <description>ObServe Application Swing Validation</description> @@ -43,12 +43,12 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-application-swing-decoration</artifactId> + <artifactId>application-swing-decoration</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-application-swing-validation/src/license/THIRD-PARTY.properties b/application-swing-validation/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-application-swing-validation/src/license/THIRD-PARTY.properties rename to application-swing-validation/src/license/THIRD-PARTY.properties diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java similarity index 100% rename from observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java rename to application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-globalComposition-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-globalComposition-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-globalComposition-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-globalComposition-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-hooksComposition-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-hooksComposition-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-hooksComposition-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-hooksComposition-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetCatch-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetCatch-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetCatch-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetCatch-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetDiscarded-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetDiscarded-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-ui-update-targetDiscarded-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetCatch-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-ui-update-targetDiscarded-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-create-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-error-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-error-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml similarity index 100% rename from observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties similarity index 100% rename from observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties rename to application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties similarity index 100% rename from observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties rename to application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties similarity index 100% rename from observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties rename to application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties diff --git a/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java similarity index 100% rename from observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java rename to application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java diff --git a/observe-application-swing-validation/src/test/resources/log4j.properties b/application-swing-validation/src/test/resources/log4j.properties similarity index 100% rename from observe-application-swing-validation/src/test/resources/log4j.properties rename to application-swing-validation/src/test/resources/log4j.properties diff --git a/observe-application-swing-validation/src/test/resources/validators.xml b/application-swing-validation/src/test/resources/validators.xml similarity index 100% rename from observe-application-swing-validation/src/test/resources/validators.xml rename to application-swing-validation/src/test/resources/validators.xml diff --git a/observe-test-data/LICENSE.txt b/application-swing/LICENSE.txt similarity index 100% rename from observe-test-data/LICENSE.txt rename to application-swing/LICENSE.txt diff --git a/observe-services-configuration-topia/README.md b/application-swing/README.md similarity index 100% rename from observe-services-configuration-topia/README.md rename to application-swing/README.md diff --git a/observe-application-swing-decoration/changelog.txt b/application-swing/changelog.txt similarity index 100% rename from observe-application-swing-decoration/changelog.txt rename to application-swing/changelog.txt diff --git a/observe-application-swing/pom.xml b/application-swing/pom.xml similarity index 96% rename from observe-application-swing/pom.xml rename to application-swing/pom.xml index 4e83844..fc96185 100644 --- a/observe-application-swing/pom.xml +++ b/application-swing/pom.xml @@ -29,7 +29,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-application-swing</artifactId> + <artifactId>application-swing</artifactId> <name>ObServe :: Application Swing</name> <description>ObServe Application Swing</description> @@ -83,45 +83,45 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-topia</artifactId> + <artifactId>services-configuration-topia</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-rest</artifactId> + <artifactId>services-configuration-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-runner</artifactId> + <artifactId>services-runner</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-application-swing-decoration</artifactId> + <artifactId>application-swing-decoration</artifactId> <version>${project.version}</version> </dependency> <!-- FIXME Voir pourquoi on doit mettre ça sinon l'analyse des dépendances ne passe pas --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> + <artifactId>entities</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -129,14 +129,14 @@ <!-- FIXME Voir pourquoi on doit mettre ça sinon l'analyse des dépendances ne passe pas --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-topia</artifactId> + <artifactId>services-topia</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-application-swing-validation</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -454,7 +454,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/observe-application-swing/src/license/THIRD-PARTY.properties b/application-swing/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-application-swing/src/license/THIRD-PARTY.properties rename to application-swing/src/license/THIRD-PARTY.properties diff --git a/observe-application-swing/src/main/assembly/bin.xml b/application-swing/src/main/assembly/bin.xml similarity index 100% rename from observe-application-swing/src/main/assembly/bin.xml rename to application-swing/src/main/assembly/bin.xml diff --git a/observe-application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf b/application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf similarity index 100% rename from observe-application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf rename to application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf diff --git a/observe-application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf b/application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf similarity index 100% rename from observe-application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf rename to application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf diff --git a/observe-application-swing/src/main/assembly/dist/go.bat b/application-swing/src/main/assembly/dist/go.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/go.bat rename to application-swing/src/main/assembly/dist/go.bat diff --git a/observe-application-swing/src/main/assembly/dist/go.sh b/application-swing/src/main/assembly/dist/go.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/go.sh rename to application-swing/src/main/assembly/dist/go.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/README.txt b/application-swing/src/main/assembly/dist/obstuna-admin/README.txt similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/README.txt rename to application-swing/src/main/assembly/dist/obstuna-admin/README.txt diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh b/application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat b/application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat rename to application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat b/application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat rename to application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql b/application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql rename to application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql b/application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql rename to application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql b/application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql rename to application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql b/application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql rename to application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql b/application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql rename to application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat b/application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat rename to application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat b/application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat rename to application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat diff --git a/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh b/application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh rename to application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/util/README.txt b/application-swing/src/main/assembly/dist/util/README.txt similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/README.txt rename to application-swing/src/main/assembly/dist/util/README.txt diff --git a/observe-application-swing/src/main/assembly/dist/util/backup-obstuna.sh b/application-swing/src/main/assembly/dist/util/backup-obstuna.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/backup-obstuna.sh rename to application-swing/src/main/assembly/dist/util/backup-obstuna.sh diff --git a/observe-application-swing/src/main/assembly/dist/util/create-postgis.sh b/application-swing/src/main/assembly/dist/util/create-postgis.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/create-postgis.sh rename to application-swing/src/main/assembly/dist/util/create-postgis.sh diff --git a/observe-application-swing/src/main/assembly/dist/util/generate-id.bat b/application-swing/src/main/assembly/dist/util/generate-id.bat similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/generate-id.bat rename to application-swing/src/main/assembly/dist/util/generate-id.bat diff --git a/observe-application-swing/src/main/assembly/dist/util/generate-id.sh b/application-swing/src/main/assembly/dist/util/generate-id.sh similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/generate-id.sh rename to application-swing/src/main/assembly/dist/util/generate-id.sh diff --git a/observe-application-swing/src/main/assembly/dist/util/tables/data-tables.txt b/application-swing/src/main/assembly/dist/util/tables/data-tables.txt similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/tables/data-tables.txt rename to application-swing/src/main/assembly/dist/util/tables/data-tables.txt diff --git a/observe-application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt b/application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt similarity index 100% rename from observe-application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt rename to application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt diff --git a/observe-application-swing/src/main/assembly/map.xml b/application-swing/src/main/assembly/map.xml similarity index 100% rename from observe-application-swing/src/main/assembly/map.xml rename to application-swing/src/main/assembly/map.xml diff --git a/observe-application-swing/src/main/assembly/sql/v1/README.txt b/application-swing/src/main/assembly/sql/v1/README.txt similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/README.txt rename to application-swing/src/main/assembly/sql/v1/README.txt diff --git a/observe-application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh b/application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh rename to application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh b/application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh rename to application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/create-postgis.sh b/application-swing/src/main/assembly/sql/v1/create-postgis.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/create-postgis.sh rename to application-swing/src/main/assembly/sql/v1/create-postgis.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/createdb-script.sh b/application-swing/src/main/assembly/sql/v1/createdb-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/createdb-script.sh rename to application-swing/src/main/assembly/sql/v1/createdb-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh b/application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh rename to application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh b/application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh rename to application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh b/application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh rename to application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/create-security-script.sh b/application-swing/src/main/assembly/sql/v1/security/create-security-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/create-security-script.sh rename to application-swing/src/main/assembly/sql/v1/security/create-security-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh b/application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh rename to application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh diff --git a/observe-application-swing/src/main/assembly/sql/v1/security/tables.txt b/application-swing/src/main/assembly/sql/v1/security/tables.txt similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/security/tables.txt rename to application-swing/src/main/assembly/sql/v1/security/tables.txt diff --git a/observe-application-swing/src/main/assembly/sql/v1/sql/obstuna.sql b/application-swing/src/main/assembly/sql/v1/sql/obstuna.sql similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v1/sql/obstuna.sql rename to application-swing/src/main/assembly/sql/v1/sql/obstuna.sql diff --git a/observe-application-swing/src/main/assembly/sql/v2/README.txt b/application-swing/src/main/assembly/sql/v2/README.txt similarity index 100% rename from observe-application-swing/src/main/assembly/sql/v2/README.txt rename to application-swing/src/main/assembly/sql/v2/README.txt diff --git a/observe-application-swing/src/main/filters/observe-application.properties b/application-swing/src/main/filters/observe-application.properties similarity index 100% rename from observe-application-swing/src/main/filters/observe-application.properties rename to application-swing/src/main/filters/observe-application.properties diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/application-swing/src/main/filters/observe-ui.properties similarity index 100% rename from observe-application-swing/src/main/filters/observe-ui.properties rename to application-swing/src/main/filters/observe-ui.properties diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveAdminCLI.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingTechnicalException.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingTechnicalException.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingTechnicalException.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingTechnicalException.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java b/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java b/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/ConnexionStatus.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/CreationMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/CreationMode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/CreationMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/CreationMode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DataContextType.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DataContextType.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DataContextType.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DataContextType.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DbMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DbMode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DbMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DbMode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceEvent.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceEvent.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceEvent.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceEvent.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListenerAdapter.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListenerAdapter.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListenerAdapter.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/db/event/ObserveSwingDataSourceListenerAdapter.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeApplicationLanguageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeApplicationLanguageAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeApplicationLanguageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeApplicationLanguageAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeDbLanguageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeDbLanguageAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeDbLanguageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeDbLanguageAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeStorageAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeStorageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ChangeStorageAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseApplicationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseApplicationAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseApplicationAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseApplicationAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseHelpAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseHelpAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseHelpAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseHelpAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseStorageAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseStorageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/CloseStorageAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/GotoSiteAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/LaunchAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/LaunchAdminAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/LaunchAdminAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/LaunchAdminAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadDefaultConfigurationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadDefaultConfigurationAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadDefaultConfigurationAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadDefaultConfigurationAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadResourcesAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadResourcesAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadResourcesAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadResourcesAction.java diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadStorageAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/SaveStorageToFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/SaveStorageToFileAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/SaveStorageToFileAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/SaveStorageToFileAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowStorageInfoAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowStorageInfoAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowStorageInfoAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowStorageInfoAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartH2WebServerAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartH2WebServerAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartH2WebServerAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartServerModeAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartServerModeAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StartServerModeAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopH2WebServerAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopH2WebServerAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopH2WebServerAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopServerModeAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopServerModeAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/StopServerModeAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseAndCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseAndCreateUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseAndCreateUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseAndCreateUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteDataUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteDataUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteDataUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteDataUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteReferenceUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteReferenceUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteReferenceUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/DeleteReferenceUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ResetEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ResetEditUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ResetEditUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ResetEditUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SaveEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SaveEditUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SaveEditUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SaveEditUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectOpenNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectOpenNodeUIAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectOpenNodeUIAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectOpenNodeUIAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchronizeTaskListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchronizeTaskListCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchronizeTaskListCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchronizeTaskListCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentMode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentMode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/CommonListUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/CommonListUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/CommonListUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/CommonListUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/CommonListUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/CommonListUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/CommonListUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/CommonListUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferentialContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferentialContentUIInitializer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferentialContentUIInitializer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferentialContentUIInitializer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/I18nReferenceEntity.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/I18nReferenceEntity.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/I18nReferenceEntity.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/I18nReferenceEntity.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/NeedCommentReferenceEntity.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/NeedCommentReferenceEntity.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/NeedCommentReferenceEntity.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/NeedCommentReferenceEntity.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramObservationEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramObservationEnum.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramObservationEnum.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramObservationEnum.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableMeta.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableMeta.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableMeta.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableMeta.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/CodeMesureEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/CodeMesureEnum.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/CodeMesureEnum.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/CodeMesureEnum.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jcss diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java diff --git a/observe-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 similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/package.html similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/package.html rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/package.html diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeSelectionModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveDataProvider.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveDataProvider.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveDataProvider.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveDataProvider.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/BooleanEditor.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/SpringUtilities.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/SpringUtilities.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/SpringUtilities.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/SpringUtilities.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableList.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableList.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableList.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableList.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/InlineTableAutotSelectRowAndShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/InlineTableAutotSelectRowAndShowPopupAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/InlineTableAutotSelectRowAndShowPopupAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/InlineTableAutotSelectRowAndShowPopupAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeader.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserverMapPanLegendDrawer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserverMapPanLegendDrawer.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserverMapPanLegendDrawer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserverMapPanLegendDrawer.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jaxx similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jaxx diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jcss similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jcss rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUI.jcss diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationModelMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationModelMode.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationModelMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationModelMode.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java similarity index 100% rename from observe-application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java diff --git a/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf b/application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf rename to application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf diff --git a/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj b/application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj rename to application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj diff --git a/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp b/application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp rename to application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp diff --git a/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx b/application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx rename to application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp diff --git a/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx b/application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx rename to application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx diff --git a/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf b/application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf rename to application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf diff --git a/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj b/application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj rename to application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj diff --git a/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp b/application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp rename to application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp diff --git a/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx b/application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx rename to application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml diff --git a/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx b/application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx similarity index 100% rename from observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx rename to application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx diff --git a/observe-application-swing/src/main/map/style.xml b/application-swing/src/main/map/style.xml similarity index 100% rename from observe-application-swing/src/main/map/style.xml rename to application-swing/src/main/map/style.xml diff --git a/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider similarity index 100% rename from observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider rename to application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider diff --git a/observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl rename to application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl rename to application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl rename to application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl diff --git a/observe-application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl rename to application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl rename to application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl diff --git a/observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl similarity index 100% rename from observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl rename to application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties similarity index 96% rename from observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties rename to application-swing/src/main/resources/i18n/application-swing_en_GB.properties index c357893..42c93a6 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1804,74 +1804,40 @@ observe.converter.error.float.format= observe.converter.error.no.convertor= observe.converter.error.noValue= observe.entity.message.updating= -observe.enum..autreVessel= -observe.enum..ceVessel= -observe.enum..disabled= -observe.enum..enabled= -observe.enum..fromData= -observe.enum..fromReferentiel= -observe.enum..fromSample= -observe.enum..libre= -observe.enum..longline= -observe.enum..longlineActivity= -observe.enum..longlineActivityInHarbour= -observe.enum..longlineActivityWithHaulingEnd= -observe.enum..longlineActivityWithHaulingStart= -observe.enum..longlineActivityWithInteraction= -observe.enum..longlineActivityWithSettingEnd= -observe.enum..longlineActivityWithSettingStart= -observe.enum..longlineActivityWithStation= -observe.enum..longlineDepartureHarbour= -observe.enum..longlineLandingHarbour= -observe.enum..objet= -observe.enum..pasDeBalise= -observe.enum..pose= -observe.enum..recuperation= -observe.enum..recuperationEtRemplacement= -observe.enum..seine= -observe.enum..seineActivity= -observe.enum..seineActivityInHarbour= -observe.enum..seineActivityWithFreeSchoolType= -observe.enum..seineActivityWithObjectSchoolType= -observe.enum..seineDepartureHarbour= -observe.enum..seineLandingHarbour= -observe.enum..undefined= -observe.enum..unknown= -observe.enum..visite= -observe.enum.gearType.longline=Longline gear type -observe.enum.gearType.seine=Senne gear type -observe.enum.nonTargetCatchComputedValueSource.fromData=Computed from data -observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=Computed from referential -observe.enum.nonTargetCatchComputedValueSource.fromSample=Computed from samples -observe.enum.ownership.autreVessel=Other vessel -observe.enum.ownership.ceVessel=This vessel -observe.enum.ownership.unknown=Unknown -observe.enum.referenceStatus.disabled=Disabled -observe.enum.referenceStatus.enabled=Enabled -observe.enum.schoolType.libre=Free school type -observe.enum.schoolType.objet=Object school type -observe.enum.schoolType.undefined=Undefined school type -observe.enum.tripMapPointType.longlineActivity=Activity -observe.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour -observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end -observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start -observe.enum.tripMapPointType.longlineActivityWithInteraction=Encounter -observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end -observe.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start -observe.enum.tripMapPointType.longlineActivityWithStation=Station -observe.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure -observe.enum.tripMapPointType.longlineLandingHarbour=Harbour landing -observe.enum.tripMapPointType.seineActivity=Activity -observe.enum.tripMapPointType.seineActivityInHarbour=In harbour -observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Free School type -observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Object School type -observe.enum.tripMapPointType.seineDepartureHarbour=Harbour departure -observe.enum.tripMapPointType.seineLandingHarbour=Harbour landing -observe.enum.typeTransmittingBuoyOperation.pasDeBalise=No Beacon -observe.enum.typeTransmittingBuoyOperation.pose=Posing -observe.enum.typeTransmittingBuoyOperation.recuperation=Grab -observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change -observe.enum.typeTransmittingBuoyOperation.visite=Visit +observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline gear type +observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne gear type +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Other vessel +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=This vessel +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Unknown +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Disabled +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled=Enabled +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Free school type +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Object school type +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Undefined school type +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=Activity +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Encounter +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=Activity +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=In harbour +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Posing +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visit observe.error.can.not.create.directory= observe.error.no.activity.6= observe.error.storage.could.not.backup.unsane.local.db= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties similarity index 97% rename from observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties rename to application-swing/src/main/resources/i18n/application-swing_es_ES.properties index cd12f69..8f236c2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1804,74 +1804,40 @@ observe.converter.error.float.format= observe.converter.error.no.convertor= observe.converter.error.noValue= observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. -observe.enum..autreVessel= -observe.enum..ceVessel= -observe.enum..disabled= -observe.enum..enabled= -observe.enum..fromData= -observe.enum..fromReferentiel= -observe.enum..fromSample= -observe.enum..libre= -observe.enum..longline= -observe.enum..longlineActivity= -observe.enum..longlineActivityInHarbour= -observe.enum..longlineActivityWithHaulingEnd= -observe.enum..longlineActivityWithHaulingStart= -observe.enum..longlineActivityWithInteraction= -observe.enum..longlineActivityWithSettingEnd= -observe.enum..longlineActivityWithSettingStart= -observe.enum..longlineActivityWithStation= -observe.enum..longlineDepartureHarbour= -observe.enum..longlineLandingHarbour= -observe.enum..objet= -observe.enum..pasDeBalise= -observe.enum..pose= -observe.enum..recuperation= -observe.enum..recuperationEtRemplacement= -observe.enum..seine= -observe.enum..seineActivity= -observe.enum..seineActivityInHarbour= -observe.enum..seineActivityWithFreeSchoolType= -observe.enum..seineActivityWithObjectSchoolType= -observe.enum..seineDepartureHarbour= -observe.enum..seineLandingHarbour= -observe.enum..undefined= -observe.enum..unknown= -observe.enum..visite= -observe.enum.gearType.longline=Palangre -observe.enum.gearType.seine=Senne -observe.enum.nonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos -observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del Referencial -observe.enum.nonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras -observe.enum.ownership.autreVessel=Barco ajeno -observe.enum.ownership.ceVessel=Este barco o un barco del mismo armador -observe.enum.ownership.unknown=Desconocido -observe.enum.referenceStatus.disabled= -observe.enum.referenceStatus.enabled= -observe.enum.schoolType.libre=Banco libre -observe.enum.schoolType.objet=Banco a objeto -observe.enum.schoolType.undefined=Banco indeterminado -observe.enum.tripMapPointType.longlineActivity=Activity -observe.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour -observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end -observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start -observe.enum.tripMapPointType.longlineActivityWithInteraction=Encounter -observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end -observe.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start -observe.enum.tripMapPointType.longlineActivityWithStation=Station -observe.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure -observe.enum.tripMapPointType.longlineLandingHarbour=Harbour landing -observe.enum.tripMapPointType.seineActivity=Activity -observe.enum.tripMapPointType.seineActivityInHarbour=In harbour -observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banco libre -observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto -observe.enum.tripMapPointType.seineDepartureHarbour=Harbour departure -observe.enum.tripMapPointType.seineLandingHarbour=Harbour landing -observe.enum.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar -observe.enum.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza -observe.enum.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua -observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza -observe.enum.typeTransmittingBuoyOperation.visite=Visita a la baliza +observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Palangre +observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del Referencial +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Barco ajeno +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Desconocido +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled= +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled= +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Banco libre +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Banco a objeto +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Banco indeterminado +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=Activity +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Encounter +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=Activity +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=In harbour +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\! observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.error.storage.could.not.backup.unsane.local.db= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties similarity index 100% rename from observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties rename to application-swing/src/main/resources/i18n/application-swing_fr_FR.properties diff --git a/observe-application-swing/src/main/resources/icons/action-about.png b/application-swing/src/main/resources/icons/action-about.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-about.png rename to application-swing/src/main/resources/icons/action-about.png diff --git a/observe-application-swing/src/main/resources/icons/action-accept.png b/application-swing/src/main/resources/icons/action-accept.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-accept.png rename to application-swing/src/main/resources/icons/action-accept.png diff --git a/observe-application-swing/src/main/resources/icons/action-add.png b/application-swing/src/main/resources/icons/action-add.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-add.png rename to application-swing/src/main/resources/icons/action-add.png diff --git a/observe-application-swing/src/main/resources/icons/action-application-reload.png b/application-swing/src/main/resources/icons/action-application-reload.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-application-reload.png rename to application-swing/src/main/resources/icons/action-application-reload.png diff --git a/observe-application-swing/src/main/resources/icons/action-bean-sort-down.png b/application-swing/src/main/resources/icons/action-bean-sort-down.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-bean-sort-down.png rename to application-swing/src/main/resources/icons/action-bean-sort-down.png diff --git a/observe-application-swing/src/main/resources/icons/action-bean-sort-up.png b/application-swing/src/main/resources/icons/action-bean-sort-up.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-bean-sort-up.png rename to application-swing/src/main/resources/icons/action-bean-sort-up.png diff --git a/observe-application-swing/src/main/resources/icons/action-bean-sort.png b/application-swing/src/main/resources/icons/action-bean-sort.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-bean-sort.png rename to application-swing/src/main/resources/icons/action-bean-sort.png diff --git a/observe-application-swing/src/main/resources/icons/action-calculator.png b/application-swing/src/main/resources/icons/action-calculator.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-calculator.png rename to application-swing/src/main/resources/icons/action-calculator.png diff --git a/observe-application-swing/src/main/resources/icons/action-cancel.png b/application-swing/src/main/resources/icons/action-cancel.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-cancel.png rename to application-swing/src/main/resources/icons/action-cancel.png diff --git a/observe-application-swing/src/main/resources/icons/action-center.png b/application-swing/src/main/resources/icons/action-center.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-center.png rename to application-swing/src/main/resources/icons/action-center.png diff --git a/observe-application-swing/src/main/resources/icons/action-close.png b/application-swing/src/main/resources/icons/action-close.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-close.png rename to application-swing/src/main/resources/icons/action-close.png diff --git a/observe-application-swing/src/main/resources/icons/action-closeTab.png b/application-swing/src/main/resources/icons/action-closeTab.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-closeTab.png rename to application-swing/src/main/resources/icons/action-closeTab.png diff --git a/observe-application-swing/src/main/resources/icons/action-collapse.png b/application-swing/src/main/resources/icons/action-collapse.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-collapse.png rename to application-swing/src/main/resources/icons/action-collapse.png diff --git a/observe-application-swing/src/main/resources/icons/action-combobox-reset.png b/application-swing/src/main/resources/icons/action-combobox-reset.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-combobox-reset.png rename to application-swing/src/main/resources/icons/action-combobox-reset.png diff --git a/observe-application-swing/src/main/resources/icons/action-combobox-reset2.png b/application-swing/src/main/resources/icons/action-combobox-reset2.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-combobox-reset2.png rename to application-swing/src/main/resources/icons/action-combobox-reset2.png diff --git a/observe-application-swing/src/main/resources/icons/action-combobox-sort.png b/application-swing/src/main/resources/icons/action-combobox-sort.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-combobox-sort.png rename to application-swing/src/main/resources/icons/action-combobox-sort.png diff --git a/observe-application-swing/src/main/resources/icons/action-config.png b/application-swing/src/main/resources/icons/action-config.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-config.png rename to application-swing/src/main/resources/icons/action-config.png diff --git a/observe-application-swing/src/main/resources/icons/action-connect_creating.png b/application-swing/src/main/resources/icons/action-connect_creating.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-connect_creating.png rename to application-swing/src/main/resources/icons/action-connect_creating.png diff --git a/observe-application-swing/src/main/resources/icons/action-connect_no.png b/application-swing/src/main/resources/icons/action-connect_no.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-connect_no.png rename to application-swing/src/main/resources/icons/action-connect_no.png diff --git a/observe-application-swing/src/main/resources/icons/action-connect_ok.png b/application-swing/src/main/resources/icons/action-connect_ok.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-connect_ok.png rename to application-swing/src/main/resources/icons/action-connect_ok.png diff --git a/observe-application-swing/src/main/resources/icons/action-connect_untested.png b/application-swing/src/main/resources/icons/action-connect_untested.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-connect_untested.png rename to application-swing/src/main/resources/icons/action-connect_untested.png diff --git a/observe-application-swing/src/main/resources/icons/action-connected.png b/application-swing/src/main/resources/icons/action-connected.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-connected.png rename to application-swing/src/main/resources/icons/action-connected.png diff --git a/observe-application-swing/src/main/resources/icons/action-copyToBoth.png b/application-swing/src/main/resources/icons/action-copyToBoth.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-copyToBoth.png rename to application-swing/src/main/resources/icons/action-copyToBoth.png diff --git a/observe-application-swing/src/main/resources/icons/action-copyToLeft.png b/application-swing/src/main/resources/icons/action-copyToLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-copyToLeft.png rename to application-swing/src/main/resources/icons/action-copyToLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-copyToRight.png b/application-swing/src/main/resources/icons/action-copyToRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-copyToRight.png rename to application-swing/src/main/resources/icons/action-copyToRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-data-calcule.png b/application-swing/src/main/resources/icons/action-data-calcule.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-data-calcule.png rename to application-swing/src/main/resources/icons/action-data-calcule.png diff --git a/observe-application-swing/src/main/resources/icons/action-data-export.png b/application-swing/src/main/resources/icons/action-data-export.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-data-export.png rename to application-swing/src/main/resources/icons/action-data-export.png diff --git a/observe-application-swing/src/main/resources/icons/action-data-import.png b/application-swing/src/main/resources/icons/action-data-import.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-data-import.png rename to application-swing/src/main/resources/icons/action-data-import.png diff --git a/observe-application-swing/src/main/resources/icons/action-data-observe.png b/application-swing/src/main/resources/icons/action-data-observe.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-data-observe.png rename to application-swing/src/main/resources/icons/action-data-observe.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-change.png b/application-swing/src/main/resources/icons/action-db-change.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-change.png rename to application-swing/src/main/resources/icons/action-db-change.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-local.png b/application-swing/src/main/resources/icons/action-db-local.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-local.png rename to application-swing/src/main/resources/icons/action-db-local.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-none.png b/application-swing/src/main/resources/icons/action-db-none.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-none.png rename to application-swing/src/main/resources/icons/action-db-none.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-reload.png b/application-swing/src/main/resources/icons/action-db-reload.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-reload.png rename to application-swing/src/main/resources/icons/action-db-reload.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-remote.png b/application-swing/src/main/resources/icons/action-db-remote.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-remote.png rename to application-swing/src/main/resources/icons/action-db-remote.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-server.png b/application-swing/src/main/resources/icons/action-db-server.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-server.png rename to application-swing/src/main/resources/icons/action-db-server.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-start-server.png b/application-swing/src/main/resources/icons/action-db-start-server.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-start-server.png rename to application-swing/src/main/resources/icons/action-db-start-server.png diff --git a/observe-application-swing/src/main/resources/icons/action-db-stop-server.png b/application-swing/src/main/resources/icons/action-db-stop-server.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-db-stop-server.png rename to application-swing/src/main/resources/icons/action-db-stop-server.png diff --git a/observe-application-swing/src/main/resources/icons/action-delete.png b/application-swing/src/main/resources/icons/action-delete.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-delete.png rename to application-swing/src/main/resources/icons/action-delete.png diff --git a/observe-application-swing/src/main/resources/icons/action-deleteFromLeft.png b/application-swing/src/main/resources/icons/action-deleteFromLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-deleteFromLeft.png rename to application-swing/src/main/resources/icons/action-deleteFromLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-deleteFromRight.png b/application-swing/src/main/resources/icons/action-deleteFromRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-deleteFromRight.png rename to application-swing/src/main/resources/icons/action-deleteFromRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromLeft.png b/application-swing/src/main/resources/icons/action-desactivateFromLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-desactivateFromLeft.png rename to application-swing/src/main/resources/icons/action-desactivateFromLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromRight.png b/application-swing/src/main/resources/icons/action-desactivateFromRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-desactivateFromRight.png rename to application-swing/src/main/resources/icons/action-desactivateFromRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png b/application-swing/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png rename to application-swing/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateWithReplaceFromRight.png b/application-swing/src/main/resources/icons/action-desactivateWithReplaceFromRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-desactivateWithReplaceFromRight.png rename to application-swing/src/main/resources/icons/action-desactivateWithReplaceFromRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-edit-measurements.png b/application-swing/src/main/resources/icons/action-edit-measurements.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-edit-measurements.png rename to application-swing/src/main/resources/icons/action-edit-measurements.png diff --git a/observe-application-swing/src/main/resources/icons/action-exit.png b/application-swing/src/main/resources/icons/action-exit.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-exit.png rename to application-swing/src/main/resources/icons/action-exit.png diff --git a/observe-application-swing/src/main/resources/icons/action-expand.png b/application-swing/src/main/resources/icons/action-expand.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-expand.png rename to application-swing/src/main/resources/icons/action-expand.png diff --git a/observe-application-swing/src/main/resources/icons/action-fileChooser.png b/application-swing/src/main/resources/icons/action-fileChooser.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-fileChooser.png rename to application-swing/src/main/resources/icons/action-fileChooser.png diff --git a/observe-application-swing/src/main/resources/icons/action-generate.png b/application-swing/src/main/resources/icons/action-generate.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-generate.png rename to application-swing/src/main/resources/icons/action-generate.png diff --git a/observe-application-swing/src/main/resources/icons/action-go-back.png b/application-swing/src/main/resources/icons/action-go-back.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-go-back.png rename to application-swing/src/main/resources/icons/action-go-back.png diff --git a/observe-application-swing/src/main/resources/icons/action-go-detail.png b/application-swing/src/main/resources/icons/action-go-detail.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-go-detail.png rename to application-swing/src/main/resources/icons/action-go-detail.png diff --git a/observe-application-swing/src/main/resources/icons/action-go-down.png b/application-swing/src/main/resources/icons/action-go-down.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-go-down.png rename to application-swing/src/main/resources/icons/action-go-down.png diff --git a/observe-application-swing/src/main/resources/icons/action-go-jump.png b/application-swing/src/main/resources/icons/action-go-jump.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-go-jump.png rename to application-swing/src/main/resources/icons/action-go-jump.png diff --git a/observe-application-swing/src/main/resources/icons/action-go-up.png b/application-swing/src/main/resources/icons/action-go-up.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-go-up.png rename to application-swing/src/main/resources/icons/action-go-up.png diff --git a/observe-application-swing/src/main/resources/icons/action-help.png b/application-swing/src/main/resources/icons/action-help.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-help.png rename to application-swing/src/main/resources/icons/action-help.png diff --git a/observe-application-swing/src/main/resources/icons/action-i18n-en.png b/application-swing/src/main/resources/icons/action-i18n-en.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-i18n-en.png rename to application-swing/src/main/resources/icons/action-i18n-en.png diff --git a/observe-application-swing/src/main/resources/icons/action-i18n-es.png b/application-swing/src/main/resources/icons/action-i18n-es.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-i18n-es.png rename to application-swing/src/main/resources/icons/action-i18n-es.png diff --git a/observe-application-swing/src/main/resources/icons/action-i18n-fr.png b/application-swing/src/main/resources/icons/action-i18n-fr.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-i18n-fr.png rename to application-swing/src/main/resources/icons/action-i18n-fr.png diff --git a/observe-application-swing/src/main/resources/icons/action-i18n-uk.png b/application-swing/src/main/resources/icons/action-i18n-uk.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-i18n-uk.png rename to application-swing/src/main/resources/icons/action-i18n-uk.png diff --git a/observe-application-swing/src/main/resources/icons/action-import-gps.png b/application-swing/src/main/resources/icons/action-import-gps.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-import-gps.png rename to application-swing/src/main/resources/icons/action-import-gps.png diff --git a/observe-application-swing/src/main/resources/icons/action-information.png b/application-swing/src/main/resources/icons/action-information.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-information.png rename to application-swing/src/main/resources/icons/action-information.png diff --git a/observe-application-swing/src/main/resources/icons/action-insert-after.png b/application-swing/src/main/resources/icons/action-insert-after.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-insert-after.png rename to application-swing/src/main/resources/icons/action-insert-after.png diff --git a/observe-application-swing/src/main/resources/icons/action-insert-before.png b/application-swing/src/main/resources/icons/action-insert-before.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-insert-before.png rename to application-swing/src/main/resources/icons/action-insert-before.png diff --git a/observe-application-swing/src/main/resources/icons/action-local-export.png b/application-swing/src/main/resources/icons/action-local-export.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-local-export.png rename to application-swing/src/main/resources/icons/action-local-export.png diff --git a/observe-application-swing/src/main/resources/icons/action-local-import.png b/application-swing/src/main/resources/icons/action-local-import.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-local-import.png rename to application-swing/src/main/resources/icons/action-local-import.png diff --git a/observe-application-swing/src/main/resources/icons/action-mode-create.png b/application-swing/src/main/resources/icons/action-mode-create.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-mode-create.png rename to application-swing/src/main/resources/icons/action-mode-create.png diff --git a/observe-application-swing/src/main/resources/icons/action-mode-read.png b/application-swing/src/main/resources/icons/action-mode-read.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-mode-read.png rename to application-swing/src/main/resources/icons/action-mode-read.png diff --git a/observe-application-swing/src/main/resources/icons/action-mode-update.png b/application-swing/src/main/resources/icons/action-mode-update.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-mode-update.png rename to application-swing/src/main/resources/icons/action-mode-update.png diff --git a/observe-application-swing/src/main/resources/icons/action-move-activities.png b/application-swing/src/main/resources/icons/action-move-activities.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-move-activities.png rename to application-swing/src/main/resources/icons/action-move-activities.png diff --git a/observe-application-swing/src/main/resources/icons/action-move-routes.png b/application-swing/src/main/resources/icons/action-move-routes.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-move-routes.png rename to application-swing/src/main/resources/icons/action-move-routes.png diff --git a/observe-application-swing/src/main/resources/icons/action-move-trips.png b/application-swing/src/main/resources/icons/action-move-trips.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-move-trips.png rename to application-swing/src/main/resources/icons/action-move-trips.png diff --git a/observe-application-swing/src/main/resources/icons/action-next-step.png b/application-swing/src/main/resources/icons/action-next-step.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-next-step.png rename to application-swing/src/main/resources/icons/action-next-step.png diff --git a/observe-application-swing/src/main/resources/icons/action-openLink.png b/application-swing/src/main/resources/icons/action-openLink.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-openLink.png rename to application-swing/src/main/resources/icons/action-openLink.png diff --git a/observe-application-swing/src/main/resources/icons/action-previous-step.png b/application-swing/src/main/resources/icons/action-previous-step.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-previous-step.png rename to application-swing/src/main/resources/icons/action-previous-step.png diff --git a/observe-application-swing/src/main/resources/icons/action-remote-export.png b/application-swing/src/main/resources/icons/action-remote-export.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-remote-export.png rename to application-swing/src/main/resources/icons/action-remote-export.png diff --git a/observe-application-swing/src/main/resources/icons/action-remote-import.png b/application-swing/src/main/resources/icons/action-remote-import.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-remote-import.png rename to application-swing/src/main/resources/icons/action-remote-import.png diff --git a/observe-application-swing/src/main/resources/icons/action-reopen.png b/application-swing/src/main/resources/icons/action-reopen.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-reopen.png rename to application-swing/src/main/resources/icons/action-reopen.png diff --git a/observe-application-swing/src/main/resources/icons/action-report-copy.png b/application-swing/src/main/resources/icons/action-report-copy.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-report-copy.png rename to application-swing/src/main/resources/icons/action-report-copy.png diff --git a/observe-application-swing/src/main/resources/icons/action-report-run.png b/application-swing/src/main/resources/icons/action-report-run.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-report-run.png rename to application-swing/src/main/resources/icons/action-report-run.png diff --git a/observe-application-swing/src/main/resources/icons/action-report.png b/application-swing/src/main/resources/icons/action-report.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-report.png rename to application-swing/src/main/resources/icons/action-report.png diff --git a/observe-application-swing/src/main/resources/icons/action-revert.png b/application-swing/src/main/resources/icons/action-revert.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-revert.png rename to application-swing/src/main/resources/icons/action-revert.png diff --git a/observe-application-swing/src/main/resources/icons/action-revertFromLeft.png b/application-swing/src/main/resources/icons/action-revertFromLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-revertFromLeft.png rename to application-swing/src/main/resources/icons/action-revertFromLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-revertFromRight.png b/application-swing/src/main/resources/icons/action-revertFromRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-revertFromRight.png rename to application-swing/src/main/resources/icons/action-revertFromRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-save.png b/application-swing/src/main/resources/icons/action-save.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-save.png rename to application-swing/src/main/resources/icons/action-save.png diff --git a/observe-application-swing/src/main/resources/icons/action-select-ssl-cert.png b/application-swing/src/main/resources/icons/action-select-ssl-cert.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-select-ssl-cert.png rename to application-swing/src/main/resources/icons/action-select-ssl-cert.png diff --git a/observe-application-swing/src/main/resources/icons/action-select.png b/application-swing/src/main/resources/icons/action-select.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-select.png rename to application-swing/src/main/resources/icons/action-select.png diff --git a/observe-application-swing/src/main/resources/icons/action-show-help.png b/application-swing/src/main/resources/icons/action-show-help.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-show-help.png rename to application-swing/src/main/resources/icons/action-show-help.png diff --git a/observe-application-swing/src/main/resources/icons/action-show-informations.png b/application-swing/src/main/resources/icons/action-show-informations.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-show-informations.png rename to application-swing/src/main/resources/icons/action-show-informations.png diff --git a/observe-application-swing/src/main/resources/icons/action-show-keys.png b/application-swing/src/main/resources/icons/action-show-keys.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-show-keys.png rename to application-swing/src/main/resources/icons/action-show-keys.png diff --git a/observe-application-swing/src/main/resources/icons/action-show-usages.png b/application-swing/src/main/resources/icons/action-show-usages.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-show-usages.png rename to application-swing/src/main/resources/icons/action-show-usages.png diff --git a/observe-application-swing/src/main/resources/icons/action-site.png b/application-swing/src/main/resources/icons/action-site.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-site.png rename to application-swing/src/main/resources/icons/action-site.png diff --git a/observe-application-swing/src/main/resources/icons/action-skipFromLeft.png b/application-swing/src/main/resources/icons/action-skipFromLeft.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-skipFromLeft.png rename to application-swing/src/main/resources/icons/action-skipFromLeft.png diff --git a/observe-application-swing/src/main/resources/icons/action-skipFromRight.png b/application-swing/src/main/resources/icons/action-skipFromRight.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-skipFromRight.png rename to application-swing/src/main/resources/icons/action-skipFromRight.png diff --git a/observe-application-swing/src/main/resources/icons/action-synch.png b/application-swing/src/main/resources/icons/action-synch.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synch.png rename to application-swing/src/main/resources/icons/action-synch.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchro-pause.png b/application-swing/src/main/resources/icons/action-synchro-pause.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchro-pause.png rename to application-swing/src/main/resources/icons/action-synchro-pause.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchro-start.png b/application-swing/src/main/resources/icons/action-synchro-start.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchro-start.png rename to application-swing/src/main/resources/icons/action-synchro-start.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchro-stop.png b/application-swing/src/main/resources/icons/action-synchro-stop.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchro-stop.png rename to application-swing/src/main/resources/icons/action-synchro-stop.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchroAdd.png b/application-swing/src/main/resources/icons/action-synchroAdd.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchroAdd.png rename to application-swing/src/main/resources/icons/action-synchroAdd.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchroDelete.png b/application-swing/src/main/resources/icons/action-synchroDelete.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchroDelete.png rename to application-swing/src/main/resources/icons/action-synchroDelete.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchroRevert.png b/application-swing/src/main/resources/icons/action-synchroRevert.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchroRevert.png rename to application-swing/src/main/resources/icons/action-synchroRevert.png diff --git a/observe-application-swing/src/main/resources/icons/action-synchroUpdate.png b/application-swing/src/main/resources/icons/action-synchroUpdate.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-synchroUpdate.png rename to application-swing/src/main/resources/icons/action-synchroUpdate.png diff --git a/observe-application-swing/src/main/resources/icons/action-translate.png b/application-swing/src/main/resources/icons/action-translate.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-translate.png rename to application-swing/src/main/resources/icons/action-translate.png diff --git a/observe-application-swing/src/main/resources/icons/action-ui-reload.png b/application-swing/src/main/resources/icons/action-ui-reload.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-ui-reload.png rename to application-swing/src/main/resources/icons/action-ui-reload.png diff --git a/observe-application-swing/src/main/resources/icons/action-unconnected.png b/application-swing/src/main/resources/icons/action-unconnected.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-unconnected.png rename to application-swing/src/main/resources/icons/action-unconnected.png diff --git a/observe-application-swing/src/main/resources/icons/action-unselect.png b/application-swing/src/main/resources/icons/action-unselect.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-unselect.png rename to application-swing/src/main/resources/icons/action-unselect.png diff --git a/observe-application-swing/src/main/resources/icons/action-validate.png b/application-swing/src/main/resources/icons/action-validate.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-validate.png rename to application-swing/src/main/resources/icons/action-validate.png diff --git a/observe-application-swing/src/main/resources/icons/action-verify-equation.png b/application-swing/src/main/resources/icons/action-verify-equation.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/action-verify-equation.png rename to application-swing/src/main/resources/icons/action-verify-equation.png diff --git a/observe-application-swing/src/main/resources/icons/logo OT_rvb.png b/application-swing/src/main/resources/icons/logo OT_rvb.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/logo OT_rvb.png rename to application-swing/src/main/resources/icons/logo OT_rvb.png diff --git a/observe-application-swing/src/main/resources/icons/logo-OT_web.png b/application-swing/src/main/resources/icons/logo-OT_web.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/logo-OT_web.png rename to application-swing/src/main/resources/icons/logo-OT_web.png diff --git a/observe-application-swing/src/main/resources/icons/logo_ird.png b/application-swing/src/main/resources/icons/logo_ird.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/logo_ird.png rename to application-swing/src/main/resources/icons/logo_ird.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/activite.png b/application-swing/src/main/resources/icons/navigation/activite.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/activite.png rename to application-swing/src/main/resources/icons/navigation/activite.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/bateau.png b/application-swing/src/main/resources/icons/navigation/bateau.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/bateau.png rename to application-swing/src/main/resources/icons/navigation/bateau.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/calee.png b/application-swing/src/main/resources/icons/navigation/calee.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/calee.png rename to application-swing/src/main/resources/icons/navigation/calee.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/activity16.png b/application-swing/src/main/resources/icons/navigation/ird/activity16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/activity16.png rename to application-swing/src/main/resources/icons/navigation/ird/activity16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/activity24.png b/application-swing/src/main/resources/icons/navigation/ird/activity24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/activity24.png rename to application-swing/src/main/resources/icons/navigation/ird/activity24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png b/application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png rename to application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png b/application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png rename to application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png b/application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png rename to application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png b/application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png rename to application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/program16.png b/application-swing/src/main/resources/icons/navigation/ird/program16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/program16.png rename to application-swing/src/main/resources/icons/navigation/ird/program16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/program24.png b/application-swing/src/main/resources/icons/navigation/ird/program24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/program24.png rename to application-swing/src/main/resources/icons/navigation/ird/program24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/referentiel16.png b/application-swing/src/main/resources/icons/navigation/ird/referentiel16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/referentiel16.png rename to application-swing/src/main/resources/icons/navigation/ird/referentiel16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/referentiel24.png b/application-swing/src/main/resources/icons/navigation/ird/referentiel24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/referentiel24.png rename to application-swing/src/main/resources/icons/navigation/ird/referentiel24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/route16.png b/application-swing/src/main/resources/icons/navigation/ird/route16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/route16.png rename to application-swing/src/main/resources/icons/navigation/ird/route16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/route24.png b/application-swing/src/main/resources/icons/navigation/ird/route24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/route24.png rename to application-swing/src/main/resources/icons/navigation/ird/route24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/set16.png b/application-swing/src/main/resources/icons/navigation/ird/set16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/set16.png rename to application-swing/src/main/resources/icons/navigation/ird/set16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/set24.png b/application-swing/src/main/resources/icons/navigation/ird/set24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/set24.png rename to application-swing/src/main/resources/icons/navigation/ird/set24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png b/application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png rename to application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png b/application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png rename to application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png b/application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png rename to application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/sub_set16.png b/application-swing/src/main/resources/icons/navigation/ird/sub_set16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/sub_set16.png rename to application-swing/src/main/resources/icons/navigation/ird/sub_set16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/sub_set24.png b/application-swing/src/main/resources/icons/navigation/ird/sub_set24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/sub_set24.png rename to application-swing/src/main/resources/icons/navigation/ird/sub_set24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/trip16.png b/application-swing/src/main/resources/icons/navigation/ird/trip16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/trip16.png rename to application-swing/src/main/resources/icons/navigation/ird/trip16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ird/trip24.png b/application-swing/src/main/resources/icons/navigation/ird/trip24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ird/trip24.png rename to application-swing/src/main/resources/icons/navigation/ird/trip24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/maree.png b/application-swing/src/main/resources/icons/navigation/maree.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/maree.png rename to application-swing/src/main/resources/icons/navigation/maree.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/objetFlottant.png b/application-swing/src/main/resources/icons/navigation/objetFlottant.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/objetFlottant.png rename to application-swing/src/main/resources/icons/navigation/objetFlottant.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/observateur.png b/application-swing/src/main/resources/icons/navigation/observateur.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/observateur.png rename to application-swing/src/main/resources/icons/navigation/observateur.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/ocean.png b/application-swing/src/main/resources/icons/navigation/ocean.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/ocean.png rename to application-swing/src/main/resources/icons/navigation/ocean.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_a 24.png b/application-swing/src/main/resources/icons/navigation/picto_a 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_a 24.png rename to application-swing/src/main/resources/icons/navigation/picto_a 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_b 16.png b/application-swing/src/main/resources/icons/navigation/picto_b 16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_b 16.png rename to application-swing/src/main/resources/icons/navigation/picto_b 16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_b 24.png b/application-swing/src/main/resources/icons/navigation/picto_b 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_b 24.png rename to application-swing/src/main/resources/icons/navigation/picto_b 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_c 16.png b/application-swing/src/main/resources/icons/navigation/picto_c 16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_c 16.png rename to application-swing/src/main/resources/icons/navigation/picto_c 16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_c 24.png b/application-swing/src/main/resources/icons/navigation/picto_c 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_c 24.png rename to application-swing/src/main/resources/icons/navigation/picto_c 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_d 16.png b/application-swing/src/main/resources/icons/navigation/picto_d 16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_d 16.png rename to application-swing/src/main/resources/icons/navigation/picto_d 16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_d 24.png b/application-swing/src/main/resources/icons/navigation/picto_d 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_d 24.png rename to application-swing/src/main/resources/icons/navigation/picto_d 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_e 24.png b/application-swing/src/main/resources/icons/navigation/picto_e 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_e 24.png rename to application-swing/src/main/resources/icons/navigation/picto_e 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_f 16.png b/application-swing/src/main/resources/icons/navigation/picto_f 16.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_f 16.png rename to application-swing/src/main/resources/icons/navigation/picto_f 16.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/picto_f 24.png b/application-swing/src/main/resources/icons/navigation/picto_f 24.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/picto_f 24.png rename to application-swing/src/main/resources/icons/navigation/picto_f 24.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/programme.png b/application-swing/src/main/resources/icons/navigation/programme.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/programme.png rename to application-swing/src/main/resources/icons/navigation/programme.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/route.png b/application-swing/src/main/resources/icons/navigation/route.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/route.png rename to application-swing/src/main/resources/icons/navigation/route.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/senne.png b/application-swing/src/main/resources/icons/navigation/senne.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/senne.png rename to application-swing/src/main/resources/icons/navigation/senne.png diff --git a/observe-application-swing/src/main/resources/icons/navigation/systemeObserve.png b/application-swing/src/main/resources/icons/navigation/systemeObserve.png similarity index 100% rename from observe-application-swing/src/main/resources/icons/navigation/systemeObserve.png rename to application-swing/src/main/resources/icons/navigation/systemeObserve.png diff --git a/observe-application-swing/src/main/resources/log4j.properties b/application-swing/src/main/resources/log4j.properties similarity index 100% rename from observe-application-swing/src/main/resources/log4j.properties rename to application-swing/src/main/resources/log4j.properties diff --git a/observe-application-swing/src/main/resources/observe-log4j.properties b/application-swing/src/main/resources/observe-log4j.properties similarity index 100% rename from observe-application-swing/src/main/resources/observe-log4j.properties rename to application-swing/src/main/resources/observe-log4j.properties diff --git a/observe-application-swing/src/main/resources/observeSwing.conf b/application-swing/src/main/resources/observeSwing.conf similarity index 100% rename from observe-application-swing/src/main/resources/observeSwing.conf rename to application-swing/src/main/resources/observeSwing.conf diff --git a/observe-application-swing/src/main/resources/validators.xml b/application-swing/src/main/resources/validators.xml similarity index 100% rename from observe-application-swing/src/main/resources/validators.xml rename to application-swing/src/main/resources/validators.xml diff --git a/observe-application-swing/src/main/ssl/cacert.jks b/application-swing/src/main/ssl/cacert.jks similarity index 100% rename from observe-application-swing/src/main/ssl/cacert.jks rename to application-swing/src/main/ssl/cacert.jks diff --git a/observe-application-swing/src/main/ssl/server.crt b/application-swing/src/main/ssl/server.crt similarity index 100% rename from observe-application-swing/src/main/ssl/server.crt rename to application-swing/src/main/ssl/server.crt diff --git a/observe-application-swing/src/main/ssl/server.key b/application-swing/src/main/ssl/server.key similarity index 100% rename from observe-application-swing/src/main/ssl/server.key rename to application-swing/src/main/ssl/server.key diff --git a/observe-application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java similarity index 100% rename from observe-application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java rename to application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java diff --git a/observe-application-swing/src/test/resources/log4j.properties b/application-swing/src/test/resources/log4j.properties similarity index 100% rename from observe-application-swing/src/test/resources/log4j.properties rename to application-swing/src/test/resources/log4j.properties diff --git a/observe-services-topia/LICENSE.txt b/application-web/LICENSE.txt similarity index 100% rename from observe-services-topia/LICENSE.txt rename to application-web/LICENSE.txt diff --git a/observe-services-configuration-rest/README.md b/application-web/README.md similarity index 100% rename from observe-services-configuration-rest/README.md rename to application-web/README.md diff --git a/observe-application-web/pom.xml b/application-web/pom.xml similarity index 93% rename from observe-application-web/pom.xml rename to application-web/pom.xml index 2a1ab46..fa8afb8 100644 --- a/observe-application-web/pom.xml +++ b/application-web/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-application-web</artifactId> + <artifactId>application-web</artifactId> <name>ObServe :: Application Web</name> <description>ObServe Application Web</description> @@ -36,32 +36,32 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> <!--dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-topia</artifactId> + <artifactId>services-configuration-topia</artifactId> <version>${project.version}</version> </dependency--> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-rest</artifactId> + <artifactId>services-configuration-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-runner</artifactId> + <artifactId>services-runner</artifactId> <version>${project.version}</version> </dependency> @@ -215,7 +215,7 @@ <plugin> <groupId>fr.ird.observe</groupId> - <artifactId>observe-check-api-maven-plugin</artifactId> + <artifactId>check-api-maven-plugin</artifactId> <version>${project.version}</version> <executions> <execution> diff --git a/observe-application-web/src/jetty/jetty-context.xml b/application-web/src/jetty/jetty-context.xml similarity index 100% rename from observe-application-web/src/jetty/jetty-context.xml rename to application-web/src/jetty/jetty-context.xml diff --git a/observe-application-web/src/license/THIRD-PARTY.properties b/application-web/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-application-web/src/license/THIRD-PARTY.properties rename to application-web/src/license/THIRD-PARTY.properties diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java diff --git a/observe-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 similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java diff --git a/observe-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 similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java rename to application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java rename to application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java diff --git a/observe-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 similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java b/application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java rename to application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java diff --git a/observe-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 similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java diff --git a/observe-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 similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java rename to application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java rename to application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java rename to application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java similarity index 100% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java rename to application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java diff --git a/observe-application-web/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/application-web/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider similarity index 100% rename from observe-application-web/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider rename to application-web/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider diff --git a/observe-application-web/src/main/resources/log4j.properties b/application-web/src/main/resources/log4j.properties similarity index 100% rename from observe-application-web/src/main/resources/log4j.properties rename to application-web/src/main/resources/log4j.properties diff --git a/observe-application-web/src/main/resources/mapping b/application-web/src/main/resources/mapping similarity index 100% rename from observe-application-web/src/main/resources/mapping rename to application-web/src/main/resources/mapping diff --git a/observe-application-web/src/main/resources/observeweb-log4j.conf b/application-web/src/main/resources/observeweb-log4j.conf similarity index 100% rename from observe-application-web/src/main/resources/observeweb-log4j.conf rename to application-web/src/main/resources/observeweb-log4j.conf diff --git a/observe-application-web/src/main/resources/observeweb.conf b/application-web/src/main/resources/observeweb.conf similarity index 100% rename from observe-application-web/src/main/resources/observeweb.conf rename to application-web/src/main/resources/observeweb.conf diff --git a/observe-application-web/src/main/resources/validators.xml b/application-web/src/main/resources/validators.xml similarity index 100% rename from observe-application-web/src/main/resources/validators.xml rename to application-web/src/main/resources/validators.xml diff --git a/observe-application-web/src/main/webapp/WEB-INF/web.xml b/application-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from observe-application-web/src/main/webapp/WEB-INF/web.xml rename to application-web/src/main/webapp/WEB-INF/web.xml diff --git a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java similarity index 100% rename from observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java rename to application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java diff --git a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java similarity index 100% rename from observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java rename to application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java diff --git a/observe-application-web/src/test/resources/observeweb-test.conf b/application-web/src/test/resources/observeweb-test.conf similarity index 100% rename from observe-application-web/src/test/resources/observeweb-test.conf rename to application-web/src/test/resources/observeweb-test.conf diff --git a/observe-services-topia-validation/LICENSE.txt b/check-api-maven-plugin/LICENSE.txt similarity index 100% rename from observe-services-topia-validation/LICENSE.txt rename to check-api-maven-plugin/LICENSE.txt diff --git a/observe-topia-templates-extension/README.md b/check-api-maven-plugin/README.md similarity index 100% rename from observe-topia-templates-extension/README.md rename to check-api-maven-plugin/README.md diff --git a/observe-check-api-maven-plugin/pom.xml b/check-api-maven-plugin/pom.xml similarity index 98% rename from observe-check-api-maven-plugin/pom.xml rename to check-api-maven-plugin/pom.xml index 1b94c82..a67a4da 100644 --- a/observe-check-api-maven-plugin/pom.xml +++ b/check-api-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-check-api-maven-plugin</artifactId> + <artifactId>check-api-maven-plugin</artifactId> <name>ObServe :: Check API maven plugin</name> <description>ObServe Check API maven plugin module</description> diff --git a/observe-check-api-maven-plugin/src/license/THIRD-PARTY.properties b/check-api-maven-plugin/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-check-api-maven-plugin/src/license/THIRD-PARTY.properties rename to check-api-maven-plugin/src/license/THIRD-PARTY.properties diff --git a/observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/CheckApiMojo.java b/check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/CheckApiMojo.java similarity index 100% rename from observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/CheckApiMojo.java rename to check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/CheckApiMojo.java diff --git a/observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MismatchMethodParameterNameException.java b/check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MismatchMethodParameterNameException.java similarity index 100% rename from observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MismatchMethodParameterNameException.java rename to check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MismatchMethodParameterNameException.java diff --git a/observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java b/check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java similarity index 100% rename from observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java rename to check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingClassException.java diff --git a/observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingMethodException.java b/check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingMethodException.java similarity index 100% rename from observe-check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingMethodException.java rename to check-api-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingMethodException.java diff --git a/observe-services-runner/LICENSE.txt b/entities-migration/LICENSE.txt similarity index 100% rename from observe-services-runner/LICENSE.txt rename to entities-migration/LICENSE.txt diff --git a/observe-topia-extension/README.md b/entities-migration/README.md similarity index 100% rename from observe-topia-extension/README.md rename to entities-migration/README.md diff --git a/observe-entities-migration/pom.xml b/entities-migration/pom.xml similarity index 97% rename from observe-entities-migration/pom.xml rename to entities-migration/pom.xml index 6bf68d1..384cd94 100644 --- a/observe-entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -31,7 +31,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-entities-migration</artifactId> + <artifactId>entities-migration</artifactId> <name>ObServe :: Entities Migration</name> <description>ObServe entities migration module</description> @@ -41,7 +41,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> + <artifactId>entities</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-topia-templates-extension/src/license/THIRD-PARTY.properties b/entities-migration/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-topia-templates-extension/src/license/THIRD-PARTY.properties rename to entities-migration/src/license/THIRD-PARTY.properties diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java diff --git a/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java similarity index 100% rename from observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java diff --git a/observe-entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider b/entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider similarity index 100% rename from observe-entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider rename to entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider diff --git a/observe-entities-migration/src/main/resources/db/3.5/constrainsts.csv b/entities-migration/src/main/resources/db/3.5/constrainsts.csv similarity index 100% rename from observe-entities-migration/src/main/resources/db/3.5/constrainsts.csv rename to entities-migration/src/main/resources/db/3.5/constrainsts.csv diff --git a/observe-entities-migration/src/main/resources/db/3.5/traduction_attributes.csv b/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv similarity index 100% rename from observe-entities-migration/src/main/resources/db/3.5/traduction_attributes.csv rename to entities-migration/src/main/resources/db/3.5/traduction_attributes.csv diff --git a/observe-entities-migration/src/main/resources/db/3.5/traduction_tables.csv b/entities-migration/src/main/resources/db/3.5/traduction_tables.csv similarity index 100% rename from observe-entities-migration/src/main/resources/db/3.5/traduction_tables.csv rename to entities-migration/src/main/resources/db/3.5/traduction_tables.csv diff --git a/observe-entities-migration/src/main/resources/db/3.5/traduction_tables2.csv b/entities-migration/src/main/resources/db/3.5/traduction_tables2.csv similarity index 100% rename from observe-entities-migration/src/main/resources/db/3.5/traduction_tables2.csv rename to entities-migration/src/main/resources/db/3.5/traduction_tables2.csv diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql b/entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql b/entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql b/entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql b/entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql b/entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql b/entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql b/entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql b/entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql b/entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql b/entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql b/entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql b/entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql b/entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql b/entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql b/entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql b/entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql b/entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql b/entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql b/entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql b/entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql b/entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql b/entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql b/entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql b/entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql b/entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql b/entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql b/entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql b/entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql b/entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql b/entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql b/entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql b/entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql b/entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql b/entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql b/entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql b/entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql b/entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql b/entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql b/entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql b/entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql b/entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql b/entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql b/entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql b/entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql b/entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql b/entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql b/entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql b/entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql b/entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql b/entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql b/entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql b/entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql b/entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql b/entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql b/entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql rename to entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql b/entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql rename to entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql b/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql b/entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql b/entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql b/entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql b/entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql b/entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql b/entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql b/entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql b/entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql b/entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql b/entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql b/entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql b/entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql b/entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql rename to entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql diff --git a/observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql b/entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql similarity index 100% rename from observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql rename to entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql diff --git a/observe-entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java b/entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java similarity index 100% rename from observe-entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java rename to entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java diff --git a/observe-services-topia-validation/src/test/resources/log4j.properties b/entities-migration/src/test/resources/log4j.properties similarity index 100% rename from observe-services-topia-validation/src/test/resources/log4j.properties rename to entities-migration/src/test/resources/log4j.properties diff --git a/observe-services-rest/LICENSE.txt b/entities/LICENSE.txt similarity index 100% rename from observe-services-rest/LICENSE.txt rename to entities/LICENSE.txt diff --git a/observe-services-topia-validation/README.md b/entities/README.md similarity index 100% rename from observe-services-topia-validation/README.md rename to entities/README.md diff --git a/observe-entities/pom.xml b/entities/pom.xml similarity index 98% rename from observe-entities/pom.xml rename to entities/pom.xml index 37514f9..27e9dbc 100644 --- a/observe-entities/pom.xml +++ b/entities/pom.xml @@ -31,7 +31,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-entities</artifactId> + <artifactId>entities</artifactId> <name>ObServe :: Entities</name> <description>ObServe entities module</description> @@ -41,7 +41,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-topia-extension</artifactId> + <artifactId>topia-extension</artifactId> <version>${project.version}</version> </dependency> @@ -260,7 +260,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-topia-templates-extension</artifactId> + <artifactId>topia-templates-extension</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> diff --git a/observe-topia-extension/src/license/THIRD-PARTY.properties b/entities/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-topia-extension/src/license/THIRD-PARTY.properties rename to entities/src/license/THIRD-PARTY.properties diff --git a/observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java b/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java rename to entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java rename to entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java rename to entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java rename to entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java rename to entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java rename to entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java diff --git a/observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java b/entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java rename to entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java diff --git a/observe-entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java b/entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java rename to entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java b/entities/src/main/java/fr/ird/observe/entities/Activity.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/Activity.java rename to entities/src/main/java/fr/ird/observe/entities/Activity.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/entities/src/main/java/fr/ird/observe/entities/Entities.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/Entities.java rename to entities/src/main/java/fr/ird/observe/entities/Entities.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/EntityMap.java b/entities/src/main/java/fr/ird/observe/entities/EntityMap.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/EntityMap.java rename to entities/src/main/java/fr/ird/observe/entities/EntityMap.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/GPSAble.java b/entities/src/main/java/fr/ird/observe/entities/GPSAble.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/GPSAble.java rename to entities/src/main/java/fr/ird/observe/entities/GPSAble.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java b/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java rename to entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java b/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java rename to entities/src/main/java/fr/ird/observe/entities/ObserveSet.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java b/entities/src/main/java/fr/ird/observe/entities/Trip.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/Trip.java rename to entities/src/main/java/fr/ird/observe/entities/Trip.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java b/entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java rename to entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Trips.java b/entities/src/main/java/fr/ird/observe/entities/Trips.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/Trips.java rename to entities/src/main/java/fr/ird/observe/entities/Trips.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java b/entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java rename to entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java b/entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java rename to entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java rename to entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java b/entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java rename to entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java b/entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java rename to entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java b/entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java rename to entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java b/entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java rename to entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java b/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java rename to entities/src/main/java/fr/ird/observe/entities/longline/Sections.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java rename to entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java rename to entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java rename to entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java rename to entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java rename to entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java rename to entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/Routes.java b/entities/src/main/java/fr/ird/observe/entities/seine/Routes.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/Routes.java rename to entities/src/main/java/fr/ird/observe/entities/seine/Routes.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java rename to entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java similarity index 100% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java rename to entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java diff --git a/observe-entities/src/main/xmi/observe-common.properties b/entities/src/main/xmi/observe-common.properties similarity index 100% rename from observe-entities/src/main/xmi/observe-common.properties rename to entities/src/main/xmi/observe-common.properties diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo similarity index 100% rename from observe-entities/src/main/xmi/observe-common.zargo rename to entities/src/main/xmi/observe-common.zargo diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/entities/src/main/xmi/observe-longline.properties similarity index 100% rename from observe-entities/src/main/xmi/observe-longline.properties rename to entities/src/main/xmi/observe-longline.properties diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/entities/src/main/xmi/observe-longline.zargo similarity index 100% rename from observe-entities/src/main/xmi/observe-longline.zargo rename to entities/src/main/xmi/observe-longline.zargo diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/entities/src/main/xmi/observe-seine.properties similarity index 100% rename from observe-entities/src/main/xmi/observe-seine.properties rename to entities/src/main/xmi/observe-seine.properties diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo similarity index 100% rename from observe-entities/src/main/xmi/observe-seine.zargo rename to entities/src/main/xmi/observe-seine.zargo diff --git a/observe-entities/src/test/java/fr/ird/observe/RelationRegexTest.java b/entities/src/test/java/fr/ird/observe/RelationRegexTest.java similarity index 100% rename from observe-entities/src/test/java/fr/ird/observe/RelationRegexTest.java rename to entities/src/test/java/fr/ird/observe/RelationRegexTest.java diff --git a/observe-entities/src/test/java/fr/ird/observe/ScriptTest.java b/entities/src/test/java/fr/ird/observe/ScriptTest.java similarity index 100% rename from observe-entities/src/test/java/fr/ird/observe/ScriptTest.java rename to entities/src/test/java/fr/ird/observe/ScriptTest.java diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java b/entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java similarity index 100% rename from observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java rename to entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java b/entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java similarity index 100% rename from observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java rename to entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java diff --git a/observe-entities/src/test/resources/log4j.properties b/entities/src/test/resources/log4j.properties similarity index 100% rename from observe-entities/src/test/resources/log4j.properties rename to entities/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index d0d8f45..52d5f10 100644 --- a/pom.xml +++ b/pom.xml @@ -81,25 +81,25 @@ </developers> <modules> - <module>observe-check-api-maven-plugin</module> - <module>observe-topia-extension</module> - <module>observe-topia-templates-extension</module> - <module>observe-services-configuration-api</module> - <module>observe-services-configuration-topia</module> - <module>observe-services-configuration-rest</module> - <module>observe-services-model</module> - <module>observe-services-api</module> - <module>observe-test-data</module> - <module>observe-entities</module> - <module>observe-entities-migration</module> - <module>observe-services-topia-validation</module> - <module>observe-services-topia</module> - <module>observe-services-rest</module> - <module>observe-services-runner</module> - <module>observe-application-web</module> - <module>observe-application-swing-decoration</module> - <module>observe-application-swing-validation</module> - <module>observe-application-swing</module> + <module>check-api-maven-plugin</module> + <module>topia-extension</module> + <module>topia-templates-extension</module> + <module>services-configuration-api</module> + <module>services-configuration-topia</module> + <module>services-configuration-rest</module> + <module>services-model</module> + <module>services-api</module> + <module>test-data</module> + <module>entities</module> + <module>entities-migration</module> + <module>services-topia-validation</module> + <module>services-topia</module> + <module>services-rest</module> + <module>services-runner</module> + <module>application-web</module> + <module>application-swing-decoration</module> + <module>application-swing-validation</module> + <module>application-swing</module> </modules> <!--scm> <url>https://svn.mpl.ird.fr/osiris/observe/trunk</url> diff --git a/observe-services-model/LICENSE.txt b/services-api/LICENSE.txt similarity index 100% rename from observe-services-model/LICENSE.txt rename to services-api/LICENSE.txt diff --git a/observe-services-runner/README.md b/services-api/README.md similarity index 100% rename from observe-services-runner/README.md rename to services-api/README.md diff --git a/observe-services-api/pom.xml b/services-api/pom.xml similarity index 94% rename from observe-services-api/pom.xml rename to services-api/pom.xml index fc8a592..84cbb27 100644 --- a/observe-services-api/pom.xml +++ b/services-api/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <name>ObServe :: Services API</name> <description>ObServe services API module</description> @@ -20,12 +20,12 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-api/src/license/THIRD-PARTY.properties b/services-api/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-api/src/license/THIRD-PARTY.properties rename to services-api/src/license/THIRD-PARTY.properties diff --git a/observe-services-api/src/main/filters/observe-reports.properties b/services-api/src/main/filters/observe-reports.properties similarity index 100% rename from observe-services-api/src/main/filters/observe-reports.properties rename to services-api/src/main/filters/observe-reports.properties diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java b/services-api/src/main/java/fr/ird/observe/services/ObserveService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java b/services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java rename to services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java b/services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename to services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java b/services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java rename to services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java b/services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java rename to services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java b/services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java rename to services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java b/services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java rename to services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java b/services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java rename to services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java b/services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java rename to services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java b/services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java b/services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java rename to services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java b/services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java rename to services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java rename to services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java b/services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java rename to services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java b/services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java rename to services-api/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java b/services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java rename to services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java b/services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java rename to services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java b/services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java rename to services-api/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java b/services-api/src/main/java/fr/ird/observe/services/service/PingService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java rename to services-api/src/main/java/fr/ird/observe/services/service/PingService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java rename to services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java b/services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java rename to services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResults.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDto.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java rename to services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java rename to services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java b/services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java rename to services-api/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java b/services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java rename to services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java b/services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java rename to services-api/src/main/java/fr/ird/observe/services/spi/NoDataAccess.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java b/services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java rename to services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java b/services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java rename to services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java b/services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java rename to services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/Write.java b/services-api/src/main/java/fr/ird/observe/services/spi/Write.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/Write.java rename to services-api/src/main/java/fr/ird/observe/services/spi/Write.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java b/services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java rename to services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java b/services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java similarity index 100% rename from observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java rename to services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java diff --git a/observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation b/services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation similarity index 100% rename from observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation rename to services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation diff --git a/observe-services-api/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json b/services-api/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json similarity index 100% rename from observe-services-api/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json rename to services-api/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json diff --git a/observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java b/services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java similarity index 100% rename from observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java rename to services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java diff --git a/observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties b/services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties similarity index 100% rename from observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties rename to services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties diff --git a/observe-services-runner/src/test/resources/log4j.properties b/services-api/src/test/resources/log4j.properties similarity index 100% rename from observe-services-runner/src/test/resources/log4j.properties rename to services-api/src/test/resources/log4j.properties diff --git a/observe-services-configuration-topia/LICENSE.txt b/services-configuration-api/LICENSE.txt similarity index 100% rename from observe-services-configuration-topia/LICENSE.txt rename to services-configuration-api/LICENSE.txt diff --git a/observe-services-model/README.md b/services-configuration-api/README.md similarity index 100% rename from observe-services-model/README.md rename to services-configuration-api/README.md diff --git a/observe-services-configuration-api/pom.xml b/services-configuration-api/pom.xml similarity index 94% rename from observe-services-configuration-api/pom.xml rename to services-configuration-api/pom.xml index bad9429..1598e71 100644 --- a/observe-services-configuration-api/pom.xml +++ b/services-configuration-api/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <name>ObServe :: Services Configuration API</name> <description>ObServe services Configuration API module</description> diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java b/services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java similarity index 100% rename from observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java rename to services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java diff --git a/observe-services-rest/src/test/resources/log4j.properties b/services-configuration-api/src/test/resources/log4j.properties similarity index 100% rename from observe-services-rest/src/test/resources/log4j.properties rename to services-configuration-api/src/test/resources/log4j.properties diff --git a/observe-services-configuration-rest/LICENSE.txt b/services-configuration-rest/LICENSE.txt similarity index 100% rename from observe-services-configuration-rest/LICENSE.txt rename to services-configuration-rest/LICENSE.txt diff --git a/observe-application-web/README.md b/services-configuration-rest/README.md similarity index 100% rename from observe-application-web/README.md rename to services-configuration-rest/README.md diff --git a/observe-services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml similarity index 88% rename from observe-services-configuration-rest/pom.xml rename to services-configuration-rest/pom.xml index feed008..61afe48 100644 --- a/observe-services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-configuration-rest</artifactId> + <artifactId>services-configuration-rest</artifactId> <name>ObServe :: Services REST Configuration</name> <description>ObServe services REST Configuration</description> @@ -20,7 +20,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-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/ObserveDataSourceConfigurationRest.java similarity index 100% rename from observe-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/ObserveDataSourceConfigurationRest.java diff --git a/observe-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/ObserveDataSourceConfigurationRestConstants.java similarity index 100% rename from observe-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/ObserveDataSourceConfigurationRestConstants.java diff --git a/observe-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/ObserveDataSourceConnectionRest.java similarity index 100% rename from observe-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/ObserveDataSourceConnectionRest.java diff --git a/observe-services-configuration-api/LICENSE.txt b/services-configuration-topia/LICENSE.txt similarity index 100% rename from observe-services-configuration-api/LICENSE.txt rename to services-configuration-topia/LICENSE.txt diff --git a/observe-application-swing/README.md b/services-configuration-topia/README.md similarity index 100% rename from observe-application-swing/README.md rename to services-configuration-topia/README.md diff --git a/observe-services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml similarity index 88% rename from observe-services-configuration-topia/pom.xml rename to services-configuration-topia/pom.xml index 65c6b0b..ff51a33 100644 --- a/observe-services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-configuration-topia</artifactId> + <artifactId>services-configuration-topia</artifactId> <name>ObServe :: Services ToPIA Configuration</name> <description>ObServe services ToPIA Configuration</description> @@ -20,7 +20,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-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/ObserveDataSourceConfigurationTopiaH2.java similarity index 100% rename from observe-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/ObserveDataSourceConfigurationTopiaH2.java diff --git a/observe-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/ObserveDataSourceConfigurationTopiaPG.java similarity index 100% rename from observe-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/ObserveDataSourceConfigurationTopiaPG.java diff --git a/observe-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/ObserveDataSourceConfigurationTopiaSupport.java similarity index 100% rename from observe-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/ObserveDataSourceConfigurationTopiaSupport.java diff --git a/observe-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/ObserveDataSourceConnectionTopia.java similarity index 100% rename from observe-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/ObserveDataSourceConnectionTopia.java diff --git a/observe-services-api/LICENSE.txt b/services-model/LICENSE.txt similarity index 100% rename from observe-services-api/LICENSE.txt rename to services-model/LICENSE.txt diff --git a/observe-services-configuration-api/README.md b/services-model/README.md similarity index 100% rename from observe-services-configuration-api/README.md rename to services-model/README.md diff --git a/observe-services-model/pom.xml b/services-model/pom.xml similarity index 97% rename from observe-services-model/pom.xml rename to services-model/pom.xml index 9845489..691e8a8 100644 --- a/observe-services-model/pom.xml +++ b/services-model/pom.xml @@ -32,7 +32,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <name>ObServe :: Services model</name> <description>ObServe services model module</description> @@ -42,7 +42,7 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-model/src/license/THIRD-PARTY.properties b/services-model/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-model/src/license/THIRD-PARTY.properties rename to services-model/src/license/THIRD-PARTY.properties diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java rename to services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java rename to services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java rename to services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java rename to services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java rename to services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/Form.java b/services-model/src/main/java/fr/ird/observe/services/dto/Form.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/Form.java rename to services-model/src/main/java/fr/ird/observe/services/dto/Form.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java b/services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java rename to services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java b/services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java rename to services-model/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java b/services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java rename to services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java b/services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java rename to services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java rename to services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java rename to services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java rename to services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename to services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java rename to services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java rename to services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java rename to services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java rename to services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java rename to services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java diff --git a/observe-services-model/src/main/java/fr/ird/observe/util/GPSPoint.java b/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java similarity index 100% rename from observe-services-model/src/main/java/fr/ird/observe/util/GPSPoint.java rename to services-model/src/main/java/fr/ird/observe/util/GPSPoint.java diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/services-model/src/main/xmi/observe-services-dto-common.properties similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-common.properties rename to services-model/src/main/xmi/observe-services-dto-common.properties diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/services-model/src/main/xmi/observe-services-dto-common.zargo similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-common.zargo rename to services-model/src/main/xmi/observe-services-dto-common.zargo diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/services-model/src/main/xmi/observe-services-dto-longline.properties similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-longline.properties rename to services-model/src/main/xmi/observe-services-dto-longline.properties diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/services-model/src/main/xmi/observe-services-dto-longline.zargo similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-longline.zargo rename to services-model/src/main/xmi/observe-services-dto-longline.zargo diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties b/services-model/src/main/xmi/observe-services-dto-seine.properties similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-seine.properties rename to services-model/src/main/xmi/observe-services-dto-seine.properties diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/services-model/src/main/xmi/observe-services-dto-seine.zargo similarity index 100% rename from observe-services-model/src/main/xmi/observe-services-dto-seine.zargo rename to services-model/src/main/xmi/observe-services-dto-seine.zargo diff --git a/observe-entities/LICENSE.txt b/services-rest/LICENSE.txt similarity index 100% rename from observe-entities/LICENSE.txt rename to services-rest/LICENSE.txt diff --git a/observe-application-swing-validation/README.md b/services-rest/README.md similarity index 100% rename from observe-application-swing-validation/README.md rename to services-rest/README.md diff --git a/observe-services-rest/pom.xml b/services-rest/pom.xml similarity index 89% rename from observe-services-rest/pom.xml rename to services-rest/pom.xml index 7d7c23d..1052164 100644 --- a/observe-services-rest/pom.xml +++ b/services-rest/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest</artifactId> + <artifactId>services-rest</artifactId> <name>ObServe :: Services REST Implementation</name> <description>ObServe services REST Implementation</description> @@ -20,27 +20,27 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-rest</artifactId> + <artifactId>services-configuration-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-test-data</artifactId> + <artifactId>test-data</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/observe-services-rest/src/license/THIRD-PARTY.properties b/services-rest/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-rest/src/license/THIRD-PARTY.properties rename to services-rest/src/license/THIRD-PARTY.properties diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java b/services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java rename to services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java b/services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java rename to services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java rename to services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java b/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java rename to services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java b/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java rename to services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java b/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java rename to services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java rename to services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java b/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java rename to services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java b/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java rename to services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java similarity index 100% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java rename to services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java diff --git a/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% rename from observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename to services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java rename to services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java rename to services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java similarity index 100% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java diff --git a/observe-services-configuration-api/src/test/resources/log4j.properties b/services-rest/src/test/resources/log4j.properties similarity index 100% rename from observe-services-configuration-api/src/test/resources/log4j.properties rename to services-rest/src/test/resources/log4j.properties diff --git a/observe-entities-migration/LICENSE.txt b/services-runner/LICENSE.txt similarity index 100% rename from observe-entities-migration/LICENSE.txt rename to services-runner/LICENSE.txt diff --git a/observe-services-api/README.md b/services-runner/README.md similarity index 100% rename from observe-services-api/README.md rename to services-runner/README.md diff --git a/observe-services-runner/pom.xml b/services-runner/pom.xml similarity index 84% rename from observe-services-runner/pom.xml rename to services-runner/pom.xml index 34b782a..2e5572e 100644 --- a/observe-services-runner/pom.xml +++ b/services-runner/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-runner</artifactId> + <artifactId>services-runner</artifactId> <name>ObServe :: Services Runner</name> <description>ObServe services runner</description> @@ -20,33 +20,33 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-rest</artifactId> + <artifactId>services-configuration-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-topia</artifactId> + <artifactId>services-configuration-topia</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-rest</artifactId> + <artifactId>services-rest</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-topia</artifactId> + <artifactId>services-topia</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> diff --git a/observe-services-runner/src/license/THIRD-PARTY.properties b/services-runner/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-runner/src/license/THIRD-PARTY.properties rename to services-runner/src/license/THIRD-PARTY.properties diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java similarity index 100% rename from observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java rename to services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java b/services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java similarity index 100% rename from observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java rename to services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java diff --git a/observe-services-api/src/test/resources/log4j.properties b/services-runner/src/test/resources/log4j.properties similarity index 100% rename from observe-services-api/src/test/resources/log4j.properties rename to services-runner/src/test/resources/log4j.properties diff --git a/observe-check-api-maven-plugin/LICENSE.txt b/services-topia-validation/LICENSE.txt similarity index 100% rename from observe-check-api-maven-plugin/LICENSE.txt rename to services-topia-validation/LICENSE.txt diff --git a/observe-entities/README.md b/services-topia-validation/README.md similarity index 100% rename from observe-entities/README.md rename to services-topia-validation/README.md diff --git a/observe-services-topia-validation/pom.xml b/services-topia-validation/pom.xml similarity index 95% rename from observe-services-topia-validation/pom.xml rename to services-topia-validation/pom.xml index e4acd0c..deca19b 100644 --- a/observe-services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -32,7 +32,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-topia-validation</artifactId> + <artifactId>services-topia-validation</artifactId> <name>ObServe :: Services ToPIA validation</name> <description>ObServe Services ToPIA Validation module</description> @@ -43,17 +43,17 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> + <artifactId>entities</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/observe-services-topia-validation/src/license/THIRD-PARTY.properties b/services-topia-validation/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-topia-validation/src/license/THIRD-PARTY.properties rename to services-topia-validation/src/license/THIRD-PARTY.properties diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java diff --git a/observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java similarity index 100% rename from observe-services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java rename to services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-encounter-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-encounter-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-encounter-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-encounter-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-sensorUsed-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-sensorUsed-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-sensorUsed-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-sensorUsed-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-service-table-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-service-table-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-service-table-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-service-table-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-catchLongline-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-catchLongline-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-catchLongline-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-catchLongline-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-table-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-table-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-table-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-table-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Section-service-table-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Section-service-table-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Section-service-table-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Section-service-table-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-baitsComposition-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-baitsComposition-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-baitsComposition-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-baitsComposition-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-branchlinesComposition-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-branchlinesComposition-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-branchlinesComposition-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-branchlinesComposition-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-floatlinesComposition-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-floatlinesComposition-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-floatlinesComposition-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-floatlinesComposition-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-globalComposition-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-globalComposition-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-globalComposition-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-globalComposition-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-hooksComposition-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-hooksComposition-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-hooksComposition-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-hooksComposition-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-transmittingBuoyOperation-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-transmittingBuoyOperation-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-transmittingBuoyOperation-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-transmittingBuoyOperation-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-nonTargetCatch-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-nonTargetCatch-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-nonTargetCatch-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-nonTargetCatch-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-schoolEstimate-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-schoolEstimate-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-schoolEstimate-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-schoolEstimate-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetCatch-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetCatch-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetCatch-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetCatch-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetDiscarded-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetDiscarded-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetDiscarded-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetDiscarded-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-error-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-warning-validation.xml similarity index 100% rename from observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-warning-validation.xml diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties similarity index 100% rename from observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties rename to services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties similarity index 100% rename from observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties rename to services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties similarity index 100% rename from observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties rename to services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties diff --git a/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java similarity index 100% rename from observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java rename to services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java diff --git a/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/validators/ActivitySeineSpeedValidatorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/validators/ActivitySeineSpeedValidatorTest.java similarity index 100% rename from observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/validators/ActivitySeineSpeedValidatorTest.java rename to services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/validators/ActivitySeineSpeedValidatorTest.java diff --git a/observe-services-topia-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml b/services-topia-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml similarity index 100% rename from observe-services-topia-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml rename to services-topia-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml diff --git a/observe-entities-migration/src/test/resources/log4j.properties b/services-topia-validation/src/test/resources/log4j.properties similarity index 100% rename from observe-entities-migration/src/test/resources/log4j.properties rename to services-topia-validation/src/test/resources/log4j.properties diff --git a/observe-services-topia/src/test/resources/validators.xml b/services-topia-validation/src/test/resources/validators.xml similarity index 100% rename from observe-services-topia/src/test/resources/validators.xml rename to services-topia-validation/src/test/resources/validators.xml diff --git a/observe-application-web/LICENSE.txt b/services-topia/LICENSE.txt similarity index 100% rename from observe-application-web/LICENSE.txt rename to services-topia/LICENSE.txt diff --git a/observe-application-swing-decoration/README.md b/services-topia/README.md similarity index 100% rename from observe-application-swing-decoration/README.md rename to services-topia/README.md diff --git a/observe-services-topia/pom.xml b/services-topia/pom.xml similarity index 91% rename from observe-services-topia/pom.xml rename to services-topia/pom.xml index 497ce95..d5d2231 100644 --- a/observe-services-topia/pom.xml +++ b/services-topia/pom.xml @@ -10,7 +10,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-services-topia</artifactId> + <artifactId>services-topia</artifactId> <name>ObServe :: Services ToPIA Implementation</name> <description>ObServe services ToPIA Implementation</description> @@ -20,44 +20,44 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> + <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> + <artifactId>services-configuration-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> + <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-topia</artifactId> + <artifactId>services-configuration-topia</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> + <artifactId>entities</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities-migration</artifactId> + <artifactId>entities-migration</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-topia-validation</artifactId> + <artifactId>services-topia-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-test-data</artifactId> + <artifactId>test-data</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -117,7 +117,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-topia-extension</artifactId> + <artifactId>topia-extension</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-topia/src/license/THIRD-PARTY.properties b/services-topia/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-services-topia/src/license/THIRD-PARTY.properties rename to services-topia/src/license/THIRD-PARTY.properties diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java b/services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java b/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java b/services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java b/services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java b/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java rename to services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java b/services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java rename to services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java similarity index 100% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java diff --git a/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% rename from observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename to services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier b/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier similarity index 100% rename from observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier rename to services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties b/services-topia/src/main/resources/i18n/services-topia_en_GB.properties similarity index 100% rename from observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties rename to services-topia/src/main/resources/i18n/services-topia_en_GB.properties diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties b/services-topia/src/main/resources/i18n/services-topia_es_ES.properties similarity index 100% rename from observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties rename to services-topia/src/main/resources/i18n/services-topia_es_ES.properties diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties b/services-topia/src/main/resources/i18n/services-topia_fr_FR.properties similarity index 100% rename from observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties rename to services-topia/src/main/resources/i18n/services-topia_fr_FR.properties diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java rename to services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java b/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java rename to services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java rename to services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java b/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java rename to services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java b/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java rename to services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java rename to services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java rename to services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java rename to services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java rename to services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java b/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java rename to services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java rename to services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java similarity index 100% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java diff --git a/observe-services-topia/src/test/resources/log4j.properties b/services-topia/src/test/resources/log4j.properties similarity index 100% rename from observe-services-topia/src/test/resources/log4j.properties rename to services-topia/src/test/resources/log4j.properties diff --git a/observe-services-topia-validation/src/test/resources/validators.xml b/services-topia/src/test/resources/validators.xml similarity index 100% rename from observe-services-topia-validation/src/test/resources/validators.xml rename to services-topia/src/test/resources/validators.xml diff --git a/observe-application-swing/LICENSE.txt b/test-data/LICENSE.txt similarity index 100% rename from observe-application-swing/LICENSE.txt rename to test-data/LICENSE.txt diff --git a/observe-test-data/README.md b/test-data/README.md similarity index 100% rename from observe-test-data/README.md rename to test-data/README.md diff --git a/observe-test-data/pom.xml b/test-data/pom.xml similarity index 98% rename from observe-test-data/pom.xml rename to test-data/pom.xml index 54109d2..a9347a5 100644 --- a/observe-test-data/pom.xml +++ b/test-data/pom.xml @@ -30,7 +30,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-test-data</artifactId> + <artifactId>test-data</artifactId> <name>ObServe :: Test data</name> <description>ObServe test data module</description> diff --git a/observe-test-data/src/license/THIRD-PARTY.properties b/test-data/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-test-data/src/license/THIRD-PARTY.properties rename to test-data/src/license/THIRD-PARTY.properties diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java b/test-data/src/main/java/fr/ird/observe/test/DatabaseName.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java rename to test-data/src/main/java/fr/ird/observe/test/DatabaseName.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java rename to test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java b/test-data/src/main/java/fr/ird/observe/test/TestHelper.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java rename to test-data/src/main/java/fr/ird/observe/test/TestHelper.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java b/test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java rename to test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java b/test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java rename to test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java b/test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java rename to test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java b/test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java rename to test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java b/test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java rename to test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java b/test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java rename to test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java b/test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java similarity index 100% rename from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java rename to test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz b/test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz rename to test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz b/test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz rename to test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.0.1/empty_h2.sql.gz b/test-data/src/main/resources/db/4.0.1/empty_h2.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0.1/empty_h2.sql.gz rename to test-data/src/main/resources/db/4.0.1/empty_h2.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.0.1/empty_pg.sql.gz b/test-data/src/main/resources/db/4.0.1/empty_pg.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0.1/empty_pg.sql.gz rename to test-data/src/main/resources/db/4.0.1/empty_pg.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.0.1/referentiel.sql.gz b/test-data/src/main/resources/db/4.0.1/referentiel.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0.1/referentiel.sql.gz rename to test-data/src/main/resources/db/4.0.1/referentiel.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.0/referentiel.sql.gz b/test-data/src/main/resources/db/4.0/referentiel.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.0/referentiel.sql.gz rename to test-data/src/main/resources/db/4.0/referentiel.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.902/dataForTestLongline.sql.gz b/test-data/src/main/resources/db/4.902/dataForTestLongline.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.902/dataForTestLongline.sql.gz rename to test-data/src/main/resources/db/4.902/dataForTestLongline.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.902/dataForTestSeine.sql.gz b/test-data/src/main/resources/db/4.902/dataForTestSeine.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.902/dataForTestSeine.sql.gz rename to test-data/src/main/resources/db/4.902/dataForTestSeine.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/empty_h2.sql.gz b/test-data/src/main/resources/db/4.902/empty_h2.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/empty_h2.sql.gz rename to test-data/src/main/resources/db/4.902/empty_h2.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/empty_pg.sql.gz b/test-data/src/main/resources/db/4.902/empty_pg.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/empty_pg.sql.gz rename to test-data/src/main/resources/db/4.902/empty_pg.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.902/referentiel.sql.gz b/test-data/src/main/resources/db/4.902/referentiel.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.902/referentiel.sql.gz rename to test-data/src/main/resources/db/4.902/referentiel.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/dataForTestLongline.sql.gz b/test-data/src/main/resources/db/4.903/dataForTestLongline.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/dataForTestLongline.sql.gz rename to test-data/src/main/resources/db/4.903/dataForTestLongline.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/dataForTestSeine.sql.gz b/test-data/src/main/resources/db/4.903/dataForTestSeine.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/dataForTestSeine.sql.gz rename to test-data/src/main/resources/db/4.903/dataForTestSeine.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz b/test-data/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz rename to test-data/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.902/empty_h2.sql.gz b/test-data/src/main/resources/db/4.903/empty_h2.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.902/empty_h2.sql.gz rename to test-data/src/main/resources/db/4.903/empty_h2.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.902/empty_pg.sql.gz b/test-data/src/main/resources/db/4.903/empty_pg.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.902/empty_pg.sql.gz rename to test-data/src/main/resources/db/4.903/empty_pg.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.903/referentiel.sql.gz b/test-data/src/main/resources/db/4.903/referentiel.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.903/referentiel.sql.gz rename to test-data/src/main/resources/db/4.903/referentiel.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/dataForTestLongline.sql.gz b/test-data/src/main/resources/db/4.904/dataForTestLongline.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/dataForTestLongline.sql.gz rename to test-data/src/main/resources/db/4.904/dataForTestLongline.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/dataForTestSeine.sql.gz b/test-data/src/main/resources/db/4.904/dataForTestSeine.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/dataForTestSeine.sql.gz rename to test-data/src/main/resources/db/4.904/dataForTestSeine.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz b/test-data/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz rename to test-data/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/empty_h2.sql.gz b/test-data/src/main/resources/db/4.904/empty_h2.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/empty_h2.sql.gz rename to test-data/src/main/resources/db/4.904/empty_h2.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/empty_pg.sql.gz b/test-data/src/main/resources/db/4.904/empty_pg.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/empty_pg.sql.gz rename to test-data/src/main/resources/db/4.904/empty_pg.sql.gz diff --git a/observe-test-data/src/main/resources/db/4.904/referentiel.sql.gz b/test-data/src/main/resources/db/4.904/referentiel.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/4.904/referentiel.sql.gz rename to test-data/src/main/resources/db/4.904/referentiel.sql.gz diff --git a/observe-test-data/src/main/resources/db/replication/data.sql.gz b/test-data/src/main/resources/db/replication/data.sql.gz similarity index 100% rename from observe-test-data/src/main/resources/db/replication/data.sql.gz rename to test-data/src/main/resources/db/replication/data.sql.gz diff --git a/observe-test-data/src/main/resources/observetest.properties b/test-data/src/main/resources/observetest.properties similarity index 100% rename from observe-test-data/src/main/resources/observetest.properties rename to test-data/src/main/resources/observetest.properties diff --git a/observe-application-swing-validation/LICENSE.txt b/topia-extension/LICENSE.txt similarity index 100% rename from observe-application-swing-validation/LICENSE.txt rename to topia-extension/LICENSE.txt diff --git a/observe-entities-migration/README.md b/topia-extension/README.md similarity index 100% rename from observe-entities-migration/README.md rename to topia-extension/README.md diff --git a/observe-topia-extension/pom.xml b/topia-extension/pom.xml similarity index 98% rename from observe-topia-extension/pom.xml rename to topia-extension/pom.xml index fc34d14..7e4be18 100644 --- a/observe-topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -31,7 +31,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-topia-extension</artifactId> + <artifactId>topia-extension</artifactId> <name>ObServe :: ToPIA Extension</name> <description>ObServe ToPIA extension module</description> diff --git a/observe-entities/src/license/THIRD-PARTY.properties b/topia-extension/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-entities/src/license/THIRD-PARTY.properties rename to topia-extension/src/license/THIRD-PARTY.properties diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaMetadataModelSupportImpl.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaMetadataModelSupportImpl.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaMetadataModelSupportImpl.java rename to topia-extension/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaMetadataModelSupportImpl.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java rename to topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java rename to topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java rename to topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/support/TopiaMetadataModelSupport.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/support/TopiaMetadataModelSupport.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/persistence/support/TopiaMetadataModelSupport.java rename to topia-extension/src/main/java/org/nuiton/topia/persistence/support/TopiaMetadataModelSupport.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlRequests.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlRequests.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlRequests.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlRequests.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchService.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchService.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchService.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchService.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceConfiguration.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceConfiguration.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceConfiguration.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceConfiguration.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceImpl.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceImpl.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceImpl.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/TopiaSqlBatchServiceImpl.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSchemaRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractTablesRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DeleteTablesRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/TopiaSqlTableSelectArgument.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/TopiaSqlTableSelectArgument.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/TopiaSqlTableSelectArgument.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/TopiaSqlTableSelectArgument.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesAction.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesAction.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesAction.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesRequest.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesRequest.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesRequest.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/UpdateTablesRequest.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTable.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTable.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTable.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTable.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTables.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTables.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTables.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTables.java diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java similarity index 100% rename from observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java rename to topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java diff --git a/observe-application-swing-decoration/LICENSE.txt b/topia-templates-extension/LICENSE.txt similarity index 100% rename from observe-application-swing-decoration/LICENSE.txt rename to topia-templates-extension/LICENSE.txt diff --git a/observe-check-api-maven-plugin/README.md b/topia-templates-extension/README.md similarity index 100% rename from observe-check-api-maven-plugin/README.md rename to topia-templates-extension/README.md diff --git a/observe-topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml similarity index 97% rename from observe-topia-templates-extension/pom.xml rename to topia-templates-extension/pom.xml index ef67ec5..5b26f0d 100644 --- a/observe-topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -31,7 +31,7 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-topia-templates-extension</artifactId> + <artifactId>topia-templates-extension</artifactId> <name>ObServe :: ToPIA Templates Extension</name> <description>ObServe ToPIA templates extension module</description> @@ -40,7 +40,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-topia-extension</artifactId> + <artifactId>topia-extension</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-entities-migration/src/license/THIRD-PARTY.properties b/topia-templates-extension/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-entities-migration/src/license/THIRD-PARTY.properties rename to topia-templates-extension/src/license/THIRD-PARTY.properties diff --git a/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java similarity index 100% rename from observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java rename to topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.