This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 390f79f Amélioration de l'écran générale des référentiels new 9c0762b Simplification des modules : un seul module persistence + nettoyage de code dans ce module (il y a beaucoup de code mort) new 7cf5dc0 Introduction module common new e98d19c Simplification des modules de service new 88baa79 Renommage de modules de services The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 88baa79cdbc112768fc9fed6ae2bc2c965638d62 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 17:02:37 2016 +0100 Renommage de modules de services commit e98d19c1b97677f2bc1f0a31f7a68935a1a60009 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 16:45:09 2016 +0100 Simplification des modules de service commit 7cf5dc0f1aaacd0e65d3f711abaf1e02cd2462e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 16:23:31 2016 +0100 Introduction module common commit 9c0762ba03a006891e791b8d3d139f6da46afd86 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 14:52:49 2016 +0100 Simplification des modules : un seul module persistence + nettoyage de code dans ce module (il y a beaucoup de code mort) Summary of changes: application-swing-configuration/pom.xml | 8 +- application-swing-decoration/pom.xml | 9 +- .../swing/decoration/DecoratorService.java | 2 +- .../decoration/ObserveI18nDecoratorHelper.java | 2 +- application-swing-validation/pom.xml | 4 +- application-swing-validators/pom.xml | 7 +- .../ActivitySimpleSpeedDtoValidator.java | 30 +- .../validators/ActivitySpeedDtoValidator.java | 8 +- application-swing/pom.xml | 21 +- .../observe/application/swing/ObserveRunner.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 3 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 3 +- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 2 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 2 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 4 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 4 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 4 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 6 +- .../swing/ui/content/ref/impl/SexUI.jaxx | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 2 +- .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 2 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 2 +- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 2 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 2 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 2 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 2 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 2 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 2 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 2 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 2 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 2 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 2 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 2 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 2 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 2 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 2 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 2 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 2 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 2 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 2 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 2 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 2 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 4 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 2 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 2 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 2 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../swing/ui/storage/tabs/RolesTableModel.java | 2 +- .../ui/util/tripMap/TripMapContentBuilder.java | 20 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 +- .../i18n/application-swing_en_GB.properties | 68 +-- .../i18n/application-swing_es_ES.properties | 68 +-- .../i18n/application-swing_fr_FR.properties | 68 +-- application-web-configuration/pom.xml | 4 +- .../configuration/ObserveWebApplicationConfig.java | 2 +- application-web/pom.xml | 15 - .../longline/TripLonglineServiceController.java | 5 - .../v1/data/seine/TripSeineServiceController.java | 5 - application-web/src/main/resources/mapping | 2 - {services-topia-validators => common}/LICENSE.txt | 0 {services-topia-validators => common}/README.md | 0 common/pom.xml | 61 ++ .../src/license/THIRD-PARTY.properties | 0 .../fr/ird/observe/common}/CoordinateHelper.java | 5 +- .../java/fr/ird/observe/common}/FormulaHelper.java | 50 +- .../main/java/fr/ird/observe/common}/GPSPoint.java | 41 +- .../java/fr/ird/observe/common}/ObserveUtil.java | 2 +- .../java/fr/ird/observe/common}/TripMapPoint.java | 10 +- .../java/fr/ird/observe/common/WithFormula.java | 19 + .../fr/ird/observe/common}/constants/GearType.java | 2 +- .../observe/common}/constants/ReferenceStatus.java | 2 +- .../common}/constants/TripMapPointType.java | 2 +- .../seine/NonTargetCatchComputedValueSource.java | 2 +- .../observe/common}/constants/seine/Ownership.java | 2 +- .../common}/constants/seine/SchoolType.java | 2 +- .../seine/TypeTransmittingBuoyOperation.java | 2 +- .../fr/ird/observe/common}/FormulaHelperTest.java | 27 +- .../fr/ird/observe/common}/RelationRegexTest.java | 2 +- .../java/fr/ird/observe/common}/ScriptTest.java | 2 +- .../src/test/resources/log4j.properties | 4 +- entities-migration/LICENSE.txt | 674 --------------------- entities-migration/README.md | 0 entities-migration/pom.xml | 115 ---- .../src/license/THIRD-PARTY.properties | 33 - entities/LICENSE.txt | 674 --------------------- entities/README.md | 0 .../main/java/fr/ird/observe/entities/Trips.java | 42 -- .../entities/constants/GearTypePersist.java | 59 -- .../entities/constants/ReferenceStatusPersist.java | 39 -- .../constants/TripMapPointTypePersist.java | 48 -- .../NonTargetCatchComputedValueSourcePersist.java | 52 -- .../entities/constants/seine/OwnershipPersist.java | 40 -- .../constants/seine/SchoolTypePersist.java | 41 -- .../TypeTransmittingBuoyOperationPersist.java | 37 -- .../fr/ird/observe/entities/longline/Baskets.java | 50 -- .../ird/observe/entities/longline/Branchlines.java | 49 -- .../fr/ird/observe/entities/longline/Sections.java | 47 -- .../ird/observe/entities/longline/TdrTopiaDao.java | 103 ---- .../referentiel/GearCaracteristicTypes.java | 83 --- .../referentiel/ObserveReferentialEntities.java | 113 ---- .../ird/observe/entities/referentiel/Persons.java | 39 -- .../ird/observe/entities/referentiel/Programs.java | 62 -- .../ird/observe/entities/referentiel/Vessels.java | 79 --- .../java/fr/ird/observe/entities/seine/Routes.java | 93 --- entities/src/main/xmi/observe-common.zargo | Bin 45811 -> 0 bytes entities/src/main/xmi/observe-seine.zargo | Bin 87287 -> 0 bytes .../LICENSE.txt | 0 .../README.md | 0 {entities => persistence}/pom.xml | 17 +- .../src/license/THIRD-PARTY.properties | 0 .../java/fr/ird/observe/entities/Activity.java | 0 .../java/fr/ird/observe/entities/EntityMap.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 .../entities/longline/ActivityLonglineImpl.java | 4 +- .../longline/ActivityLonglineTopiaDao.java | 51 +- .../entities/longline/ActivityLonglines.java | 4 +- .../observe/entities/longline/BasketTopiaDao.java | 0 .../observe/entities/longline/BranchlineImpl.java | 0 .../entities/longline/BranchlineTopiaDao.java | 0 .../longline/GearUseFeaturesLonglineImpl.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 .../observe/entities/longline/SetLonglineImpl.java | 4 +- .../fr/ird/observe/entities/longline/TdrImpl.java | 0 .../entities/longline/TripLonglineImpl.java | 0 .../entities/longline/TripLonglineTopiaDao.java | 160 +---- .../observe/entities/longline/TripLonglines.java | 0 .../DuplicateLengthWeightParameterException.java | 0 .../entities/referentiel/FormulaSupportImpl.java | 4 +- .../observe/entities/referentiel/HarbourImpl.java | 2 +- .../referentiel/I18nReferenceEntities.java | 14 - .../referentiel/LengthLengthParameterImpl.java | 5 +- .../referentiel/LengthLengthParameterTopiaDao.java | 0 .../referentiel/LengthLengthParameters.java | 2 +- .../referentiel/LengthWeightParameterImpl.java | 2 + .../LengthWeightParameterNotFoundException.java | 0 .../referentiel/LengthWeightParameters.java | 3 +- .../referentiel/ObserveReferentialEntityImpl.java | 6 +- .../observe/entities/referentiel/ProgramImpl.java | 0 .../ird/observe/entities/referentiel/Species2.java | 34 +- .../observe/entities/referentiel/SpeciesImpl.java | 0 .../observe/entities/referentiel/VesselImpl.java | 0 .../observe/entities/seine/ActivitySeineImpl.java | 8 +- .../entities/seine/ActivitySeineTopiaDao.java | 45 +- .../ird/observe/entities/seine/ActivitySeines.java | 33 +- .../observe/entities/seine/FloatingObjectImpl.java | 18 +- .../entities/seine/FloatingObjectTopiaDao.java | 22 - .../entities/seine/GearUseFeaturesSeineImpl.java | 0 .../observe/entities/seine/NonTargetCatchImpl.java | 6 +- .../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 | 49 +- .../java/fr/ird/observe/entities/seine/Routes.java | 12 +- .../ird/observe/entities/seine/SetSeineImpl.java | 12 +- .../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 | 151 +---- .../fr/ird/observe/entities/seine/TripSeines.java | 0 .../persistence}/AbstractObserveTopiaDao.java | 2 +- .../java/fr/ird/observe/persistence}/Entities.java | 4 +- .../ObserveTopiaApplicationContext.java | 9 +- .../persistence}/ObserveTopiaConfiguration.java | 2 +- .../ObserveTopiaConfigurationFactory.java | 6 +- .../persistence}/ObserveTopiaIdFactory.java | 2 +- .../ObserveTopiaPersistenceContext.java | 2 +- .../persistence}/RunScriptTopiaSqlWork.java | 2 +- .../persistence}/RunScriptsTopiaSqlWork.java | 2 +- .../migration/AbstractDataSourceMigration.java | 2 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 2 +- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../migration/H2DataSourceMigration.java | 2 +- .../persistence}/migration/MigrationVersion.java | 2 +- ...ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveMigrationConfigurationProvider.java | 4 +- .../migration/ObserveMigrationEngine.java | 2 +- .../migration/PGDataSourceMigration.java | 2 +- .../old/DataSourceMigrationForVersion_3_1.java | 8 +- .../old/DataSourceMigrationForVersion_3_10.java | 12 +- .../old/DataSourceMigrationForVersion_3_11.java | 12 +- .../old/DataSourceMigrationForVersion_3_12.java | 12 +- .../old/DataSourceMigrationForVersion_3_14.java | 12 +- .../old/DataSourceMigrationForVersion_3_15.java | 12 +- .../old/DataSourceMigrationForVersion_3_16.java | 12 +- .../old/DataSourceMigrationForVersion_3_5.java | 12 +- .../old/DataSourceMigrationForVersion_3_7.java | 12 +- .../old/DataSourceMigrationForVersion_3_8.java | 12 +- .../old/DataSourceMigrationForVersion_3_9.java | 12 +- .../old/DataSourceMigrationForVersion_4_0.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_1.java | 14 +- .../old/DataSourceMigrationForVersion_4_0_2.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_4.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC2.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC3.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC4.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC6.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC7.java | 12 +- .../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/5.0/01_remove_open_field-H2.sql | 0 .../db/migration/5.0/01_remove_open_field-PG.sql | 0 .../5.0/02_add_lastUpdateDate_field-H2.sql | 0 .../5.0/02_add_lastUpdateDate_field-PG.sql | 0 .../5.0/03_add_lastUpdateDate_table-H2.sql | 0 .../5.0/03_add_lastUpdateDate_table-PG.sql | 0 .../db/migration/5.0/04_remove_unit_field-H2.sql | 0 .../db/migration/5.0/04_remove_unit_field-PG.sql | 0 .../db/migration/5.0/05_remove_gender_field-H2.sql | 0 .../db/migration/5.0/05_remove_gender_field-PG.sql | 0 .../migration/5.0/06_remove_duplicate_rows-H2.sql | 0 .../migration/5.0/06_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...p_not_null_constraint_hauling_identifier-H2.sql | 0 ...p_not_null_constraint_hauling_identifier-PG.sql | 0 .../5.0/09_add_non_target_length_sex_fk-H2.sql | 0 .../5.0/09_add_non_target_length_sex_fk-PG.sql | 0 .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 0 .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 0 .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 0 .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 0 .../03_evol_6997_delete_supportVesselName-H2.sql | 0 .../03_evol_6997_delete_supportVesselName-PG.sql | 0 ...ranchlineComposition_add_tracelineLength-H2.sql | 0 ...ranchlineComposition_add_tracelineLength-PG.sql | 0 .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../6.0/07_evol_8389_rename_source_columns-H2.sql | 0 .../6.0/07_evol_8389_rename_source_columns-PG.sql | 0 .../6.0/08_1_evol_8390_measure_type-H2.sql | 0 .../6.0/08_1_evol_8390_measure_type-PG.sql | 0 .../migration/6.0/08_evol_8390_measure_type-H2.sql | 0 .../migration/6.0/08_evol_8390_measure_type-PG.sql | 0 .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 0 .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 0 .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 0 .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 0 .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 0 .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 0 .../6.0/13_evol_7901_add_armateur_table-H2.sql | 0 .../6.0/13_evol_7901_add_armateur_table-PG.sql | 0 ...ol_8196_lengthWeightParameter_add_source-H2.sql | 0 ...ol_8196_lengthWeightParameter_add_source-PG.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 0 .../16_evol_8377_speciesFate_add_discard-H2.sql | 0 .../16_evol_8377_speciesFate_add_discard-PG.sql | 0 ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 0 ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 0 .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 0 .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 0 .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 0 .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 0 ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 0 ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 0 .../old/3.10/V3_10_01_remove-person-H2.sql | 0 .../old/3.10/V3_10_01_remove-person-PG.sql | 0 .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 0 .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 0 .../3.10/V3_10_03_increase-comment-field-H2.sql | 0 .../3.10/V3_10_03_increase-comment-field-PG.sql | 0 .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../old/3.10/V3_10_05_normalize-sections-H2.sql | 0 .../old/3.10/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 .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 0 .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 0 .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 0 .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 0 .../old/3.11/V3_11_05_add-person-country-H2.sql | 0 .../old/3.11/V3_11_05_add-person-country-PG.sql | 0 .../old/3.11/V3_11_06_add-harbours-H2.sql | 0 .../old/3.11/V3_11_06_add-harbours-PG.sql | 0 .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 0 .../old/3.12/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 .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 0 .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 0 .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 0 .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 0 .../old/3.16/V3_16_02_add-gear-data-H2.sql | 0 .../old/3.16/V3_16_02_add-gear-data-PG.sql | 0 .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 0 .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 0 .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 0 .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 0 .../3.5/V3_5_03_update-common-references-H2.sql | 0 .../3.5/V3_5_03_update-common-references-PG.sql | 0 .../old/3.5/V3_5_04_add-longline-references-H2.sql | 0 .../old/3.5/V3_5_04_add-longline-references-PG.sql | 0 .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 0 .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 0 .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 0 .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 0 .../3.7/V3_7_03_add-referential-needComment-H2.sql | 0 .../3.7/V3_7_03_add-referential-needComment-PG.sql | 0 .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 0 .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 0 .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 0 .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 0 .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 0 .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 0 .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 0 .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 0 .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 0 .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 0 .../old/3.7/V3_7_09_add-species-list-H2.sql | 0 .../old/3.7/V3_7_09_add-species-list-PG.sql | 0 .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 0 .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 0 .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 0 .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 0 .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 0 .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 0 .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 0 .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 0 .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../old/3.9/V3_9_02_fill-sensorDataFormat-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 .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../old/4.0-RC-4/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 .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 0 .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 0 .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 0 .../4.0.2/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 .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 0 .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 0 persistence/src/main/xmi/observe-common.zargo | Bin 0 -> 45825 bytes .../src/main/xmi/observe-longline.zargo | Bin persistence/src/main/xmi/observe-seine.zargo | Bin 0 -> 87233 bytes {entities => persistence}/src/main/xmi/observe.ini | 3 + .../entities/longline/SectionTemplateTest.java | 0 ...rveMigrationCallBackForVersionResolverTest.java | 4 +- .../src/test/resources/log4j.properties | 0 pom.xml | 19 +- .../LICENSE.txt | 0 .../README.md | 0 {services-topia-binder => services-binder}/pom.xml | 15 +- .../src/license/THIRD-PARTY.properties | 0 .../services/topia/binder/BinderEngine.java | 2 +- .../topia/binder/BinderEngineInitializer.java | 105 ++-- .../services/topia/binder/BinderSupport.java | 55 +- .../binder/ReferenceBinderEngineSupplierTopia.java | 0 .../topia/binder/data/DataBinderSupport.java | 0 .../data/longline/ActivityLonglineBinder.java | 0 .../ActivityLonglineEncouterDtoBinder.java | 0 .../ActivityLonglineSensorUsedDtoBinder.java | 0 .../longline/ActivityLonglineStubDtoBinder.java | 0 .../data/longline/BaitsCompositionBinder.java | 0 .../topia/binder/data/longline/BasketBinder.java | 0 .../binder/data/longline/BranchlineBinder.java | 0 .../longline/BranchlinesCompositionBinder.java | 0 .../binder/data/longline/CatchLonglineBinder.java | 0 .../binder/data/longline/EncounterBinder.java | 0 .../data/longline/FloatlinesCompositionBinder.java | 0 .../longline/GearUseFeaturesLonglineBinder.java | 0 .../GearUseFeaturesMeasurementLonglineBinder.java | 0 .../data/longline/HooksCompositionBinder.java | 0 .../topia/binder/data/longline/SectionBinder.java | 0 .../binder/data/longline/SensorUsedBinder.java | 0 .../binder/data/longline/SetLonglineBinder.java | 0 .../data/longline/SetLonglineCatchDtoBinder.java | 0 .../SetLonglineDetailCompositionDtoBinder.java | 0 .../SetLonglineGlobalCompositionDtoBinder.java | 0 .../data/longline/SetLonglineStubDtoBinder.java | 0 .../data/longline/SetLonglineTdrDtoBinder.java | 0 .../binder/data/longline/SizeMeasureBinder.java | 0 .../topia/binder/data/longline/TdrBinder.java | 0 .../longline/TripLonglineActivityDtoBinder.java | 0 .../binder/data/longline/TripLonglineBinder.java | 0 .../longline/TripLonglineGearUseDtoBinder.java | 0 .../binder/data/longline/WeightMeasureBinder.java | 0 .../binder/data/seine/ActivitySeineBinder.java | 0 .../data/seine/ActivitySeineStubDtoBinder.java | 0 .../binder/data/seine/FloatingObjectBinder.java | 0 .../FloatingObjectObservedSpeciesDtoBinder.java | 0 .../FloatingObjectSchoolEstimateDtoBinder.java | 0 .../FloatingObjectTransmittingBuoyDtoBinder.java | 0 .../GearUseFeaturesMeasurementSeineBinder.java | 0 .../data/seine/GearUseFeaturesSeineBinder.java | 0 .../binder/data/seine/NonTargetCatchBinder.java | 16 +- .../binder/data/seine/NonTargetLengthBinder.java | 0 .../binder/data/seine/NonTargetSampleBinder.java | 0 .../data/seine/ObjectObservedSpeciesBinder.java | 0 .../data/seine/ObjectSchoolEstimateBinder.java | 0 .../topia/binder/data/seine/RouteBinder.java | 0 .../binder/data/seine/RouteStubDtoBinder.java | 0 .../binder/data/seine/SchoolEstimateBinder.java | 0 .../topia/binder/data/seine/SetSeineBinder.java | 4 +- .../seine/SetSeineNonTargetCatchDtoBinder.java | 0 .../seine/SetSeineSchoolEstimateDtoBinder.java | 0 .../data/seine/SetSeineTargetCatchDtoBinder.java | 0 .../topia/binder/data/seine/TargetCatchBinder.java | 0 .../binder/data/seine/TargetLengthBinder.java | 0 .../binder/data/seine/TargetSampleBinder.java | 0 .../binder/data/seine/TransmittingBuoyBinder.java | 4 +- .../topia/binder/data/seine/TripSeineBinder.java | 0 .../data/seine/TripSeineGearUseDtoBinder.java | 0 .../referential/ReferentialBinderSupport.java | 6 +- .../binder/referential/common/CountryBinder.java | 0 .../binder/referential/common/FpaZoneBinder.java | 0 .../binder/referential/common/GearBinder.java | 0 .../common/GearCaracteristicBinder.java | 0 .../common/GearCaracteristicTypeBinder.java | 0 .../binder/referential/common/HarbourBinder.java | 0 .../common/LengthLengthParameterBinder.java | 0 .../common/LengthWeightParameterBinder.java | 0 .../binder/referential/common/OceanBinder.java | 0 .../binder/referential/common/OrganismBinder.java | 0 .../binder/referential/common/PersonBinder.java | 0 .../binder/referential/common/ProgramBinder.java | 6 +- .../topia/binder/referential/common/SexBinder.java | 0 .../binder/referential/common/ShipOwnerBinder.java | 0 .../referential/common/SizeMeasureTypeBinder.java | 0 .../binder/referential/common/SpeciesBinder.java | 0 .../referential/common/SpeciesGroupBinder.java | 0 .../referential/common/SpeciesListBinder.java | 0 .../binder/referential/common/VesselBinder.java | 0 .../common/VesselSizeCategoryBinder.java | 0 .../referential/common/VesselTypeBinder.java | 0 .../common/WeightMeasureTypeBinder.java | 0 .../longline/BaitHaulingStatusBinder.java | 0 .../longline/BaitSettingStatusBinder.java | 0 .../referential/longline/BaitTypeBinder.java | 0 .../longline/CatchFateLonglineBinder.java | 0 .../referential/longline/EncounterTypeBinder.java | 0 .../referential/longline/HealthnessBinder.java | 0 .../referential/longline/HookPositionBinder.java | 0 .../referential/longline/HookSizeBinder.java | 0 .../referential/longline/HookTypeBinder.java | 0 .../longline/ItemHorizontalPositionBinder.java | 0 .../longline/ItemVerticalPositionBinder.java | 0 .../longline/LightsticksColorBinder.java | 0 .../longline/LightsticksTypeBinder.java | 0 .../referential/longline/LineTypeBinder.java | 0 .../referential/longline/MaturityStatusBinder.java | 0 .../referential/longline/MitigationTypeBinder.java | 0 .../referential/longline/SensorBrandBinder.java | 0 .../longline/SensorDataFormatBinder.java | 0 .../referential/longline/SensorTypeBinder.java | 0 .../referential/longline/SettingShapeBinder.java | 0 .../referential/longline/StomacFullnessBinder.java | 0 .../referential/longline/TripTypeBinder.java | 0 .../longline/VesselActivityLonglineBinder.java | 0 .../referential/seine/DetectionModeBinder.java | 0 .../binder/referential/seine/ObjectFateBinder.java | 0 .../referential/seine/ObjectOperationBinder.java | 0 .../binder/referential/seine/ObjectTypeBinder.java | 0 .../referential/seine/ObservedSystemBinder.java | 4 +- .../referential/seine/ReasonForDiscardBinder.java | 0 .../seine/ReasonForNoFishingBinder.java | 0 .../referential/seine/ReasonForNullSetBinder.java | 0 .../referential/seine/SpeciesFateBinder.java | 0 .../referential/seine/SpeciesStatusBinder.java | 0 .../seine/SurroundingActivityBinder.java | 0 .../seine/TransmittingBuoyOperationBinder.java | 0 .../seine/TransmittingBuoyTypeBinder.java | 0 .../seine/VesselActivitySeineBinder.java | 0 .../referential/seine/WeightCategoryBinder.java | 0 .../topia/binder/referential/seine/WindBinder.java | 0 .../topia/binder/BinderEngineMetadataTest.java | 2 +- .../topia/binder/ReferenceBinderEngineTest.java | 0 services-dto-gson/LICENSE.txt | 674 --------------------- services-dto-gson/README.md | 0 services-dto-gson/pom.xml | 68 --- .../src/license/THIRD-PARTY.properties | 24 - services-dto-reference/pom.xml | 65 -- .../src/license/THIRD-PARTY.properties | 23 - services-dto/pom.xml | 136 ----- services-dto/src/license/THIRD-PARTY.properties | 19 - .../services/dto/referential/FormulaHelper.java | 156 ----- .../src/main/xmi/observe-services-dto-common.zargo | Bin 51095 -> 0 bytes services-rest/pom.xml | 16 - .../service/seine/TripSeineServiceRestTest.java | 37 +- services-runner/pom.xml | 10 +- services-topia/pom.xml | 27 +- .../services/topia/ObserveSecurityHelper.java | 2 +- .../services/topia/ObserveServiceContextTopia.java | 4 +- .../services/topia/ObserveServiceFactoryTopia.java | 4 +- .../services/topia/ObserveServiceTopia.java | 2 +- .../ObserveTopiaApplicationContextFactory.java | 6 +- .../topia/service/DataSourceServiceTopia.java | 10 +- .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../ConsolidateActivitySeineDataResultBuilder.java | 13 +- .../consolidate/ConsolidateDataServiceTopia.java | 34 +- .../service/actions/report/ReportServiceTopia.java | 3 +- .../ReferentialSynchronizeDiffServiceTopia.java | 18 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 2 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 4 +- .../validate/ValidationMessageDetector.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../service/data/TripManagementServiceTopia.java | 2 +- .../topia/service/data/TripMapDtoFactory.java | 19 +- .../data/longline/TripLonglineServiceTopia.java | 17 +- .../service/data/seine/RouteServiceTopia.java | 2 +- .../service/data/seine/SetSeineServiceTopia.java | 10 +- .../service/data/seine/TripSeineServiceTopia.java | 19 +- .../referential/ReferentialServiceTopia.java | 9 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../service/sql/SqlScriptProducerServiceTopia.java | 12 +- .../services/topia/DataSourcesForTestManager.java | 2 +- .../services/topia/TopiaTestMethodResource.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 2 +- .../topia/entity/LengthWeightParemetersTest.java | 8 +- .../topia/entity/ReplicateTestSupport.java | 4 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 2 +- .../observe/services/topia/service/RigthTest.java | 2 +- .../ConsolidateDataServiceTopiaTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 4 +- .../data/seine/TripSeineServiceTopiaTest.java | 40 +- services-topia/src/test/resources/log4j.properties | 2 +- {services-dto => services-validation}/LICENSE.txt | 0 {services-dto => services-validation}/README.md | 0 .../pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 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 ...gthLengthParameter-service-error-validation.xml | 0 ...hLengthParameter-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 .../ShipOwner-service-error-validation.xml | 0 .../ShipOwner-service-warning-validation.xml | 0 .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-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 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-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 .../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 .../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 .../i18n/services-validation_en_GB.properties | 0 .../i18n/services-validation_es_ES.properties | 0 .../i18n/services-validation_fr_FR.properties | 0 .../src/main/resources/xwork.xml | 0 .../validation/BeanValidatorDetectorTest.java | 2 +- .../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 .../pom.xml | 10 +- .../src/license/THIRD-PARTY.properties | 0 .../validators/AbstractSpeciesFieldValidator.java | 0 .../ActivityFinDeVeilleExistsValidator.java | 0 .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../topia/validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 0 .../ObserveCollectionUniqueKeyValidator.java | 0 .../topia/validators/QuadrantFieldValidator.java | 0 .../SetLonglineUniqueHomeIdValidator.java | 0 .../SetLonglineUniqueNumberValidator.java | 0 .../validators/SpeciesLengthFieldValidator.java | 0 .../validators/SpeciesWeightFieldValidator.java | 0 services/pom.xml | 55 +- .../observe/services/dto/AbstractObserveDto.java | 0 .../observe/services/dto/AbstractReference.java | 0 .../fr/ird/observe/services/dto/DataReference.java | 0 .../observe/services/dto/DataReferenceList.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/IdHelper.java | 0 ...ibleDataSourceCreateConfigurationException.java | 0 .../services/dto/ObserveBlobsContainer.java | 0 .../observe/services/dto/ObserveDbUserHelper.java | 0 .../fr/ird/observe/services/dto/ObserveDto.java | 0 .../ird/observe/services/dto/ObserveModelType.java | 0 .../dto/ObserveSpeciesListConfiguration.java | 0 .../services/dto/ReferenceCollectionSupport.java | 0 .../fr/ird/observe/services/dto/ReferenceMap.java | 0 .../dto/ReferenceValueNotFoundException.java | 0 .../services/dto/UnauthorizedException.java | 0 .../fr/ird/observe/services/dto/WithComment.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 .../services/dto/constants/ObserveDbRole.java | 0 .../services/dto/constants/ReferentialLocale.java | 0 .../dto/gson/ArrayListMultimapAdapter.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/MultimapAdapterSupport.java | 0 .../dto/gson/ObserveBlobsContainerAdapter.java | 0 .../services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../dto/gson/ReferentialMultimapAdapter.java | 0 .../services/dto/gson/ReportVariableAdapter.java | 0 .../services/dto/gson/SetMultimapAdapter.java | 0 .../observe/services/dto/gson/VersionAdapter.java | 0 .../gson/reference/AbstractReferenceAdapter.java | 0 .../dto/gson/reference/DataReferenceAdapter.java | 0 .../gson/reference/DataReferenceListAdapter.java | 0 .../gson/reference/DataReferenceSetAdapter.java | 0 .../ReferenceCollectionSupportAdapter.java | 0 .../reference/ReferentialReferenceAdapter.java | 0 .../reference/ReferentialReferenceSetAdapter.java | 0 .../gson/reference/UnknownReferenceAdapter.java | 0 .../services/dto/longline/ActivityLonglineDto.java | 0 .../dto/longline/ActivityLonglineHelper.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/SectionWithTemplateHelper.java | 0 .../longline/SetLonglineGlobalCompositionDto.java | 0 .../services/dto/longline/TripLonglineHelper.java | 0 .../dto/presets/RemoteDataSourceConfiguration.java | 0 .../dto/presets/ServerDataSourceConfiguration.java | 0 .../dto/reference/DataReferenceSetDefinitions.java | 0 .../dto/reference/ReferenceBinderEngine.java | 0 .../reference/ReferenceBinderEngineSupplier.java | 0 .../dto/reference/ReferenceSetDefinition.java | 0 .../ReferentialReferenceSetDefinitions.java | 2 +- .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 0 .../request/ReferenceSetRequestKeyDefinition.java | 0 .../referential/GearCaracteristicTypeHelper.java | 0 .../dto/referential/I18nReferentialDto.java | 0 .../dto/referential/I18nReferentialHelper.java | 0 .../dto/referential/LengthLengthParameterDto.java | 9 +- .../dto/referential/LengthWeightParameterDto.java | 25 +- .../services/dto/referential/PersonHelper.java | 0 .../services/dto/referential/ProgramDto.java | 0 .../services/dto/referential/ProgramHelper.java | 2 +- .../services/dto/referential/ReferentialDto.java | 16 +- .../dto/referential/ReferentialHelper.java | 0 .../dto/referential/ReferentialMultimap.java | 0 .../dto/referential/ReferentialReference.java | 16 +- .../dto/referential/ReferentialReferenceSet.java | 0 .../dto/referential/ReferentialReferences.java | 0 .../dto/referential/SizeMeasureTypeHelper.java | 0 .../services/dto/referential/SpeciesListDto.java | 0 .../services/dto/referential/VesselHelper.java | 0 .../longline/VesselActivityLonglineHelper.java | 0 .../seine/VesselActivitySeineHelper.java | 0 .../referential/seine/WeightCategoryHelper.java | 0 .../observe/services/dto/result/SaveResultDto.java | 0 .../services/dto/result/SaveResultHelper.java | 0 .../dto/result/TripChildSaveResultHelper.java | 0 .../services/dto/seine/ActivitySeineDto.java | 0 .../services/dto/seine/ActivitySeineHelper.java | 0 .../services/dto/seine/ActivitySeineStubDto.java | 0 .../dto/seine/DiscardedTargetCatchDto.java | 0 .../dto/seine/DiscardedTargetSampleDto.java | 0 .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 0 .../services/dto/seine/KeptTargetCatchDto.java | 0 .../services/dto/seine/KeptTargetSampleDto.java | 0 .../ird/observe/services/dto/seine/RouteDto.java | 0 .../observe/services/dto/seine/SetSeineDto.java | 0 .../services/dto/seine/TargetCatchHelper.java | 0 .../services/dto/seine/TargetLengthDto.java | 0 .../services/dto/seine/TargetLengthHelper.java | 0 .../observe/services/dto/seine/TripSeineDto.java | 0 .../services/dto/seine/TripSeineHelper.java | 0 .../ConsolidateActivitySeineDataResult.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 2 +- .../service/data/longline/TripLonglineService.java | 4 - .../service/data/seine/TripSeineService.java | 4 - .../src/main/xmi/observe-services-dto-common.zargo | Bin 0 -> 51083 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60919 -> 60907 bytes .../src/main/xmi/observe-services-dto.ini | 3 + .../toolbox/GenerateValidatorsDescriptorMojo.java | 2 +- 946 files changed, 1004 insertions(+), 5236 deletions(-) rename {services-topia-validators => common}/LICENSE.txt (100%) rename {services-topia-validators => common}/README.md (100%) create mode 100644 common/pom.xml copy {services => common}/src/license/THIRD-PARTY.properties (100%) rename {entities/src/main/java/fr/ird/observe/entities/gps => common/src/main/java/fr/ird/observe/common}/CoordinateHelper.java (94%) rename {entities/src/main/java/fr/ird/observe/entities/referentiel => common/src/main/java/fr/ird/observe/common}/FormulaHelper.java (84%) rename {services-dto/src/main/java/fr/ird/observe/util => common/src/main/java/fr/ird/observe/common}/GPSPoint.java (80%) rename {services-dto/src/main/java/fr/ird/observe/util => common/src/main/java/fr/ird/observe/common}/ObserveUtil.java (98%) rename {entities/src/main/java/fr/ird/observe/entities => common/src/main/java/fr/ird/observe/common}/TripMapPoint.java (87%) create mode 100644 common/src/main/java/fr/ird/observe/common/WithFormula.java rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/GearType.java (96%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/ReferenceStatus.java (95%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/TripMapPointType.java (97%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/seine/NonTargetCatchComputedValueSource.java (96%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/seine/Ownership.java (96%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/seine/SchoolType.java (95%) rename {services-dto/src/main/java/fr/ird/observe/services/dto => common/src/main/java/fr/ird/observe/common}/constants/seine/TypeTransmittingBuoyOperation.java (97%) rename {entities/src/test/java/fr/ird/observe/entities/referentiel => common/src/test/java/fr/ird/observe/common}/FormulaHelperTest.java (66%) rename {entities/src/test/java/fr/ird/observe => common/src/test/java/fr/ird/observe/common}/RelationRegexTest.java (98%) rename {entities/src/test/java/fr/ird/observe => common/src/test/java/fr/ird/observe/common}/ScriptTest.java (99%) rename {entities-migration => common}/src/test/resources/log4j.properties (90%) delete mode 100644 entities-migration/LICENSE.txt delete mode 100644 entities-migration/README.md delete mode 100644 entities-migration/pom.xml delete mode 100644 entities-migration/src/license/THIRD-PARTY.properties delete mode 100644 entities/LICENSE.txt delete mode 100644 entities/README.md delete mode 100644 entities/src/main/java/fr/ird/observe/entities/Trips.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/longline/Sections.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/seine/Routes.java delete mode 100644 entities/src/main/xmi/observe-common.zargo delete mode 100644 entities/src/main/xmi/observe-seine.zargo rename {services-topia-validation => persistence}/LICENSE.txt (100%) rename {services-topia-validation => persistence}/README.md (100%) rename {entities => persistence}/pom.xml (94%) rename {entities => persistence}/src/license/THIRD-PARTY.properties (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/Activity.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/EntityMap.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java (100%) copy {entities => persistence}/src/main/java/fr/ird/observe/entities/ObserveSet.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/Trip.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java (97%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java (71%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java (91%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/GearUseFeaturesLonglineImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java (99%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java (61%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java (96%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java (96%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java (88%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java (94%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java (96%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java (98%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java (99%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java (85%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/Species2.java (61%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java (97%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java (69%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java (89%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java (80%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java (78%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/GearUseFeaturesSeineImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java (96%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java (69%) rename entities/src/main/java/fr/ird/observe/entities/ObserveSet.java => persistence/src/main/java/fr/ird/observe/entities/seine/Routes.java (75%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java (93%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/SetSeines.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java (100%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java (57%) rename {entities => persistence}/src/main/java/fr/ird/observe/entities/seine/TripSeines.java (100%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/AbstractObserveTopiaDao.java (98%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/Entities.java (99%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/ObserveTopiaApplicationContext.java (99%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/ObserveTopiaConfiguration.java (98%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/ObserveTopiaConfigurationFactory.java (97%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/ObserveTopiaIdFactory.java (97%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/ObserveTopiaPersistenceContext.java (99%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/RunScriptTopiaSqlWork.java (99%) rename {entities/src/main/java/fr/ird/observe => persistence/src/main/java/fr/ird/observe/persistence}/RunScriptsTopiaSqlWork.java (97%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/AbstractDataSourceMigration.java (97%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/AbstractObserveMigrationCallBack.java (98%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/DataSourceMigrationForVersion_5_0.java (99%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/DataSourceMigrationForVersion_6_0.java (99%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/H2DataSourceMigration.java (99%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/MigrationVersion.java (96%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/ObserveMigrationCallBackForVersionResolver.java (98%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/ObserveMigrationConfigurationProvider.java (97%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/ObserveMigrationEngine.java (96%) rename {entities/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/PGDataSourceMigration.java (99%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_1.java (93%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_10.java (85%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_11.java (86%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_12.java (84%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_14.java (85%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_15.java (85%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_16.java (94%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_5.java (95%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_7.java (87%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_8.java (85%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_3_9.java (84%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0.java (84%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_1.java (95%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_2.java (85%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_4.java (84%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_RC2.java (88%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_RC3.java (96%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_RC4.java (84%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_RC6.java (88%) rename {entities-migration/src/main/java/fr/ird/observe/entities => persistence/src/main/java/fr/ird/observe/persistence}/migration/old/DataSourceMigrationForVersion_4_0_RC7.java (86%) rename {entities-migration => persistence}/src/main/resources/db/3.5/constrainsts.csv (100%) rename {entities-migration => persistence}/src/main/resources/db/3.5/traduction_attributes.csv (100%) rename {entities-migration => persistence}/src/main/resources/db/3.5/traduction_tables.csv (100%) rename {entities-migration => persistence}/src/main/resources/db/3.5/traduction_tables2.csv (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.1/V4_0_1_01_remove-gender-column-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.2/V4_0_2_01_remove-gender-column-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0/V4_0_01_empty-H2.sql (100%) rename {entities-migration => persistence}/src/main/resources/db/migration/old/4.0/V4_0_01_empty-PG.sql (100%) create mode 100644 persistence/src/main/xmi/observe-common.zargo rename {entities => persistence}/src/main/xmi/observe-longline.zargo (100%) create mode 100644 persistence/src/main/xmi/observe-seine.zargo rename {entities => persistence}/src/main/xmi/observe.ini (99%) rename {entities => persistence}/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java (100%) rename {entities-migration/src/test/java/fr/ird/observe/entities => persistence/src/test/java/fr/ird/observe/persistence}/migration/ObserveMigrationCallBackForVersionResolverTest.java (92%) rename {entities => persistence}/src/test/resources/log4j.properties (100%) rename {services-topia-binder => services-binder}/LICENSE.txt (100%) rename {services-topia-binder => services-binder}/README.md (100%) rename {services-topia-binder => services-binder}/pom.xml (81%) rename {services-topia-binder => services-binder}/src/license/THIRD-PARTY.properties (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java (99%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java (99%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java (66%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java (78%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java (96%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java (96%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java (97%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java (95%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java (94%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java (100%) rename {services-topia-binder => services-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java (100%) rename {services-topia-binder => services-binder}/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java (99%) rename {services-topia-binder => services-binder}/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java (100%) delete mode 100644 services-dto-gson/LICENSE.txt delete mode 100644 services-dto-gson/README.md delete mode 100644 services-dto-gson/pom.xml delete mode 100644 services-dto-gson/src/license/THIRD-PARTY.properties delete mode 100644 services-dto-reference/pom.xml delete mode 100644 services-dto-reference/src/license/THIRD-PARTY.properties delete mode 100644 services-dto/pom.xml delete mode 100644 services-dto/src/license/THIRD-PARTY.properties delete mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/FormulaHelper.java delete mode 100644 services-dto/src/main/xmi/observe-services-dto-common.zargo rename {services-dto => services-validation}/LICENSE.txt (100%) rename {services-dto => services-validation}/README.md (100%) rename {services-topia-validation => services-validation}/pom.xml (93%) rename {services-topia-validation => services-validation}/src/license/THIRD-PARTY.properties (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-encounter-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-sensorUsed-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Basket-service-table-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-catchLongline-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-table-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Branchline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Encounter-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Section-service-table-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-baitsComposition-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-branchlinesComposition-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-floatlinesComposition-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-globalComposition-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-hooksComposition-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/Tdr-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Country-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Person-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Program-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-observedSystem-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-transmittingBuoyOperation-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/Route-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/Route-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-nonTargetCatch-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-schoolEstimate-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetCatch-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-targetDiscarded-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetCatch-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-service-targetDiscarded-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TargetSample-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-service-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml (100%) rename {services-topia-validation => services-validation}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-warning-validation.xml (100%) rename services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties => services-validation/src/main/resources/i18n/services-validation_en_GB.properties (100%) rename services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties => services-validation/src/main/resources/i18n/services-validation_es_ES.properties (100%) rename services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties => services-validation/src/main/resources/i18n/services-validation_fr_FR.properties (100%) rename {services-topia-validation => services-validation}/src/main/resources/xwork.xml (100%) rename {services-topia-validation => services-validation}/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java (99%) rename {services-topia-validation => services-validation}/src/test/java/fr/ird/observe/services/topia/validation/validators/ActivitySeineSpeedValidatorTest.java (100%) rename {services-topia-validation => services-validation}/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml (100%) rename {services-topia-validation => services-validation}/src/test/resources/log4j.properties (100%) rename {services-topia-validation => services-validation}/src/test/resources/validators.xml (100%) rename {services-dto-reference => services-validators}/LICENSE.txt (100%) rename {services-dto-reference => services-validators}/README.md (100%) rename {services-topia-validators => services-validators}/pom.xml (89%) rename {services-topia-validators => services-validators}/src/license/THIRD-PARTY.properties (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java (99%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java (99%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/QuadrantFieldValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java (100%) rename {services-topia-validators => services-validators}/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/AbstractReference.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/DataReference.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/Form.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/IdDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/IdHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ObserveBlobsContainer.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ObserveDbUserHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ObserveDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/WithComment.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java (100%) rename {services-dto-gson => services}/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/LonglineCompositionDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplateHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/presets/RemoteDataSourceConfiguration.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/presets/ServerDataSourceConfiguration.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java (99%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java (100%) rename {services-dto-reference => services}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java (90%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java (90%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java (97%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java (73%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java (81%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/result/SaveResultHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java (97%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthHelper.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java (100%) rename {services-dto => services}/src/main/java/fr/ird/observe/services/dto/seine/TripSeineHelper.java (100%) create mode 100644 services/src/main/xmi/observe-services-dto-common.zargo rename {services-dto => services}/src/main/xmi/observe-services-dto-longline.zargo (100%) rename {services-dto => services}/src/main/xmi/observe-services-dto-seine.zargo (87%) rename {services-dto => services}/src/main/xmi/observe-services-dto.ini (99%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.