December 2016 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (4831b2f -> 3c297cf)
by codelutin.com scm 22 Dec '16

22 Dec '16

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 4831b2f review modules order + optimize dependencies new 3c297cf sanityze service module The 1 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 3c297cfed8b7e23c8e883f36535c75c0a93aedb8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 18:14:44 2016 +0100 sanityze service module Summary of changes: .../configuration/constants/CreationMode.java | 2 +- .../src/main/resources/validators.xml | 20 +- .../swing/decoration/DecoratorService.java | 4 +- .../decorators/DataReferenceDecorator.java | 4 +- .../decoration/decorators/ObserveDecorator.java | 2 +- .../decorators/ReferentialReferenceDecorator.java | 2 +- .../AbstractSpeciesFieldDtoValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../SetLonglineUniqueNumberDtoValidator.java | 2 +- application-swing/pom.xml | 2 +- .../swing/ObserveSwingApplicationContext.java | 4 +- .../swing/db/ObserveSwingDataSource.java | 12 +- .../content/MoveActivityLonglinesUIAction.java | 2 +- .../content/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/content/MoveRoutesUIAction.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 2 +- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/content/ReOpenUIAction.java | 2 +- .../ui/actions/content/SelectNodeUIAction.java | 2 +- .../ui/actions/menu/config/ShowConfigAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 4 +- .../swing/ui/admin/config/SelectDataModel.java | 6 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 6 +- .../swing/ui/admin/export/TripEntry.java | 4 +- .../ui/admin/export/TripToExportTableModel.java | 4 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 2 +- .../swing/ui/admin/report/ReportModel.java | 5 +- .../swing/ui/admin/report/ReportUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 10 +- .../swing/ui/admin/report/ResultTableModel.java | 5 +- .../synchronize/data/DataSynchroUIHandler.java | 4 +- .../data/task/CopyToLeftDataSynchronizeTask.java | 4 +- .../data/task/CopyToRightDataSynchronizeTask.java | 4 +- .../data/task/DataSynchronizeTaskSupport.java | 4 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 4 +- .../task/DeleteFromRightDataSynchronizeTask.java | 4 +- .../legacy/ObsoleteReferentialReference.java | 2 +- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../referential/ng/ReferentialReplaceUI.jaxx | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../referential/ng/ReferentialSynchroModel.java | 4 +- .../ng/action/RegisterAddTaskAction.java | 2 +- .../ng/action/RegisterCopyTaskAction.java | 2 +- .../ng/action/RegisterDeleteTaskAction.java | 2 +- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 2 +- .../ng/action/RegisterSkipTaskAction.java | 2 +- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 2 +- .../ng/task/AddReferentialSynchronizeTask.java | 2 +- .../ng/task/DeleteReferentialSynchronizeTask.java | 2 +- .../DesactivateReferentialSynchronizeTask.java | 2 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 2 +- ...ferentialSynchronizeTaskWithReplaceSupport.java | 2 +- .../ng/task/RevertReferentialSynchronizeTask.java | 2 +- .../ng/task/SkipReferentialSynchronizeTask.java | 2 +- .../ng/task/UpdateReferentialSynchronizeTask.java | 2 +- .../ReferentialSynchronizeTreeCellRenderer.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 5 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 2 +- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../swing/ui/admin/validate/ValidateModel.java | 2 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 4 +- .../swing/ui/content/ContentUIHandler.java | 22 +- .../swing/ui/content/ContentUIInitializer.java | 6 +- .../swing/ui/content/ContentUIModel.java | 10 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../impl/longline/SetLonglineUIHandler.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../swing/ui/content/list/ContentListUI.jaxx | 2 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../impl/longline/ActivityLonglineUIModel.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 6 +- .../open/impl/seine/ActivitySeineUIModel.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 16 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 2 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 4 +- .../content/ref/usage/UsageForDesactivateUI.jaxx | 4 +- .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 2 +- .../content/ref/usage/UsageUIHandlerSupport.java | 8 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 2 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 2 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../table/impl/longline/HooksCompositionUI.jaxx | 2 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 4 +- .../content/table/impl/longline/TdrUIHandler.java | 6 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../table/impl/seine/AbstractSampleUIHandler.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 6 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIModel.java | 2 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 6 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 6 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 4 +- .../table/impl/seine/TargetSampleUIModel.java | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 4 +- .../swing/ui/storage/StorageBackupUILauncher.java | 10 +- .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 6 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 6 +- .../ui/tree/navigation/NavigationTreeHeader.jcss | 14 +- .../ui/tree/navigation/NavigationTreeModel.java | 4 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 4 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 4 +- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../seine/ActivitiesSeineNavigationTreeNode.java | 4 +- .../seine/ActivitySeineNavigationTreeNode.java | 4 +- .../FloatingObjectSeineNavigationTreeNode.java | 2 +- .../seine/ProgramSeineNavigationTreeNode.java | 4 +- .../nodes/seine/RouteSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 4 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 2 +- .../nodes/seine/TripSeineNavigationTreeNode.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 4 +- .../selection/nodes/ProgramSelectionTreeNode.java | 4 +- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../nodes/TripSeineSelectionTreeNode.java | 2 +- .../nodes/TripSelectionTreeNodeSupport.java | 2 +- .../i18n/application-swing_en_GB.properties | 14 +- .../i18n/application-swing_es_ES.properties | 14 +- .../i18n/application-swing_fr_FR.properties | 14 +- .../src/main/resources/validators.xml | 20 +- .../web/ObserveWebApplicationContext.java | 2 +- .../controller/v1/DataSourceServiceController.java | 6 +- .../controller/v1/ObserveWebErrorController.java | 2 +- .../v1/actions/report/ReportServiceController.java | 4 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 2 +- ...ActivityLongLineEncounterServiceController.java | 2 +- ...ctivityLongLineSensorUsedServiceController.java | 2 +- .../ActivityLonglineServiceController.java | 6 +- .../data/longline/BranchlineServiceController.java | 2 +- .../SetLonglineCatchServiceController.java | 2 +- ...LonglineDetailCompositionServiceController.java | 2 +- ...LonglineGlobalCompositionServiceController.java | 2 +- .../longline/SetLonglineServiceController.java | 4 +- .../v1/data/longline/TdrServiceController.java | 2 +- .../TripLonglineGearUseServiceController.java | 2 +- .../longline/TripLonglineServiceController.java | 8 +- .../data/seine/ActivitySeineServiceController.java | 6 +- .../seine/FloatingObjectServiceController.java | 6 +- .../seine/NonTargetCatchServiceController.java | 2 +- .../seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 2 +- .../ObjectSchoolEstimateServiceController.java | 2 +- .../v1/data/seine/RouteServiceController.java | 6 +- .../seine/SchoolEstimateServiceController.java | 2 +- .../v1/data/seine/SetSeineServiceController.java | 4 +- .../data/seine/TargetCatchServiceController.java | 2 +- .../data/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 2 +- .../seine/TripSeineGearUseServiceController.java | 2 +- .../v1/data/seine/TripSeineServiceController.java | 8 +- .../referential/ReferentialServiceController.java | 8 +- .../services/{topia => }/binder/BinderEngine.java | 11 +- .../binder/BinderEngineInitializer.java | 232 ++++++++++----------- .../services/{topia => }/binder/BinderSupport.java | 8 +- .../DefaultReferenceBinderEngineSupplier.java} | 7 +- .../{topia => }/binder/data/DataBinderSupport.java | 12 +- .../data/longline/ActivityLonglineBinder.java | 6 +- .../ActivityLonglineEncouterDtoBinder.java | 5 +- .../ActivityLonglineSensorUsedDtoBinder.java | 5 +- .../longline/ActivityLonglineStubDtoBinder.java | 5 +- .../data/longline/BaitsCompositionBinder.java | 8 +- .../binder/data/longline/BasketBinder.java | 6 +- .../binder/data/longline/BranchlineBinder.java | 6 +- .../longline/BranchlinesCompositionBinder.java | 8 +- .../binder/data/longline/CatchLonglineBinder.java | 6 +- .../binder/data/longline/EncounterBinder.java | 6 +- .../data/longline/FloatlinesCompositionBinder.java | 6 +- .../longline/GearUseFeaturesLonglineBinder.java | 5 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 5 +- .../data/longline/HooksCompositionBinder.java | 6 +- .../binder/data/longline/SectionBinder.java | 6 +- .../binder/data/longline/SensorUsedBinder.java | 6 +- .../binder/data/longline/SetLonglineBinder.java | 6 +- .../data/longline/SetLonglineCatchDtoBinder.java | 6 +- .../SetLonglineDetailCompositionDtoBinder.java | 5 +- .../SetLonglineGlobalCompositionDtoBinder.java | 5 +- .../data/longline/SetLonglineStubDtoBinder.java | 5 +- .../data/longline/SetLonglineTdrDtoBinder.java | 5 +- .../binder/data/longline/SizeMeasureBinder.java | 6 +- .../binder/data/longline/TdrBinder.java | 6 +- .../longline/TripLonglineActivityDtoBinder.java | 5 +- .../binder/data/longline/TripLonglineBinder.java | 6 +- .../longline/TripLonglineGearUseDtoBinder.java | 5 +- .../binder/data/longline/WeightMeasureBinder.java | 6 +- .../binder/data/seine/ActivitySeineBinder.java | 6 +- .../data/seine/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/seine/FloatingObjectBinder.java | 6 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 5 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 5 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 5 +- .../GearUseFeaturesMeasurementSeineBinder.java | 5 +- .../data/seine/GearUseFeaturesSeineBinder.java | 5 +- .../binder/data/seine/NonTargetCatchBinder.java | 6 +- .../binder/data/seine/NonTargetLengthBinder.java | 6 +- .../binder/data/seine/NonTargetSampleBinder.java | 5 +- .../data/seine/ObjectObservedSpeciesBinder.java | 6 +- .../data/seine/ObjectSchoolEstimateBinder.java | 6 +- .../{topia => }/binder/data/seine/RouteBinder.java | 6 +- .../binder/data/seine/RouteStubDtoBinder.java | 5 +- .../binder/data/seine/SchoolEstimateBinder.java | 6 +- .../binder/data/seine/SetSeineBinder.java | 6 +- .../seine/SetSeineNonTargetCatchDtoBinder.java | 4 +- .../seine/SetSeineSchoolEstimateDtoBinder.java | 6 +- .../data/seine/SetSeineTargetCatchDtoBinder.java | 4 +- .../binder/data/seine/TargetCatchBinder.java | 8 +- .../binder/data/seine/TargetLengthBinder.java | 6 +- .../binder/data/seine/TargetSampleBinder.java | 5 +- .../binder/data/seine/TransmittingBuoyBinder.java | 6 +- .../binder/data/seine/TripSeineBinder.java | 6 +- .../data/seine/TripSeineGearUseDtoBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 10 +- .../binder/referential/common/CountryBinder.java | 6 +- .../binder/referential/common/FpaZoneBinder.java | 6 +- .../binder/referential/common/GearBinder.java | 6 +- .../common/GearCaracteristicBinder.java | 6 +- .../common/GearCaracteristicTypeBinder.java | 6 +- .../binder/referential/common/HarbourBinder.java | 6 +- .../common/LengthLengthParameterBinder.java | 6 +- .../common/LengthWeightParameterBinder.java | 6 +- .../binder/referential/common/OceanBinder.java | 6 +- .../binder/referential/common/OrganismBinder.java | 6 +- .../binder/referential/common/PersonBinder.java | 6 +- .../binder/referential/common/ProgramBinder.java | 6 +- .../binder/referential/common/SexBinder.java | 6 +- .../binder/referential/common/ShipOwnerBinder.java | 6 +- .../referential/common/SizeMeasureTypeBinder.java | 6 +- .../binder/referential/common/SpeciesBinder.java | 6 +- .../referential/common/SpeciesGroupBinder.java | 6 +- .../referential/common/SpeciesListBinder.java | 6 +- .../binder/referential/common/VesselBinder.java | 6 +- .../common/VesselSizeCategoryBinder.java | 6 +- .../referential/common/VesselTypeBinder.java | 6 +- .../common/WeightMeasureTypeBinder.java | 6 +- .../longline/BaitHaulingStatusBinder.java | 6 +- .../longline/BaitSettingStatusBinder.java | 6 +- .../referential/longline/BaitTypeBinder.java | 6 +- .../longline/CatchFateLonglineBinder.java | 6 +- .../referential/longline/EncounterTypeBinder.java | 6 +- .../referential/longline/HealthnessBinder.java | 6 +- .../referential/longline/HookPositionBinder.java | 6 +- .../referential/longline/HookSizeBinder.java | 6 +- .../referential/longline/HookTypeBinder.java | 6 +- .../longline/ItemHorizontalPositionBinder.java | 6 +- .../longline/ItemVerticalPositionBinder.java | 6 +- .../longline/LightsticksColorBinder.java | 6 +- .../longline/LightsticksTypeBinder.java | 6 +- .../referential/longline/LineTypeBinder.java | 6 +- .../referential/longline/MaturityStatusBinder.java | 6 +- .../referential/longline/MitigationTypeBinder.java | 6 +- .../referential/longline/SensorBrandBinder.java | 6 +- .../longline/SensorDataFormatBinder.java | 6 +- .../referential/longline/SensorTypeBinder.java | 6 +- .../referential/longline/SettingShapeBinder.java | 6 +- .../referential/longline/StomacFullnessBinder.java | 6 +- .../referential/longline/TripTypeBinder.java | 6 +- .../longline/VesselActivityLonglineBinder.java | 6 +- .../referential/seine/DetectionModeBinder.java | 6 +- .../binder/referential/seine/ObjectFateBinder.java | 6 +- .../referential/seine/ObjectOperationBinder.java | 6 +- .../binder/referential/seine/ObjectTypeBinder.java | 6 +- .../referential/seine/ObservedSystemBinder.java | 6 +- .../referential/seine/ReasonForDiscardBinder.java | 6 +- .../seine/ReasonForNoFishingBinder.java | 6 +- .../referential/seine/ReasonForNullSetBinder.java | 6 +- .../referential/seine/SpeciesFateBinder.java | 6 +- .../referential/seine/SpeciesStatusBinder.java | 6 +- .../seine/SurroundingActivityBinder.java | 6 +- .../seine/TransmittingBuoyOperationBinder.java | 6 +- .../seine/TransmittingBuoyTypeBinder.java | 6 +- .../seine/VesselActivitySeineBinder.java | 6 +- .../referential/seine/WeightCategoryBinder.java | 6 +- .../binder/referential/seine/WindBinder.java | 6 +- .../binder/BinderEngineMetadataTest.java | 8 +- .../binder/ReferenceBinderEngineTest.java | 4 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../services/rest/http/ObserveRequestBuilder.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 6 +- .../service/ReferenceValuesSetServiceRestTest.java | 6 +- .../rest/service/ReferentialServiceRestTest.java | 4 +- .../report/AbstractReportServiceRestTest.java | 10 +- .../report/ReportAccessoryCatchRestTest.java | 6 +- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 6 +- .../services/topia/ObserveServiceFactoryTopia.java | 2 +- .../services/topia/ObserveServiceTopia.java | 24 +-- .../topia/service/DataSourceServiceTopia.java | 8 +- .../service/actions/report/ReportServiceTopia.java | 20 +- .../ReferentialSynchronizeDiffServiceTopia.java | 6 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 6 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 4 +- .../sql/InsertSqlStatementGenerator.java | 4 +- .../InsertSqlWithCascadeStatementGenerator.java | 2 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../UpdateSqlWithCascadeStatementGenerator.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 4 +- .../topia/service/data/NavigationServiceTopia.java | 6 +- .../ActivityLongLineEncounterServiceTopia.java | 6 +- .../ActivityLongLineSensorUsedServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 12 +- .../data/longline/BranchlineServiceTopia.java | 6 +- .../longline/LonglinePositionSetDtoHelper.java | 10 +- .../longline/SetLonglineCatchServiceTopia.java | 6 +- .../SetLonglineDetailCompositionServiceTopia.java | 6 +- .../SetLonglineGlobalCompositionServiceTopia.java | 6 +- .../data/longline/SetLonglineServiceTopia.java | 12 +- .../service/data/longline/TdrServiceTopia.java | 6 +- .../longline/TripLonglineGearUseServiceTopia.java | 6 +- .../data/longline/TripLonglineServiceTopia.java | 16 +- .../data/seine/ActivitySeineServiceTopia.java | 12 +- .../data/seine/FloatingObjectServiceTopia.java | 12 +- .../data/seine/NonTargetCatchServiceTopia.java | 8 +- .../data/seine/NonTargetSampleServiceTopia.java | 10 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 6 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 6 +- .../service/data/seine/RouteServiceTopia.java | 8 +- .../data/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/data/seine/SetSeineServiceTopia.java | 12 +- .../data/seine/TargetCatchServiceTopia.java | 8 +- .../data/seine/TargetSampleServiceTopia.java | 10 +- .../TransmittingBuoyOperationServiceTopia.java | 6 +- .../data/seine/TripSeineGearUseServiceTopia.java | 6 +- .../service/data/seine/TripSeineServiceTopia.java | 16 +- .../referential/ReferentialServiceTopia.java | 20 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../services/topia/TopiaTestClassResource.java | 6 +- .../services/topia/binder/BinderEngineTest.java | 1 + .../topia/entity/ReplicateTestSupport.java | 4 +- .../topia/entity/ReplicateTripLonglineTest.java | 4 +- .../topia/service/AbstractServiceTopiaTest.java | 6 +- .../topia/service/DataSourceServiceTopiaTest.java | 6 +- .../topia/service/ReferentialServiceTopiaTest.java | 4 +- .../observe/services/topia/service/RigthTest.java | 4 +- .../report/AbstractReportServiceTopiaTest.java | 10 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 6 +- .../actions/report/ReportAccessoryCatchTest.java | 6 +- .../report/ReportActivityWithCommentTest.java | 6 +- .../actions/report/ReportAllActivitysTest.java | 6 +- .../actions/report/ReportDailySetAndCatchTest.java | 6 +- .../service/actions/report/ReportDcpUsageTest.java | 6 +- .../actions/report/ReportSeineEquipmentsTest.java | 6 +- .../actions/report/ReportSetByAssociationTest.java | 6 +- .../report/ReportTargetCatchByAssociationTest.java | 6 +- .../ReportTargetDiscardedByAssociationTest.java | 6 +- .../UnidirectionalSynchronizeReferentialTest.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 8 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 4 +- .../service/data/seine/RouteServiceTopiaTest.java | 2 +- .../data/seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 2 +- .../data/seine/TripSeineServiceTopiaTest.java | 5 +- .../topia/service/sql/MigrateTestsDatabases.java | 4 +- services-topia/src/test/resources/validators.xml | 20 +- .../src/test/resources/validators.xml | 20 +- .../validators/AbstractSpeciesFieldValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../validators/QuadrantFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../validators/SpeciesLengthFieldValidator.java | 2 +- .../validators/SpeciesWeightFieldValidator.java | 2 +- ...initions.java => ObserveDataReferenceSets.java} | 13 +- ...stDefinitions.java => ObserveFormRequests.java} | 152 +++++++------- ...s.java => ObserveReferentialReferenceSets.java} | 9 +- .../ReferenceBinderEngine.java | 6 +- .../ReferenceBinderEngineSupplier.java | 2 +- .../java/fr/ird/observe/services/dto/IdHelper.java | 3 +- .../dto/{ => constants}/ObserveModelType.java | 2 +- .../ird/observe/services/dto/{ => form}/Form.java | 4 +- .../FormRequestDefinition.java} | 24 +-- .../FormRequestKeyDefinition.java} | 12 +- .../dto/longline/ActivityLonglineHelper.java | 2 +- .../dto/longline/LonglinePositionAwareDto.java | 2 +- .../dto/longline/LonglinePositionSetDto.java | 2 +- .../services/dto/longline/TripLonglineHelper.java | 2 +- .../dto/{ => reference}/AbstractReference.java | 4 +- .../dto/{ => reference}/DataReference.java | 5 +- .../dto/{ => reference}/DataReferenceList.java | 3 +- .../dto/{ => reference}/DataReferenceSet.java | 3 +- .../ReferenceCollectionSupport.java | 4 +- .../services/dto/{ => reference}/ReferenceMap.java | 5 +- .../ReferenceValueNotFoundException.java | 4 +- .../ReferentialReference.java | 4 +- .../ReferentialReferenceSet.java | 4 +- .../ReferentialReferences.java | 4 +- .../services/dto/referential/PersonHelper.java | 2 + .../services/dto/referential/ProgramHelper.java | 1 + .../services/dto/referential/ReferentialDto.java | 2 +- .../dto/referential/SizeMeasureTypeHelper.java | 1 + .../services/dto/referential/SpeciesListDto.java | 2 + .../services/dto/referential/VesselHelper.java | 2 + .../longline/VesselActivityLonglineHelper.java | 2 +- .../seine/VesselActivitySeineHelper.java | 2 +- .../referential/seine/WeightCategoryHelper.java | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineHelper.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../services/dto/seine/TargetCatchHelper.java | 2 +- .../services/dto/seine/TripSeineHelper.java | 2 +- .../DataSourceCreateConfigurationDto.java | 3 +- ...urceCreateWithNoReferentialImportException.java | 4 +- ...ibleDataSourceCreateConfigurationException.java | 4 +- .../{dto => }/gson/ArrayListMultimapAdapter.java | 2 +- .../services/{dto => }/gson/BlobAdapter.java | 2 +- .../services/{dto => }/gson/ClassAdapter.java | 2 +- .../services/{dto => }/gson/DateAdapter.java | 2 +- .../services/{dto => }/gson/FormAdapter.java | 4 +- .../{dto => }/gson/ImmutableListAdapter.java | 2 +- .../{dto => }/gson/ImmutableMapAdapter.java | 2 +- .../{dto => }/gson/ImmutableMultimapAdapter.java | 2 +- .../{dto => }/gson/ImmutableSetAdapter.java | 2 +- .../services/{dto => }/gson/IntegerAdapter.java | 2 +- .../{dto => }/gson/MultimapAdapterSupport.java | 2 +- .../gson/ObserveBlobsContainerAdapter.java | 2 +- .../{dto => }/gson/ObserveDtoGsonSupplier.java | 30 +-- .../{dto => }/gson/ReferentialMultimapAdapter.java | 2 +- .../{dto => }/gson/ReportVariableAdapter.java | 8 +- .../{dto => }/gson/SetMultimapAdapter.java | 2 +- .../services/{dto => }/gson/VersionAdapter.java | 2 +- .../gson/reference/AbstractReferenceAdapter.java | 4 +- .../gson/reference/DataReferenceAdapter.java | 8 +- .../gson/reference/DataReferenceListAdapter.java | 6 +- .../gson/reference/DataReferenceSetAdapter.java | 6 +- .../ReferenceCollectionSupportAdapter.java | 6 +- .../reference/ReferentialReferenceAdapter.java | 8 +- .../reference/ReferentialReferenceSetAdapter.java | 6 +- .../gson/reference/UnknownReferenceAdapter.java | 8 +- .../{dto => security}/UnauthorizedException.java | 2 +- .../services/service/DataSourceService.java | 6 +- .../actions/report/DataMatrix.java | 2 +- .../{dto => service}/actions/report/Report.java | 4 +- .../service/actions/report/ReportBuilder.java | 6 +- .../actions/report/ReportOperation.java | 2 +- .../actions/report/ReportRequest.java | 2 +- .../service/actions/report/ReportService.java | 2 - .../actions/report/ReportVariable.java | 2 +- .../diff/ReferentialSynchronizeDiffService.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 2 +- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 4 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 2 +- .../services/service/data/NavigationResult.java | 4 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../data/longline/ActivityLonglineService.java | 6 +- .../service/data/longline/BranchlineService.java | 2 +- .../data/longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/data/longline/SetLonglineService.java | 4 +- .../services/service/data/longline/TdrService.java | 2 +- .../data/longline/TripLonglineGearUseService.java | 2 +- .../service/data/longline/TripLonglineService.java | 8 +- .../service/data/seine/ActivitySeineService.java | 6 +- .../service/data/seine/FloatingObjectService.java | 6 +- .../service/data/seine/NonTargetCatchService.java | 2 +- .../service/data/seine/NonTargetSampleService.java | 4 +- .../data/seine/ObjectObservedSpeciesService.java | 2 +- .../data/seine/ObjectSchoolEstimateService.java | 2 +- .../services/service/data/seine/RouteService.java | 6 +- .../service/data/seine/SchoolEstimateService.java | 2 +- .../service/data/seine/SetSeineService.java | 4 +- .../service/data/seine/TargetCatchService.java | 2 +- .../service/data/seine/TargetSampleService.java | 4 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../data/seine/TripSeineGearUseService.java | 2 +- .../service/data/seine/TripSeineService.java | 8 +- .../referential/ObserveReferentialCache.java | 10 +- .../service/referential/ReferentialService.java | 8 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 51083 -> 51118 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 68017 -> 68055 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60907 -> 60940 bytes .../service/actions/report/ReportBuilderTest.java | 4 - 575 files changed, 1487 insertions(+), 1505 deletions(-) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/BinderEngine.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/BinderEngineInitializer.java (83%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/BinderSupport.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia/binder/ReferenceBinderEngineSupplierTopia.java => binder/DefaultReferenceBinderEngineSupplier.java} (77%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/DataBinderSupport.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/ActivityLonglineBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/ActivityLonglineEncouterDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/ActivityLonglineStubDtoBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/BaitsCompositionBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/BasketBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/BranchlineBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/BranchlinesCompositionBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/CatchLonglineBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/EncounterBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/FloatlinesCompositionBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/GearUseFeaturesLonglineBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/HooksCompositionBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SectionBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SensorUsedBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineCatchDtoBinder.java (89%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineStubDtoBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SetLonglineTdrDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/SizeMeasureBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/TdrBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/TripLonglineActivityDtoBinder.java (90%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/TripLonglineBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/TripLonglineGearUseDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/longline/WeightMeasureBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/ActivitySeineBinder.java (97%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/ActivitySeineStubDtoBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/FloatingObjectBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/GearUseFeaturesSeineBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/NonTargetCatchBinder.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/NonTargetLengthBinder.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/NonTargetSampleBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/ObjectObservedSpeciesBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/ObjectSchoolEstimateBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/RouteBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/RouteStubDtoBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/SchoolEstimateBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/SetSeineBinder.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java (89%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/SetSeineTargetCatchDtoBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TargetCatchBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TargetLengthBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TargetSampleBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TransmittingBuoyBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TripSeineBinder.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/data/seine/TripSeineGearUseDtoBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/ReferentialBinderSupport.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/CountryBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/FpaZoneBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/GearBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/GearCaracteristicBinder.java (93%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/GearCaracteristicTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/HarbourBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/LengthLengthParameterBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/LengthWeightParameterBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/OceanBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/OrganismBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/PersonBinder.java (94%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/ProgramBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/SexBinder.java (90%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/ShipOwnerBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/SizeMeasureTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/SpeciesBinder.java (95%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/SpeciesGroupBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/SpeciesListBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/VesselBinder.java (96%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/VesselSizeCategoryBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/VesselTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/common/WeightMeasureTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/BaitHaulingStatusBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/BaitSettingStatusBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/BaitTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/CatchFateLonglineBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/EncounterTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/HealthnessBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/HookPositionBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/HookSizeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/HookTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/ItemHorizontalPositionBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/ItemVerticalPositionBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/LightsticksColorBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/LightsticksTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/LineTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/MaturityStatusBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/MitigationTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/SensorBrandBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/SensorDataFormatBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/SensorTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/SettingShapeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/StomacFullnessBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/TripTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/longline/VesselActivityLonglineBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/DetectionModeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ObjectFateBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ObjectOperationBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ObjectTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ObservedSystemBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ReasonForDiscardBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ReasonForNoFishingBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/ReasonForNullSetBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/SpeciesFateBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/SpeciesStatusBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/SurroundingActivityBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/TransmittingBuoyOperationBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/TransmittingBuoyTypeBinder.java (91%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/VesselActivitySeineBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/WeightCategoryBinder.java (92%) rename services-binder/src/main/java/fr/ird/observe/services/{topia => }/binder/referential/seine/WindBinder.java (92%) rename services-binder/src/test/java/fr/ird/observe/services/{topia => }/binder/BinderEngineMetadataTest.java (97%) rename services-binder/src/test/java/fr/ird/observe/services/{topia => }/binder/ReferenceBinderEngineTest.java (86%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/AbstractSpeciesFieldValidator.java (99%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/ActivityFinDeVeilleExistsValidator.java (99%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/ActivitySimpleSpeedValidator.java (99%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/ActivitySpeedValidator.java (99%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/CollectionUniqueKeyValidator2.java (96%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/ObserveCollectionUniqueKeyValidator.java (99%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/QuadrantFieldValidator.java (97%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/SetLonglineUniqueHomeIdValidator.java (98%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/SetLonglineUniqueNumberValidator.java (98%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/SpeciesLengthFieldValidator.java (96%) rename services-validators/src/main/java/fr/ird/observe/services/{topia => }/validators/SpeciesWeightFieldValidator.java (96%) rename services/src/main/java/fr/ird/observe/services/{dto/reference/DataReferenceSetDefinitions.java => ObserveDataReferenceSets.java} (97%) rename services/src/main/java/fr/ird/observe/services/{dto/reference/request/ReferenceSetRequestDefinitions.java => ObserveFormRequests.java} (77%) rename services/src/main/java/fr/ird/observe/services/{dto/reference/ReferentialReferenceSetDefinitions.java => ObserveReferentialReferenceSets.java} (98%) rename services/src/main/java/fr/ird/observe/services/{dto/reference => binder}/ReferenceBinderEngine.java (89%) rename services/src/main/java/fr/ird/observe/services/{dto/reference => binder}/ReferenceBinderEngineSupplier.java (98%) rename services/src/main/java/fr/ird/observe/services/dto/{ => constants}/ObserveModelType.java (95%) rename services/src/main/java/fr/ird/observe/services/dto/{ => form}/Form.java (96%) rename services/src/main/java/fr/ird/observe/services/dto/{reference/request/ReferenceSetRequestDefinition.java => form/FormRequestDefinition.java} (73%) rename services/src/main/java/fr/ird/observe/services/dto/{reference/request/ReferenceSetRequestKeyDefinition.java => form/FormRequestKeyDefinition.java} (84%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/AbstractReference.java (97%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/DataReference.java (93%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/DataReferenceList.java (94%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/DataReferenceSet.java (94%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/ReferenceCollectionSupport.java (93%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/ReferenceMap.java (87%) rename services/src/main/java/fr/ird/observe/services/dto/{ => reference}/ReferenceValueNotFoundException.java (94%) rename services/src/main/java/fr/ird/observe/services/dto/{referential => reference}/ReferentialReference.java (96%) rename services/src/main/java/fr/ird/observe/services/dto/{referential => reference}/ReferentialReferenceSet.java (95%) rename services/src/main/java/fr/ird/observe/services/dto/{referential => reference}/ReferentialReferences.java (94%) rename services/src/main/java/fr/ird/observe/services/dto/{ => source}/DataSourceCreateConfigurationDto.java (98%) rename services/src/main/java/fr/ird/observe/services/dto/{ => source}/DataSourceCreateWithNoReferentialImportException.java (91%) rename services/src/main/java/fr/ird/observe/services/dto/{ => source}/IncompatibleDataSourceCreateConfigurationException.java (91%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ArrayListMultimapAdapter.java (96%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/BlobAdapter.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ClassAdapter.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/DateAdapter.java (99%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/FormAdapter.java (96%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ImmutableListAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ImmutableMapAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ImmutableMultimapAdapter.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ImmutableSetAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/IntegerAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/MultimapAdapterSupport.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ObserveBlobsContainerAdapter.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ObserveDtoGsonSupplier.java (85%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ReferentialMultimapAdapter.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/ReportVariableAdapter.java (92%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/SetMultimapAdapter.java (96%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/VersionAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/AbstractReferenceAdapter.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/DataReferenceAdapter.java (85%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/DataReferenceListAdapter.java (93%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/DataReferenceSetAdapter.java (93%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/ReferenceCollectionSupportAdapter.java (94%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/ReferentialReferenceAdapter.java (94%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/ReferentialReferenceSetAdapter.java (93%) rename services/src/main/java/fr/ird/observe/services/{dto => }/gson/reference/UnknownReferenceAdapter.java (90%) rename services/src/main/java/fr/ird/observe/services/{dto => security}/UnauthorizedException.java (96%) rename services/src/main/java/fr/ird/observe/services/{dto => service}/actions/report/DataMatrix.java (99%) rename services/src/main/java/fr/ird/observe/services/{dto => service}/actions/report/Report.java (97%) rename services/src/main/java/fr/ird/observe/services/{dto => service}/actions/report/ReportOperation.java (95%) rename services/src/main/java/fr/ird/observe/services/{dto => service}/actions/report/ReportRequest.java (98%) rename services/src/main/java/fr/ird/observe/services/{dto => service}/actions/report/ReportVariable.java (97%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (f6a4ad7 -> 4831b2f)
by codelutin.com scm 22 Dec '16

22 Dec '16

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 f6a4ad7 update license header and my email adress new 4831b2f review modules order + optimize dependencies The 1 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 4831b2fc06ef411a01e52d6de2a198f5590f4e3c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 17:24:20 2016 +0100 review modules order + optimize dependencies Summary of changes: pom.xml | 2 +- services/pom.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (88baa79 -> f6a4ad7)
by codelutin.com scm 22 Dec '16

22 Dec '16

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 88baa79 Renommage de modules de services new f6a4ad7 update license header and my email adress The 1 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 f6a4ad7e659ceedcc8bd582028997aa319dd6924 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 17:07:26 2016 +0100 update license header and my email adress Summary of changes: .../ObserveSwingApplicationConfig.java | 4 ++-- .../configuration/constants/CreationMode.java | 4 ++-- .../swing/configuration/constants/DbMode.java | 4 ++-- .../src/main/resources/log4j.properties | 4 ++-- .../src/main/resources/observe-log4j.properties | 4 ++-- .../src/main/resources/validators.xml | 2 +- .../swing/decoration/DecoratorService.java | 2 +- .../decoration/ObserveI18nDecoratorHelper.java | 2 +- .../decorators/LengthLengthParameterDecorator.java | 2 +- .../decorators/LengthWeightParameterDecorator.java | 2 +- .../decorators/NonTargetCatchDecorator.java | 2 +- .../decorators/NonTargetLengthDecorator.java | 2 +- .../decorators/ObjectObservedSpeciesDecorator.java | 2 +- .../decoration/decorators/ObserveDecorator.java | 2 +- .../decoration/decorators/SpeciesDecorator.java | 2 +- .../decorators/TargetCatchDecorator.java | 2 +- .../decorators/TripLonglineDecorator.java | 2 +- .../decoration/decorators/TripSeineDecorator.java | 2 +- .../validation/BeanValidatorDetectorTest.java | 2 +- .../AbstractSpeciesFieldDtoValidator.java | 2 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../ActivitySimpleSpeedDtoValidator.java | 2 +- .../validators/ActivitySpeedDtoValidator.java | 2 +- .../CollectionUniqueKeyDtoValidator.java | 2 +- .../CoordinateLatitudeDtoFieldValidator.java | 2 +- .../CoordinateLongitudeDtoFieldValidator.java | 2 +- .../ObserveCollectionUniqueKeyDtoValidator.java | 2 +- .../validators/OpenableDtoFieldValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../SetLonglineUniqueNumberDtoValidator.java | 2 +- .../validators/SpeciesLengthFieldDtoValidator.java | 2 +- .../validators/SpeciesWeightFieldDtoValidator.java | 2 +- .../application/swing/LocalDatabaseBackupTask.java | 2 +- .../application/swing/ObserveActionExecutor.java | 2 +- .../observe/application/swing/ObserveCLAction.java | 4 ++-- .../application/swing/ObserveResourceManager.java | 2 +- .../observe/application/swing/ObserveRunner.java | 2 +- .../swing/ObserveSwingApplicationContext.java | 2 +- .../ObserveSwingApplicationDataSourcesManager.java | 2 +- .../swing/ObserveSwingSessionHelper.java | 2 +- .../swing/ObserveSwingTechnicalException.java | 2 +- .../ird/observe/application/swing/RunObserve.java | 2 +- .../swing/db/ObserveSwingDataSource.java | 2 +- .../swing/db/constants/ConnexionStatus.java | 2 +- .../swing/db/constants/DataContextType.java | 2 +- .../db/event/ObserveSwingDataSourceEvent.java | 2 +- .../db/event/ObserveSwingDataSourceListener.java | 2 +- .../ObserveSwingDataSourceListenerAdapter.java | 2 +- .../application/swing/ui/MnemonicHelper.java | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../swing/ui/ObserveMainUIInitializer.java | 2 +- .../application/swing/ui/ObserveMainUIModel.java | 2 +- .../application/swing/ui/ObserveUICallback.java | 2 +- .../application/swing/ui/ObserveUIMode.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 2 +- .../swing/ui/actions/AbstractObserveAction.java | 2 +- .../swing/ui/actions/AbstractUIAction.java | 2 +- .../actions/content/AbstractContentUIAction.java | 2 +- .../content/AddActivityLonglineSetUIAction.java | 2 +- .../AddActivitySeineFloatingObjectUIAction.java | 2 +- .../content/AddActivitySeineSetUIAction.java | 2 +- .../content/BackToReferentialListUIAction.java | 2 +- .../ui/actions/content/CloseAndCreateUIAction.java | 2 +- .../ui/actions/content/CloseOpenUIAction.java | 2 +- .../content/CreateNewReferentialUIAction.java | 2 +- .../ui/actions/content/CreateOpenUIAction.java | 2 +- .../ui/actions/content/DeleteDataUIAction.java | 2 +- .../actions/content/DeleteReferenceUIAction.java | 2 +- .../actions/content/DeleteTableEntryUIAction.java | 2 +- .../content/EditReferentialFromListUIAction.java | 2 +- .../actions/content/EditReferentialUIAction.java | 2 +- .../swing/ui/actions/content/GoDownUIAction.java | 2 +- .../swing/ui/actions/content/GoUpUIAction.java | 2 +- .../ui/actions/content/NewTableEntryUIAction.java | 2 +- .../swing/ui/actions/content/ReOpenUIAction.java | 2 +- .../ui/actions/content/ResetEditUIAction.java | 2 +- .../actions/content/ResetTableEntryUIAction.java | 2 +- .../swing/ui/actions/content/SaveEditUIAction.java | 2 +- .../ui/actions/content/SaveTableEntryUIAction.java | 2 +- .../ui/actions/content/SelectNodeUIAction.java | 2 +- .../ui/actions/content/SelectOpenNodeUIAction.java | 2 +- .../ui/actions/global/AbstractGlobalUIAction.java | 2 +- .../actions/global/ChangeFocusGlobalUIAction.java | 2 +- .../actions/global/DeleteDataGlobalUIAction.java | 2 +- .../actions/global/NewNextDataGlobalUIAction.java | 2 +- .../global/OpenCloseDataGlobalUIAction.java | 2 +- .../ui/actions/global/ResetDataGlobalUIAction.java | 2 +- .../ui/actions/global/SaveDataGlobalUIAction.java | 2 +- .../menu/action/LaunchAdminActionSupport.java | 2 +- .../menu/action/LaunchConsolidateAction.java | 2 +- .../menu/action/LaunchDataSynchronizeAction.java | 2 +- .../menu/action/LaunchExportDataAction.java | 2 +- .../action/LaunchReferentialSynchronizeAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 2 +- .../menu/action/LaunchSynchronizeAction.java | 2 +- .../actions/menu/action/LaunchValidateAction.java | 2 +- .../ChangeApplicationLanguageActionSupport.java | 2 +- .../ChangeApplicationLanguageToEnglishAction.java | 2 +- .../ChangeApplicationLanguageToFrenchAction.java | 2 +- .../ChangeApplicationLanguageToSpanishAction.java | 2 +- .../menu/config/ChangeDbLanguageActionSupport.java | 2 +- .../config/ChangeDbLanguageToEnglishAction.java | 2 +- .../config/ChangeDbLanguageToFrenchAction.java | 2 +- .../config/ChangeDbLanguageToSpanishAction.java | 2 +- .../config/ReloadDefaultConfigurationAction.java | 2 +- .../actions/menu/config/ReloadResourcesAction.java | 2 +- .../ui/actions/menu/config/ShowConfigAction.java | 2 +- .../menu/config/ShowDataSourcePresetsAction.java | 24 +++++++++++++++++++++- .../actions/menu/file/CloseApplicationAction.java | 2 +- .../actions/menu/file/ReloadApplicationAction.java | 2 +- .../ui/actions/menu/file/ToFullScreenAction.java | 2 +- .../ui/actions/menu/file/ToWindowScreenAction.java | 2 +- .../swing/ui/actions/menu/help/GotoSiteAction.java | 2 +- .../ui/actions/menu/help/ShowAboutAction.java | 2 +- .../actions/menu/navigation/GotoActionSupport.java | 2 +- .../menu/navigation/GotoOpenActivityAction.java | 2 +- .../menu/navigation/GotoOpenProgramAction.java | 2 +- .../menu/navigation/GotoOpenRouteAction.java | 2 +- .../actions/menu/navigation/GotoOpenSetAction.java | 2 +- .../menu/navigation/GotoOpenTripAction.java | 2 +- .../navigation/GotoReferentialCommonAction.java | 2 +- .../navigation/GotoReferentialLonglineAction.java | 2 +- .../navigation/GotoReferentialSeineAction.java | 2 +- .../actions/menu/storage/ChangeStorageAction.java | 2 +- .../actions/menu/storage/CloseStorageAction.java | 4 ++-- .../menu/storage/ImportStorageFromFileAction.java | 2 +- .../actions/menu/storage/ReloadStorageAction.java | 2 +- .../menu/storage/SaveStorageToFileAction.java | 2 +- .../menu/storage/ShowStorageInfoAction.java | 2 +- .../menu/storage/StartH2WebServerAction.java | 2 +- .../menu/storage/StartServerModeAction.java | 2 +- .../menu/storage/StopH2WebServerAction.java | 2 +- .../actions/menu/storage/StopServerModeAction.java | 2 +- .../SaveCurrentRemoteConfigurationUIAction.java | 24 +++++++++++++++++++++- .../SaveCurrentServerConfigurationUIAction.java | 24 +++++++++++++++++++++- .../storage/UseRemoteConfigurationUIAction.java | 24 +++++++++++++++++++++- .../storage/UseServerConfigurationUIAction.java | 24 +++++++++++++++++++++- .../swing/ui/admin/AdminActionModel.java | 2 +- .../swing/ui/admin/AdminActionWorker.java | 2 +- .../application/swing/ui/admin/AdminStep.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 2 +- .../application/swing/ui/admin/AdminUIHandler.java | 2 +- .../swing/ui/admin/AdminUILauncher.java | 4 ++-- .../application/swing/ui/admin/AdminUIModel.java | 2 +- .../swing/ui/admin/config/ConfigModel.java | 2 +- .../swing/ui/admin/config/ConfigUIHandler.java | 4 ++-- .../swing/ui/admin/config/SelectDataModel.java | 2 +- .../swing/ui/admin/config/SelectDataUIHandler.java | 2 +- .../ui/admin/consolidate/ConsolidateModel.java | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../swing/ui/admin/export/ExportModel.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 2 +- .../ui/admin/export/TripToExportTableModel.java | 2 +- .../swing/ui/admin/report/ReportModel.java | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 2 +- .../swing/ui/admin/report/ResultTableModel.java | 2 +- .../swing/ui/admin/resume/ShowResumeModel.java | 2 +- .../swing/ui/admin/resume/ShowResumeUIHandler.java | 2 +- .../swing/ui/admin/save/SaveLocalModel.java | 2 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 2 +- .../admin/synchronize/data/DataSynchroModel.java | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 2 +- .../data/DataSynchronizeTaskListCellRenderer.java | 2 +- .../data/task/CopyToLeftDataSynchronizeTask.java | 2 +- .../data/task/CopyToRightDataSynchronizeTask.java | 2 +- .../data/task/DataSynchronizeTaskSupport.java | 2 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 2 +- .../task/DeleteFromRightDataSynchronizeTask.java | 2 +- .../referential/ReferentialSynchronizeMode.java | 2 +- .../legacy/ObsoleteReferentialReference.java | 2 +- .../referential/legacy/SynchronizeModel.java | 4 ++-- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../referential/ng/ReferentialSynchroModel.java | 2 +- .../ng/ReferentialSynchroUIHandler.java | 2 +- .../ng/ReferentialSynchronizeResources.java | 2 +- ...ReferentialSynchronizeTaskListCellRenderer.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 2 +- .../referential/ng/action/ApplyAction.java | 2 +- .../ng/action/RegisterAddTaskAction.java | 2 +- .../ng/action/RegisterCopyTaskAction.java | 2 +- .../ng/action/RegisterDeleteTaskAction.java | 2 +- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 2 +- .../ng/action/RegisterSkipTaskAction.java | 2 +- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 2 +- .../ng/task/AddReferentialSynchronizeTask.java | 2 +- .../ng/task/DeleteReferentialSynchronizeTask.java | 2 +- .../DesactivateReferentialSynchronizeTask.java | 2 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 2 +- ...ferentialSynchronizeTaskWithReplaceSupport.java | 2 +- .../ng/task/RevertReferentialSynchronizeTask.java | 2 +- .../ng/task/SkipReferentialSynchronizeTask.java | 2 +- .../ng/task/UpdateReferentialSynchronizeTask.java | 2 +- .../ReferentialSynchronizeTreeCellRenderer.java | 2 +- .../ng/tree/ReferentialSynchronizeTreeModel.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 2 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 2 +- .../tree/node/ReferentialSynchroNodeSupport.java | 2 +- .../ng/tree/node/RootReferentialSynchroNode.java | 2 +- .../ng/tree/node/TypeReferentialSynchroNode.java | 2 +- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../swing/ui/admin/validate/ValidateModel.java | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../application/swing/ui/content/ContentMode.java | 2 +- .../swing/ui/content/ContentUIBlockingLayerUI.java | 2 +- .../swing/ui/content/ContentUIHandler.java | 2 +- .../swing/ui/content/ContentUIInitializer.java | 4 ++-- .../swing/ui/content/ContentUIManager.java | 2 +- .../swing/ui/content/ContentUIModel.java | 2 +- .../swing/ui/content/ObserveActionMap.java | 2 +- .../swing/ui/content/ObserveContentUI.java | 2 +- .../swing/ui/content/ObserveFocusManager.java | 2 +- .../content/impl/longline/BasketsTableModel.java | 2 +- .../content/impl/longline/BranchlineUIHandler.java | 2 +- .../content/impl/longline/BranchlineUIModel.java | 2 +- .../impl/longline/BranchlinesTableModel.java | 2 +- .../LonglineCompositionTableModelSupport.java | 2 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineDetailCompositionUIInitializer.java | 2 +- .../longline/LonglineDetailCompositionUIModel.java | 2 +- ...onglineDetailCompositionUIValidationHelper.java | 2 +- ...LonglineDetailCompositionValidationContext.java | 2 +- .../LonglineDetailCompositionValidatorService.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../longline/LonglineGlobalCompositionUIModel.java | 2 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../content/impl/longline/SectionsTableModel.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../content/impl/longline/SetLonglineUIModel.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../content/impl/seine/FloatingObjectUIModel.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIModel.java | 2 +- .../ui/content/list/ContentListUIHandler.java | 2 +- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglinesUIModel.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIModel.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIModel.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIModel.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIModel.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIModel.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIModel.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../content/open/impl/seine/TripSeineUIModel.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../content/ref/ContentReferenceUIInitializer.java | 2 +- .../ui/content/ref/ContentReferenceUIModel.java | 2 +- .../ui/content/ref/ReferenceHomeCommonUI.java | 24 +++++++++++++++++++++- .../ui/content/ref/ReferenceHomeLonglineUI.java | 24 +++++++++++++++++++++- .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 24 +++++++++++++++++++++- .../ui/content/ref/ReferenceHomeUIHandler.java | 2 +- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 2 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 2 +- .../ui/content/ref/impl/CountryUIHandler.java | 2 +- .../swing/ui/content/ref/impl/CountryUIModel.java | 2 +- .../ui/content/ref/impl/FpaZoneUIHandler.java | 2 +- .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 2 +- .../ref/impl/GearCaracteristicTypeUIHandler.java | 2 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 2 +- .../ref/impl/GearCaracteristicUIHandler.java | 2 +- .../content/ref/impl/GearCaracteristicUIModel.java | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../swing/ui/content/ref/impl/GearUIModel.java | 2 +- .../ui/content/ref/impl/HarbourUIHandler.java | 2 +- .../swing/ui/content/ref/impl/HarbourUIModel.java | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../ref/impl/LengthLengthParameterUIModel.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../ref/impl/LengthWeightParameterUIModel.java | 2 +- .../swing/ui/content/ref/impl/OceanUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OceanUIModel.java | 2 +- .../ui/content/ref/impl/OrganismUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OrganismUIModel.java | 2 +- .../swing/ui/content/ref/impl/PersonUIHandler.java | 2 +- .../swing/ui/content/ref/impl/PersonUIModel.java | 2 +- .../content/ref/impl/ProgramObservationEnum.java | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../swing/ui/content/ref/impl/ProgramUIModel.java | 2 +- .../swing/ui/content/ref/impl/SexUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SexUIModel.java | 2 +- .../ui/content/ref/impl/ShipOwnerUIHandler.java | 2 +- .../ui/content/ref/impl/ShipOwnerUIModel.java | 4 ++-- .../content/ref/impl/SizeMeasureTypeUIHandler.java | 2 +- .../content/ref/impl/SizeMeasureTypeUIModel.java | 2 +- .../ui/content/ref/impl/SpeciesGroupUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesGroupUIModel.java | 2 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 2 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 2 +- .../ref/impl/VesselSizeCategoryUIHandler.java | 2 +- .../ref/impl/VesselSizeCategoryUIModel.java | 2 +- .../ui/content/ref/impl/VesselTypeUIHandler.java | 2 +- .../ui/content/ref/impl/VesselTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 2 +- .../swing/ui/content/ref/impl/VesselUIModel.java | 2 +- .../ref/impl/WeightMeasureTypeUIHandler.java | 2 +- .../content/ref/impl/WeightMeasureTypeUIModel.java | 2 +- .../impl/longline/BaitHaulingStatusUIHandler.java | 2 +- .../impl/longline/BaitHaulingStatusUIModel.java | 2 +- .../impl/longline/BaitSettingStatusUIHandler.java | 2 +- .../impl/longline/BaitSettingStatusUIModel.java | 2 +- .../ref/impl/longline/BaitTypeUIHandler.java | 2 +- .../content/ref/impl/longline/BaitTypeUIModel.java | 2 +- .../impl/longline/CatchFateLonglineUIHandler.java | 2 +- .../impl/longline/CatchFateLonglineUIModel.java | 2 +- .../ref/impl/longline/EncounterTypeUIHandler.java | 2 +- .../ref/impl/longline/EncounterTypeUIModel.java | 2 +- .../ref/impl/longline/HealthnessUIHandler.java | 2 +- .../ref/impl/longline/HealthnessUIModel.java | 2 +- .../ref/impl/longline/HookPositionUIHandler.java | 2 +- .../ref/impl/longline/HookPositionUIModel.java | 2 +- .../ref/impl/longline/HookSizeUIHandler.java | 2 +- .../content/ref/impl/longline/HookSizeUIModel.java | 2 +- .../ref/impl/longline/HookTypeUIHandler.java | 2 +- .../content/ref/impl/longline/HookTypeUIModel.java | 2 +- .../longline/ItemHorizontalPositionUIHandler.java | 2 +- .../longline/ItemHorizontalPositionUIModel.java | 2 +- .../longline/ItemVerticalPositionUIHandler.java | 2 +- .../impl/longline/ItemVerticalPositionUIModel.java | 2 +- .../impl/longline/LightsticksColorUIHandler.java | 2 +- .../ref/impl/longline/LightsticksColorUIModel.java | 2 +- .../impl/longline/LightsticksTypeUIHandler.java | 2 +- .../ref/impl/longline/LightsticksTypeUIModel.java | 2 +- .../ref/impl/longline/LineTypeUIHandler.java | 2 +- .../content/ref/impl/longline/LineTypeUIModel.java | 2 +- .../ref/impl/longline/MaturityStatusUIHandler.java | 2 +- .../ref/impl/longline/MaturityStatusUIModel.java | 2 +- .../ref/impl/longline/MitigationTypeUIHandler.java | 2 +- .../ref/impl/longline/MitigationTypeUIModel.java | 2 +- .../ref/impl/longline/SensorBrandUIHandler.java | 2 +- .../ref/impl/longline/SensorBrandUIModel.java | 2 +- .../impl/longline/SensorDataFormatUIHandler.java | 2 +- .../ref/impl/longline/SensorDataFormatUIModel.java | 2 +- .../ref/impl/longline/SensorTypeUIHandler.java | 2 +- .../ref/impl/longline/SensorTypeUIModel.java | 2 +- .../ref/impl/longline/SettingShapeUIHandler.java | 2 +- .../ref/impl/longline/SettingShapeUIModel.java | 2 +- .../ref/impl/longline/StomacFullnessUIHandler.java | 2 +- .../ref/impl/longline/StomacFullnessUIModel.java | 2 +- .../ref/impl/longline/TripTypeUIHandler.java | 2 +- .../content/ref/impl/longline/TripTypeUIModel.java | 2 +- .../longline/VesselActivityLonglineUIHandler.java | 2 +- .../longline/VesselActivityLonglineUIModel.java | 2 +- .../ref/impl/seine/DetectionModeUIHandler.java | 2 +- .../ref/impl/seine/DetectionModeUIModel.java | 2 +- .../ref/impl/seine/ObjectFateUIHandler.java | 2 +- .../content/ref/impl/seine/ObjectFateUIModel.java | 2 +- .../ref/impl/seine/ObjectOperationUIHandler.java | 2 +- .../ref/impl/seine/ObjectOperationUIModel.java | 2 +- .../ref/impl/seine/ObjectTypeUIHandler.java | 2 +- .../content/ref/impl/seine/ObjectTypeUIModel.java | 2 +- .../ref/impl/seine/ObservedSystemUIHandler.java | 2 +- .../ref/impl/seine/ObservedSystemUIModel.java | 2 +- .../ref/impl/seine/ReasonForDiscardUIHandler.java | 2 +- .../ref/impl/seine/ReasonForDiscardUIModel.java | 2 +- .../impl/seine/ReasonForNoFishingUIHandler.java | 2 +- .../ref/impl/seine/ReasonForNoFishingUIModel.java | 2 +- .../ref/impl/seine/ReasonForNullSetUIHandler.java | 2 +- .../ref/impl/seine/ReasonForNullSetUIModel.java | 2 +- .../ref/impl/seine/SpeciesFateUIHandler.java | 2 +- .../content/ref/impl/seine/SpeciesFateUIModel.java | 2 +- .../ref/impl/seine/SpeciesStatusUIHandler.java | 2 +- .../ref/impl/seine/SpeciesStatusUIModel.java | 2 +- .../impl/seine/SurroundingActivityUIHandler.java | 2 +- .../ref/impl/seine/SurroundingActivityUIModel.java | 2 +- .../seine/TransmittingBuoyOperationUIHandler.java | 2 +- .../seine/TransmittingBuoyOperationUIModel.java | 2 +- .../impl/seine/TransmittingBuoyTypeUIHandler.java | 2 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 2 +- .../impl/seine/VesselActivitySeineUIHandler.java | 2 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 2 +- .../ref/impl/seine/WeightCategoryUIHandler.java | 2 +- .../ref/impl/seine/WeightCategoryUIModel.java | 2 +- .../ui/content/ref/impl/seine/WindUIHandler.java | 2 +- .../ui/content/ref/impl/seine/WindUIModel.java | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 4 +--- .../content/ref/usage/UsageForDeleteUIHandler.java | 24 +++++++++++++++++++++- .../content/ref/usage/UsageForDesactivateUI.jaxx | 4 +--- .../ref/usage/UsageForDesactivateUIHandler.java | 24 +++++++++++++++++++++- .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 4 +--- .../ref/usage/UsageForDisplayUIHandler.java | 24 +++++++++++++++++++++- .../content/ref/usage/UsageUIHandlerSupport.java | 24 +++++++++++++++++++++- .../swing/ui/content/table/ContentTableMeta.java | 2 +- .../swing/ui/content/table/ContentTableModel.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../content/table/ContentTableUIInitializer.java | 2 +- .../ui/content/table/ContentTableUIModel.java | 6 +++--- .../ui/content/table/ObserveContentTableUI.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../impl/longline/BaitsCompositionUIHandler.java | 2 +- .../impl/longline/BaitsCompositionUIModel.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIModel.java | 2 +- .../impl/longline/CatchAcquisitionModeEnum.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineTableModel.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../table/impl/longline/CatchLonglineUIModel.java | 2 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../table/impl/longline/EncounterUIModel.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIModel.java | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIModel.java | 2 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIModel.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../ui/content/table/impl/longline/TdrUIModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../table/impl/seine/AbstractSampleUIHandler.java | 2 +- .../content/table/impl/seine/CodeMesureEnum.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIModel.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIModel.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIModel.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIModel.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIModel.java | 2 +- .../impl/seine/TargetSampleCaptureUIHandler.java | 2 +- .../impl/seine/TargetSampleRejeteUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIModel.java | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 2 +- .../swing/ui/storage/RemoteUILauncher.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 2 +- .../application/swing/ui/storage/StorageStep.java | 2 +- .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/StorageUILauncher.java | 4 ++-- .../swing/ui/storage/StorageUIModel.java | 2 +- .../swing/ui/storage/presets/RemotePresetsUI.jaxx | 23 ++++++++++++++++++++- .../ui/storage/presets/RemotePresetsUIHandler.java | 24 +++++++++++++++++++++- .../ui/storage/presets/RemotePresetsUIModel.java | 24 +++++++++++++++++++++- .../swing/ui/storage/tabs/BackupUIHandler.java | 2 +- .../ui/storage/tabs/ChooseDbModeUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigDataUIHandler.java | 2 +- .../storage/tabs/ConfigReferentielUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfirmUIHandler.java | 2 +- .../swing/ui/storage/tabs/RolesTableModel.java | 2 +- .../swing/ui/storage/tabs/RolesUIHandler.java | 2 +- .../swing/ui/storage/tabs/SecurityModel.java | 2 +- .../swing/ui/storage/tabs/SelectDataUIHandler.java | 2 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 2 +- .../swing/ui/tree/ObserveTreeNodeSupport.java | 2 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 2 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 2 +- .../navigation/NavigationTreeCellRenderer.java | 2 +- .../ui/tree/navigation/NavigationTreeModel.java | 2 +- .../navigation/nodes/ClassNavigationTreeNode.java | 2 +- .../nodes/NavigationTreeNodeSupport.java | 2 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../nodes/StringNavigationTreeNodeSupport.java | 2 +- .../tree/navigation/nodes/WithChildsToReload.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 2 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../longline/CatchLonglineNavigationTreeNode.java | 2 +- .../EncounterLonglineNavigationTreeNode.java | 2 +- .../GearUseFeaturesLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 2 +- .../SensorUsedLonglineNavigationTreeNode.java | 2 +- ...etailCompositionLonglineNavigationTreeNode.java | 2 +- ...lobalCompositionLonglineNavigationTreeNode.java | 2 +- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TdrLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../referential/ReferentialNavigationTreeNode.java | 2 +- .../ReferentialsCommonNavigationTreeNode.java | 2 +- .../ReferentialsLonglineNavigationTreeNode.java | 2 +- .../ReferentialsNavigationTreeNodeSupport.java | 2 +- .../ReferentialsSeineNavigationTreeNode.java | 2 +- .../seine/ActivitiesSeineNavigationTreeNode.java | 2 +- .../seine/ActivitySeineNavigationTreeNode.java | 2 +- ...cardedTargetCatchesSeineNavigationTreeNode.java | 2 +- ...cardedTargetSamplesSeineNavigationTreeNode.java | 2 +- .../FloatingObjectSeineNavigationTreeNode.java | 2 +- ...ngObjectTransmittingBuoyNavigationTreeNode.java | 4 ++-- .../GearUseFeaturesSeineNavigationTreeNode.java | 2 +- .../KeptTargetCatchesSeineNavigationTreeNode.java | 2 +- .../KeptTargetSamplesSeineNavigationTreeNode.java | 2 +- .../NonTargetCatchesSeineNavigationTreeNode.java | 2 +- .../NoneTargetSamplesSeineNavigationTreeNode.java | 2 +- .../ObjectObservedSpeciesNavigationTreeNode.java | 4 ++-- .../ObjectSchoolEstimateNavigationTreeNode.java | 4 ++-- .../seine/ProgramSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RouteSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 2 +- .../SchoolEstimatesSeineNavigationTreeNode.java | 2 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 2 +- .../nodes/seine/TripSeineNavigationTreeNode.java | 2 +- .../swing/ui/tree/selection/SelectionTree.java | 2 +- .../tree/selection/SelectionTreeCellRenderer.java | 2 +- .../tree/selection/SelectionTreeHeaderHandler.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 2 +- .../selection/nodes/ProgramSelectionTreeNode.java | 2 +- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/ReferentialSelectionTreeNode.java | 2 +- .../nodes/ReferentialsSelectionTreeNode.java | 2 +- .../selection/nodes/RootSelectionTreeNode.java | 2 +- .../selection/nodes/SelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../nodes/TripSeineSelectionTreeNode.java | 2 +- .../nodes/TripSelectionTreeNodeSupport.java | 2 +- .../application/swing/ui/util/BooleanEditor.java | 2 +- .../application/swing/ui/util/FloatConverter.java | 2 +- .../application/swing/ui/util/JComment.jaxx | 23 ++++++++++++++++++++- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ObserveSwingValidatorMessageTableModel.java | 2 +- .../ObserveValidationMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../application/swing/ui/util/ProgressModel.java | 2 +- .../application/swing/ui/util/SpringUtilities.java | 2 +- .../ui/util/table/AbstractSelectTableAction.java | 2 +- .../AutotSelectRowAndShowPopupActionSupport.java | 2 +- .../swing/ui/util/table/EditableList.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 2 +- .../EditableTableWithCacheTableModelSupport.java | 2 +- ...nlineTableAutotSelectRowAndShowPopupAction.java | 2 +- .../util/table/MoveToNextEditableCellAction.java | 2 +- .../ui/util/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../table/ObserveBooleanTableCellRenderer.java | 2 +- .../swing/validation/ObserveSwingValidator.java | 2 +- .../swing/validation/ValidationContext.java | 2 +- .../swing/validation/ValidationModelMode.java | 2 +- ...glineDetailCompositionValidatorServiceTest.java | 2 +- .../configuration/ObserveWebApplicationConfig.java | 4 ++-- .../ObserveWebApplicationConfigInitException.java | 4 ++-- .../db/InvalidObserveWebDatabaseException.java | 4 ++-- .../db/InvalidObserveWebDatabaseRoleException.java | 4 ++-- .../db/InvalidObserveWebDatabasesException.java | 4 ++-- .../web/configuration/db/ObserveWebDatabase.java | 4 ++-- .../configuration/db/ObserveWebDatabaseRole.java | 4 ++-- .../web/configuration/db/ObserveWebDatabases.java | 4 ++-- .../db/ObserveWebDatabasesHelper.java | 4 ++-- .../db/impl/ObserveWebDatabaseBean.java | 4 ++-- .../db/impl/ObserveWebDatabaseImmutable.java | 4 ++-- .../db/impl/ObserveWebDatabaseRoleBean.java | 4 ++-- .../db/impl/ObserveWebDatabaseRoleImmutable.java | 4 ++-- .../db/impl/ObserveWebDatabasesBean.java | 4 ++-- .../db/impl/ObserveWebDatabasesImmutable.java | 4 ++-- .../user/InvalidObserveWebUserException.java | 4 ++-- .../InvalidObserveWebUserPermissionException.java | 4 ++-- .../user/InvalidObserveWebUsersException.java | 4 ++-- .../web/configuration/user/ObserveWebUser.java | 4 ++-- .../user/ObserveWebUserPermission.java | 4 ++-- .../web/configuration/user/ObserveWebUsers.java | 4 ++-- .../configuration/user/ObserveWebUsersHelper.java | 4 ++-- .../user/impl/ObserveWebUserBean.java | 4 ++-- .../user/impl/ObserveWebUserImmutable.java | 4 ++-- .../user/impl/ObserveWebUserPermissionBean.java | 4 ++-- .../impl/ObserveWebUserPermissionImmutable.java | 4 ++-- .../user/impl/ObserveWebUsersBean.java | 4 ++-- .../user/impl/ObserveWebUsersImmutable.java | 4 ++-- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/validators.xml | 2 +- .../web/ObserveWebApplicationContext.java | 2 +- .../ObserveWebApplicationContextInitException.java | 2 +- .../application/web/ObserveWebMainHandler.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../application/web/ObserveWebMotionRender.java | 2 +- .../web/controller/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 2 +- .../v1/LastUpdateDateServiceController.java | 2 +- ...serveAuthenticatedServiceControllerSupport.java | 2 +- .../v1/ObserveServiceControllerSupport.java | 2 +- .../controller/v1/ObserveWebErrorController.java | 2 +- .../web/controller/v1/PingServiceController.java | 2 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 2 +- .../ReferentialSynchronizeServiceController.java | 2 +- .../v1/data/NavigationServiceController.java | 2 +- .../v1/data/TripManagementServiceController.java | 2 +- .../referential/ReferentialServiceController.java | 2 +- .../web/converter/ObserveDtoConverter.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 2 +- .../ObserveReferenceSetRequestInjector.java | 2 +- .../web/request/ObserveWebRequestContext.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 2 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 2 +- .../db/ObserveWebDatabasesHelperTest.java | 2 +- .../user/ObserveWebUsersHelperTest.java | 2 +- changelog.txt | 16 +++++++-------- .../fr/ird/observe/common/CoordinateHelper.java | 4 ++-- .../java/fr/ird/observe/common/FormulaHelper.java | 4 ++-- .../main/java/fr/ird/observe/common/GPSPoint.java | 2 +- .../java/fr/ird/observe/common/ObserveUtil.java | 4 ++-- .../java/fr/ird/observe/common/TripMapPoint.java | 2 +- .../java/fr/ird/observe/common/WithFormula.java | 24 +++++++++++++++++++++- .../fr/ird/observe/common/constants/GearType.java | 4 ++-- .../observe/common/constants/ReferenceStatus.java | 4 ++-- .../observe/common/constants/TripMapPointType.java | 2 +- .../seine/NonTargetCatchComputedValueSource.java | 4 ++-- .../observe/common/constants/seine/Ownership.java | 4 ++-- .../observe/common/constants/seine/SchoolType.java | 4 ++-- .../seine/TypeTransmittingBuoyOperation.java | 4 ++-- .../fr/ird/observe/common/FormulaHelperTest.java | 4 ++-- .../fr/ird/observe/common/RelationRegexTest.java | 2 +- .../java/fr/ird/observe/common/ScriptTest.java | 4 ++-- common/src/test/resources/log4j.properties | 2 +- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/EntityMap.java | 4 ++-- .../observe/entities/LastUpdateDateTopiaDao.java | 2 +- .../observe/entities/LengthWeightComputable.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 4 ++-- .../main/java/fr/ird/observe/entities/Trip.java | 4 ++-- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../longline/ActivityLonglineTopiaDao.java | 2 +- .../entities/longline/ActivityLonglines.java | 4 ++-- .../observe/entities/longline/BasketTopiaDao.java | 2 +- .../observe/entities/longline/BranchlineImpl.java | 2 +- .../entities/longline/BranchlineTopiaDao.java | 2 +- .../longline/GearUseFeaturesLonglineImpl.java | 2 +- .../longline/LonglineCompositionEntity.java | 4 ++-- .../entities/longline/LonglinePositionAware.java | 4 ++-- .../observe/entities/longline/SectionTemplate.java | 4 ++-- .../observe/entities/longline/SectionTopiaDao.java | 2 +- .../entities/longline/SectionWithTemplate.java | 4 ++-- .../entities/longline/SectionWithTemplateImpl.java | 4 ++-- .../entities/longline/SectionWithTemplates.java | 4 ++-- .../observe/entities/longline/SetLonglineImpl.java | 2 +- .../fr/ird/observe/entities/longline/TdrImpl.java | 2 +- .../entities/longline/TripLonglineImpl.java | 4 ++-- .../entities/longline/TripLonglineTopiaDao.java | 2 +- .../observe/entities/longline/TripLonglines.java | 4 ++-- .../DuplicateLengthWeightParameterException.java | 4 ++-- .../entities/referentiel/FormulaSupportImpl.java | 4 ++-- .../observe/entities/referentiel/HarbourImpl.java | 2 +- .../referentiel/I18nReferenceEntities.java | 4 ++-- .../referentiel/LengthLengthParameterImpl.java | 4 ++-- .../referentiel/LengthLengthParameterTopiaDao.java | 2 +- .../referentiel/LengthLengthParameters.java | 4 ++-- .../referentiel/LengthWeightParameterImpl.java | 2 +- .../LengthWeightParameterNotFoundException.java | 4 ++-- .../referentiel/LengthWeightParameters.java | 4 ++-- .../referentiel/ObserveReferentialEntityImpl.java | 2 +- .../observe/entities/referentiel/ProgramImpl.java | 2 +- .../ird/observe/entities/referentiel/Species2.java | 4 ++-- .../observe/entities/referentiel/SpeciesImpl.java | 2 +- .../observe/entities/referentiel/VesselImpl.java | 2 +- .../observe/entities/seine/ActivitySeineImpl.java | 4 ++-- .../entities/seine/ActivitySeineTopiaDao.java | 2 +- .../ird/observe/entities/seine/ActivitySeines.java | 4 ++-- .../observe/entities/seine/FloatingObjectImpl.java | 2 +- .../entities/seine/FloatingObjectTopiaDao.java | 2 +- .../entities/seine/GearUseFeaturesSeineImpl.java | 2 +- .../observe/entities/seine/NonTargetCatchImpl.java | 4 ++-- .../observe/entities/seine/NonTargetCatches.java | 4 ++-- .../entities/seine/NonTargetLengthImpl.java | 2 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 4 ++-- .../ird/observe/entities/seine/RouteTopiaDao.java | 2 +- .../java/fr/ird/observe/entities/seine/Routes.java | 4 ++-- .../ird/observe/entities/seine/SetSeineImpl.java | 4 ++-- .../fr/ird/observe/entities/seine/SetSeines.java | 4 ++-- .../observe/entities/seine/TargetCatchImpl.java | 4 ++-- .../ird/observe/entities/seine/TargetCatchs.java | 2 +- .../observe/entities/seine/TargetLengthImpl.java | 2 +- .../ird/observe/entities/seine/TripSeineImpl.java | 4 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 4 ++-- .../fr/ird/observe/entities/seine/TripSeines.java | 4 ++-- .../persistence/AbstractObserveTopiaDao.java | 2 +- .../java/fr/ird/observe/persistence/Entities.java | 4 ++-- .../ObserveTopiaApplicationContext.java | 2 +- .../persistence/ObserveTopiaConfiguration.java | 6 +++--- .../ObserveTopiaConfigurationFactory.java | 4 ++-- .../observe/persistence/ObserveTopiaIdFactory.java | 4 ++-- .../ObserveTopiaPersistenceContext.java | 2 +- .../observe/persistence/RunScriptTopiaSqlWork.java | 4 ++-- .../persistence/RunScriptsTopiaSqlWork.java | 4 ++-- .../migration/AbstractDataSourceMigration.java | 4 ++-- .../AbstractObserveMigrationCallBack.java | 4 ++-- .../DataSourceMigrationForVersion_5_0.java | 4 ++-- .../DataSourceMigrationForVersion_6_0.java | 4 ++-- .../migration/H2DataSourceMigration.java | 4 ++-- .../persistence/migration/MigrationVersion.java | 4 ++-- ...ObserveMigrationCallBackForVersionResolver.java | 4 ++-- .../ObserveMigrationConfigurationProvider.java | 4 ++-- .../migration/ObserveMigrationEngine.java | 4 ++-- .../migration/PGDataSourceMigration.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_1.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_10.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_11.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_12.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_14.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_15.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_16.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_5.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_7.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_8.java | 4 ++-- .../old/DataSourceMigrationForVersion_3_9.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_1.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_2.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_4.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_RC2.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_RC3.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_RC4.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_RC6.java | 4 ++-- .../old/DataSourceMigrationForVersion_4_0_RC7.java | 4 ++-- .../db/migration/5.0/01_remove_open_field-H2.sql | 2 +- .../db/migration/5.0/01_remove_open_field-PG.sql | 2 +- .../5.0/02_add_lastUpdateDate_field-H2.sql | 2 +- .../5.0/02_add_lastUpdateDate_field-PG.sql | 2 +- .../5.0/03_add_lastUpdateDate_table-H2.sql | 2 +- .../5.0/03_add_lastUpdateDate_table-PG.sql | 2 +- .../db/migration/5.0/04_remove_unit_field-H2.sql | 2 +- .../db/migration/5.0/04_remove_unit_field-PG.sql | 2 +- .../db/migration/5.0/05_remove_gender_field-H2.sql | 2 +- .../db/migration/5.0/05_remove_gender_field-PG.sql | 2 +- .../migration/5.0/06_remove_duplicate_rows-H2.sql | 2 +- .../migration/5.0/06_remove_duplicate_rows-PG.sql | 2 +- ...drop_not_null_constraint_gearUseFeatures-H2.sql | 2 +- ...drop_not_null_constraint_gearUseFeatures-PG.sql | 2 +- ...p_not_null_constraint_hauling_identifier-H2.sql | 2 +- ...p_not_null_constraint_hauling_identifier-PG.sql | 2 +- .../5.0/09_add_non_target_length_sex_fk-H2.sql | 2 +- .../5.0/09_add_non_target_length_sex_fk-PG.sql | 2 +- .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 4 ++-- .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 4 ++-- .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 4 ++-- .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 4 ++-- .../03_evol_6997_delete_supportVesselName-H2.sql | 4 ++-- .../03_evol_6997_delete_supportVesselName-PG.sql | 4 ++-- ...ranchlineComposition_add_tracelineLength-H2.sql | 4 ++-- ...ranchlineComposition_add_tracelineLength-PG.sql | 4 ++-- .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 4 ++-- .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 4 ++-- .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 4 ++-- .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 4 ++-- .../6.0/07_evol_8389_rename_source_columns-H2.sql | 4 ++-- .../6.0/07_evol_8389_rename_source_columns-PG.sql | 4 ++-- .../6.0/08_1_evol_8390_measure_type-H2.sql | 4 ++-- .../6.0/08_1_evol_8390_measure_type-PG.sql | 4 ++-- .../migration/6.0/08_evol_8390_measure_type-H2.sql | 2 +- .../migration/6.0/08_evol_8390_measure_type-PG.sql | 2 +- .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 2 +- .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 2 +- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 +- ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 +- .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 2 +- .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 2 +- .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 2 +- .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 2 +- .../6.0/13_evol_7901_add_armateur_table-H2.sql | 2 +- .../6.0/13_evol_7901_add_armateur_table-PG.sql | 2 +- ...ol_8196_lengthWeightParameter_add_source-H2.sql | 2 +- ...ol_8196_lengthWeightParameter_add_source-PG.sql | 2 +- ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 2 +- ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 2 +- .../16_evol_8377_speciesFate_add_discard-H2.sql | 2 +- .../16_evol_8377_speciesFate_add_discard-PG.sql | 2 +- ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 4 ++-- ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 4 ++-- .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 2 +- .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 2 +- .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 2 +- .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 4 ++-- ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 4 ++-- ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 4 ++-- .../old/3.10/V3_10_01_remove-person-H2.sql | 2 +- .../old/3.10/V3_10_01_remove-person-PG.sql | 2 +- .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 2 +- .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 2 +- .../3.10/V3_10_03_increase-comment-field-H2.sql | 2 +- .../3.10/V3_10_03_increase-comment-field-PG.sql | 2 +- .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 2 +- .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 2 +- .../old/3.10/V3_10_05_normalize-sections-H2.sql | 2 +- .../old/3.10/V3_10_05_normalize-sections-PG.sql | 2 +- ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 2 +- ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 2 +- ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 2 +- ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 2 +- .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 2 +- .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 2 +- .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 2 +- .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 2 +- .../old/3.11/V3_11_05_add-person-country-H2.sql | 2 +- .../old/3.11/V3_11_05_add-person-country-PG.sql | 2 +- .../old/3.11/V3_11_06_add-harbours-H2.sql | 2 +- .../old/3.11/V3_11_06_add-harbours-PG.sql | 2 +- .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 2 +- .../old/3.12/V3_12_01_add-missing-boat-PG.sql | 2 +- ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 2 +- ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 2 +- ...3_14_02_fix-targetsample-discarded-value-H2.sql | 2 +- ...3_14_02_fix-targetsample-discarded-value-PG.sql | 2 +- .../V3_14_03_remove-orphan-seine-sample-H2.sql | 2 +- .../V3_14_03_remove-orphan-seine-sample-PG.sql | 2 +- ...4_04_remove-targetlength-discarded-field-H2.sql | 2 +- ...4_04_remove-targetlength-discarded-field-PG.sql | 2 +- ..._15_01_change-tdr-integer-field-to-float-H2.sql | 2 +- ..._15_01_change-tdr-integer-field-to-float-PG.sql | 2 +- ..._15_02_remove-set-longline-length-fields-H2.sql | 2 +- ..._15_02_remove-set-longline-length-fields-PG.sql | 2 +- .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 2 +- .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 2 +- .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 2 +- .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 2 +- .../old/3.16/V3_16_02_add-gear-data-H2.sql | 2 +- .../old/3.16/V3_16_02_add-gear-data-PG.sql | 2 +- .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 2 +- .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 2 +- .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 2 +- .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 2 +- .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 2 +- .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 2 +- .../3.5/V3_5_03_update-common-references-H2.sql | 2 +- .../3.5/V3_5_03_update-common-references-PG.sql | 2 +- .../old/3.5/V3_5_04_add-longline-references-H2.sql | 2 +- .../old/3.5/V3_5_04_add-longline-references-PG.sql | 2 +- .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 2 +- .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 2 +- .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 2 +- .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 2 +- .../3.7/V3_7_03_add-referential-needComment-H2.sql | 2 +- .../3.7/V3_7_03_add-referential-needComment-PG.sql | 2 +- .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 2 +- .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 2 +- .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 2 +- .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 2 +- .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 2 +- .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 2 +- .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 2 +- .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 2 +- .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 2 +- .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 2 +- .../old/3.7/V3_7_09_add-species-list-H2.sql | 2 +- .../old/3.7/V3_7_09_add-species-list-PG.sql | 2 +- .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 2 +- .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 2 +- .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 2 +- .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 2 +- .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 2 +- .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 2 +- .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 2 +- .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 2 +- .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 2 +- .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 2 +- .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 2 +- .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 2 +- .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 2 +- .../old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql | 2 +- .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 2 +- .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 2 +- .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 2 +- ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 2 +- ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 2 +- .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 2 +- .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 2 +- .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 2 +- .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql | 2 +- ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 2 +- ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 2 +- ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 2 +- ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 2 +- .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 2 +- .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 2 +- .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 2 +- .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 2 +- .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 2 +- .../4.0.2/V4_0_2_01_remove-gender-column-PG.sql | 2 +- ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 2 +- ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 2 +- .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 2 +- .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 2 +- .../entities/longline/SectionTemplateTest.java | 2 +- ...rveMigrationCallBackForVersionResolverTest.java | 4 ++-- persistence/src/test/resources/log4j.properties | 2 +- pom.xml | 2 +- .../services/topia/binder/BinderEngine.java | 4 ++-- .../topia/binder/BinderEngineInitializer.java | 2 +- .../services/topia/binder/BinderSupport.java | 4 ++-- .../binder/ReferenceBinderEngineSupplierTopia.java | 4 ++-- .../topia/binder/data/DataBinderSupport.java | 4 ++-- .../data/longline/ActivityLonglineBinder.java | 4 ++-- .../ActivityLonglineEncouterDtoBinder.java | 4 ++-- .../ActivityLonglineSensorUsedDtoBinder.java | 4 ++-- .../longline/ActivityLonglineStubDtoBinder.java | 4 ++-- .../data/longline/BaitsCompositionBinder.java | 4 ++-- .../topia/binder/data/longline/BasketBinder.java | 4 ++-- .../binder/data/longline/BranchlineBinder.java | 4 ++-- .../longline/BranchlinesCompositionBinder.java | 4 ++-- .../binder/data/longline/CatchLonglineBinder.java | 4 ++-- .../binder/data/longline/EncounterBinder.java | 4 ++-- .../data/longline/FloatlinesCompositionBinder.java | 4 ++-- .../longline/GearUseFeaturesLonglineBinder.java | 4 ++-- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 ++-- .../data/longline/HooksCompositionBinder.java | 4 ++-- .../topia/binder/data/longline/SectionBinder.java | 4 ++-- .../binder/data/longline/SensorUsedBinder.java | 4 ++-- .../binder/data/longline/SetLonglineBinder.java | 4 ++-- .../data/longline/SetLonglineCatchDtoBinder.java | 4 ++-- .../SetLonglineDetailCompositionDtoBinder.java | 4 ++-- .../SetLonglineGlobalCompositionDtoBinder.java | 4 ++-- .../data/longline/SetLonglineStubDtoBinder.java | 4 ++-- .../data/longline/SetLonglineTdrDtoBinder.java | 4 ++-- .../binder/data/longline/SizeMeasureBinder.java | 4 ++-- .../topia/binder/data/longline/TdrBinder.java | 4 ++-- .../longline/TripLonglineActivityDtoBinder.java | 4 ++-- .../binder/data/longline/TripLonglineBinder.java | 4 ++-- .../longline/TripLonglineGearUseDtoBinder.java | 4 ++-- .../binder/data/longline/WeightMeasureBinder.java | 4 ++-- .../binder/data/seine/ActivitySeineBinder.java | 4 ++-- .../data/seine/ActivitySeineStubDtoBinder.java | 4 ++-- .../binder/data/seine/FloatingObjectBinder.java | 4 ++-- .../FloatingObjectObservedSpeciesDtoBinder.java | 4 ++-- .../FloatingObjectSchoolEstimateDtoBinder.java | 4 ++-- .../FloatingObjectTransmittingBuoyDtoBinder.java | 4 ++-- .../GearUseFeaturesMeasurementSeineBinder.java | 4 ++-- .../data/seine/GearUseFeaturesSeineBinder.java | 4 ++-- .../binder/data/seine/NonTargetCatchBinder.java | 4 ++-- .../binder/data/seine/NonTargetLengthBinder.java | 4 ++-- .../binder/data/seine/NonTargetSampleBinder.java | 4 ++-- .../data/seine/ObjectObservedSpeciesBinder.java | 4 ++-- .../data/seine/ObjectSchoolEstimateBinder.java | 4 ++-- .../topia/binder/data/seine/RouteBinder.java | 4 ++-- .../binder/data/seine/RouteStubDtoBinder.java | 4 ++-- .../binder/data/seine/SchoolEstimateBinder.java | 4 ++-- .../topia/binder/data/seine/SetSeineBinder.java | 4 ++-- .../seine/SetSeineNonTargetCatchDtoBinder.java | 4 ++-- .../seine/SetSeineSchoolEstimateDtoBinder.java | 4 ++-- .../data/seine/SetSeineTargetCatchDtoBinder.java | 4 ++-- .../topia/binder/data/seine/TargetCatchBinder.java | 4 ++-- .../binder/data/seine/TargetLengthBinder.java | 4 ++-- .../binder/data/seine/TargetSampleBinder.java | 4 ++-- .../binder/data/seine/TransmittingBuoyBinder.java | 4 ++-- .../topia/binder/data/seine/TripSeineBinder.java | 4 ++-- .../data/seine/TripSeineGearUseDtoBinder.java | 4 ++-- .../referential/ReferentialBinderSupport.java | 4 ++-- .../binder/referential/common/CountryBinder.java | 4 ++-- .../binder/referential/common/FpaZoneBinder.java | 4 ++-- .../binder/referential/common/GearBinder.java | 4 ++-- .../common/GearCaracteristicBinder.java | 4 ++-- .../common/GearCaracteristicTypeBinder.java | 4 ++-- .../binder/referential/common/HarbourBinder.java | 4 ++-- .../common/LengthLengthParameterBinder.java | 4 ++-- .../common/LengthWeightParameterBinder.java | 4 ++-- .../binder/referential/common/OceanBinder.java | 4 ++-- .../binder/referential/common/OrganismBinder.java | 4 ++-- .../binder/referential/common/PersonBinder.java | 4 ++-- .../binder/referential/common/ProgramBinder.java | 4 ++-- .../topia/binder/referential/common/SexBinder.java | 4 ++-- .../binder/referential/common/ShipOwnerBinder.java | 4 ++-- .../referential/common/SizeMeasureTypeBinder.java | 4 ++-- .../binder/referential/common/SpeciesBinder.java | 4 ++-- .../referential/common/SpeciesGroupBinder.java | 4 ++-- .../referential/common/SpeciesListBinder.java | 4 ++-- .../binder/referential/common/VesselBinder.java | 4 ++-- .../common/VesselSizeCategoryBinder.java | 4 ++-- .../referential/common/VesselTypeBinder.java | 4 ++-- .../common/WeightMeasureTypeBinder.java | 4 ++-- .../longline/BaitHaulingStatusBinder.java | 4 ++-- .../longline/BaitSettingStatusBinder.java | 4 ++-- .../referential/longline/BaitTypeBinder.java | 4 ++-- .../longline/CatchFateLonglineBinder.java | 4 ++-- .../referential/longline/EncounterTypeBinder.java | 4 ++-- .../referential/longline/HealthnessBinder.java | 4 ++-- .../referential/longline/HookPositionBinder.java | 4 ++-- .../referential/longline/HookSizeBinder.java | 4 ++-- .../referential/longline/HookTypeBinder.java | 4 ++-- .../longline/ItemHorizontalPositionBinder.java | 4 ++-- .../longline/ItemVerticalPositionBinder.java | 4 ++-- .../longline/LightsticksColorBinder.java | 4 ++-- .../longline/LightsticksTypeBinder.java | 4 ++-- .../referential/longline/LineTypeBinder.java | 4 ++-- .../referential/longline/MaturityStatusBinder.java | 4 ++-- .../referential/longline/MitigationTypeBinder.java | 4 ++-- .../referential/longline/SensorBrandBinder.java | 4 ++-- .../longline/SensorDataFormatBinder.java | 4 ++-- .../referential/longline/SensorTypeBinder.java | 4 ++-- .../referential/longline/SettingShapeBinder.java | 4 ++-- .../referential/longline/StomacFullnessBinder.java | 4 ++-- .../referential/longline/TripTypeBinder.java | 4 ++-- .../longline/VesselActivityLonglineBinder.java | 4 ++-- .../referential/seine/DetectionModeBinder.java | 4 ++-- .../binder/referential/seine/ObjectFateBinder.java | 4 ++-- .../referential/seine/ObjectOperationBinder.java | 4 ++-- .../binder/referential/seine/ObjectTypeBinder.java | 4 ++-- .../referential/seine/ObservedSystemBinder.java | 4 ++-- .../referential/seine/ReasonForDiscardBinder.java | 4 ++-- .../seine/ReasonForNoFishingBinder.java | 4 ++-- .../referential/seine/ReasonForNullSetBinder.java | 4 ++-- .../referential/seine/SpeciesFateBinder.java | 4 ++-- .../referential/seine/SpeciesStatusBinder.java | 4 ++-- .../seine/SurroundingActivityBinder.java | 4 ++-- .../seine/TransmittingBuoyOperationBinder.java | 4 ++-- .../seine/TransmittingBuoyTypeBinder.java | 4 ++-- .../seine/VesselActivitySeineBinder.java | 4 ++-- .../referential/seine/WeightCategoryBinder.java | 4 ++-- .../topia/binder/referential/seine/WindBinder.java | 4 ++-- .../topia/binder/BinderEngineMetadataTest.java | 4 ++-- .../topia/binder/ReferenceBinderEngineTest.java | 4 ++-- .../rest/ObserveDataSourceConfigurationRest.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 +- .../rest/ObserveDataSourceConnectionRest.java | 2 +- .../ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../ObserveDataSourceConfigurationTopiaPG.java | 2 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 2 +- .../topia/ObserveDataSourceConnectionTopia.java | 2 +- .../ObserveDataSourceConfiguration.java | 4 ++-- ...bserveDataSourceConfigurationAndConnection.java | 2 +- .../configuration/ObserveDataSourceConnection.java | 4 ++-- .../ObserveDataSourceConnectionSupport.java | 4 ++-- .../ObserveDataSourceInformation.java | 2 +- .../configuration/ObserveDataSourceType.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../observe/services/rest/http/ObserveRequest.java | 2 +- .../services/rest/http/ObserveRequestMethod.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 2 +- .../services/rest/RestTestClassResource.java | 2 +- .../services/rest/RestTestMethodResource.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 2 +- .../services/rest/service/PingServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 2 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- .../ConsolidateDataServiceRestTest.java | 2 +- .../report/AbstractReportServiceRestTest.java | 2 +- .../report/ReportAccessoryCatchRestTest.java | 2 +- .../ObserveDataSourceConfigurationMainFactory.java | 2 +- .../services/runner/ObserveServiceMainFactory.java | 2 +- .../services/topia/ObserveServiceContextTopia.java | 2 +- .../services/topia/ObserveServiceFactoryTopia.java | 2 +- .../services/topia/ObserveServiceTopia.java | 2 +- .../ObserveTopiaApplicationContextFactory.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 2 +- .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../ConsolidateActivitySeineDataResultBuilder.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../ReferentialSynchronizeDiffServiceTopia.java | 2 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 2 +- .../ng/ReferentialSynchronizeServiceTopia.java | 2 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 2 +- .../referential/sql/ApplySqlRequestWork.java | 2 +- .../sql/DeleteSqlStatementGenerator.java | 2 +- .../sql/DesactivateSqlStatementGenerator.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 2 +- .../InsertSqlWithCascadeStatementGenerator.java | 2 +- .../sql/ReplaceSqlStatementGenerator.java | 2 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../UpdateSqlWithCascadeStatementGenerator.java | 2 +- .../validate/ServiceValidationException.java | 2 +- .../actions/validate/ValidationDataContext.java | 2 +- .../validate/ValidationMessageDetector.java | 2 +- .../service/actions/validate/ValidatorsMap.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/data/NavigationServiceTopia.java | 2 +- .../service/data/TripManagementServiceTopia.java | 2 +- .../topia/service/data/TripMapDtoFactory.java | 2 +- .../referential/ReferentialServiceTopia.java | 2 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../service/sql/SqlScriptProducerServiceTopia.java | 2 +- .../services/topia/DataSourcesForTestManager.java | 2 +- .../services/topia/TopiaTestClassResource.java | 2 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../services/topia/binder/BinderEngineTest.java | 2 +- .../topia/entity/LengthWeightParemetersTest.java | 2 +- .../topia/entity/ReplicateReferentialsTest.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 2 +- .../topia/entity/ReplicateTripLonglineTest.java | 2 +- .../topia/entity/ReplicateTripSeineTest.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 2 +- .../ConsolidateDataServiceTopiaTest.java | 2 +- .../report/AbstractReportServiceTopiaTest.java | 2 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 2 +- .../actions/report/ReportAccessoryCatchTest.java | 2 +- .../report/ReportActivityWithCommentTest.java | 2 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSeineEquipmentsTest.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 2 +- .../report/ReportTargetCatchByAssociationTest.java | 2 +- .../ReportTargetDiscardedByAssociationTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 2 +- .../topia/service/sql/MigrateTestsDatabases.java | 2 +- .../sql/SqlScriptProducerServiceTopiaTest.java | 2 +- ...Longline-service-encounter-error-validation.xml | 2 +- .../ActivityLongline-service-error-validation.xml | 2 +- ...ongline-service-sensorUsed-error-validation.xml | 2 +- ...ActivityLongline-service-warning-validation.xml | 2 +- .../BaitsComposition-service-error-validation.xml | 2 +- .../Basket-service-table-error-validation.xml | 2 +- ...line-service-catchLongline-error-validation.xml | 2 +- .../Branchline-service-error-validation.xml | 2 +- .../Branchline-service-table-error-validation.xml | 2 +- .../Branchline-service-warning-validation.xml | 2 +- ...chlinesComposition-service-error-validation.xml | 2 +- .../CatchLongline-service-error-validation.xml | 2 +- .../CatchLongline-service-warning-validation.xml | 2 +- .../Encounter-service-error-validation.xml | 2 +- .../Encounter-service-warning-validation.xml | 2 +- ...atlinesComposition-service-error-validation.xml | 2 +- ...seFeaturesLongline-service-error-validation.xml | 2 +- .../HooksComposition-service-error-validation.xml | 2 +- .../Section-service-table-error-validation.xml | 2 +- .../SensorUsed-service-error-validation.xml | 2 +- .../SensorUsed-service-warning-validation.xml | 2 +- ...e-service-baitsComposition-error-validation.xml | 2 +- ...ice-branchlinesComposition-error-validation.xml | 2 +- .../SetLongline-service-error-validation.xml | 2 +- ...vice-floatlinesComposition-error-validation.xml | 2 +- ...-service-globalComposition-error-validation.xml | 2 +- ...e-service-hooksComposition-error-validation.xml | 2 +- .../SetLongline-service-warning-validation.xml | 2 +- .../longline/Tdr-service-error-validation.xml | 2 +- .../longline/Tdr-service-warning-validation.xml | 2 +- .../TripLongline-service-error-validation.xml | 2 +- .../TripLongline-service-warning-validation.xml | 2 +- .../Country-service-error-validation.xml | 2 +- .../Country-service-warning-validation.xml | 2 +- .../FpaZone-service-error-validation.xml | 2 +- .../FpaZone-service-warning-validation.xml | 2 +- .../referentiel/Gear-service-error-validation.xml | 2 +- .../Gear-service-warning-validation.xml | 2 +- .../GearCaracteristic-service-error-validation.xml | 2 +- ...earCaracteristic-service-warning-validation.xml | 2 +- ...rCaracteristicType-service-error-validation.xml | 2 +- ...aracteristicType-service-warning-validation.xml | 2 +- .../Harbour-service-error-validation.xml | 2 +- .../Harbour-service-warning-validation.xml | 2 +- ...gthLengthParameter-service-error-validation.xml | 2 +- ...hLengthParameter-service-warning-validation.xml | 2 +- ...gthWeightParameter-service-error-validation.xml | 2 +- ...hWeightParameter-service-warning-validation.xml | 2 +- .../referentiel/Ocean-service-error-validation.xml | 2 +- .../Ocean-service-warning-validation.xml | 2 +- .../Organism-service-error-validation.xml | 2 +- .../Organism-service-warning-validation.xml | 2 +- .../Person-service-error-validation.xml | 2 +- .../Person-service-warning-validation.xml | 2 +- .../Program-service-error-validation.xml | 2 +- .../Program-service-warning-validation.xml | 2 +- .../referentiel/Sex-service-error-validation.xml | 2 +- .../referentiel/Sex-service-warning-validation.xml | 2 +- .../ShipOwner-service-error-validation.xml | 2 +- .../ShipOwner-service-warning-validation.xml | 2 +- .../SizeMeasureType-service-error-validation.xml | 2 +- .../SizeMeasureType-service-warning-validation.xml | 2 +- .../Species-service-error-validation.xml | 2 +- .../Species-service-warning-validation.xml | 2 +- .../SpeciesGroup-service-error-validation.xml | 2 +- .../SpeciesGroup-service-warning-validation.xml | 2 +- .../SpeciesList-service-error-validation.xml | 2 +- .../SpeciesList-service-warning-validation.xml | 2 +- .../Vessel-service-error-validation.xml | 2 +- .../Vessel-service-warning-validation.xml | 2 +- ...VesselSizeCategory-service-error-validation.xml | 2 +- ...sselSizeCategory-service-warning-validation.xml | 2 +- .../VesselType-service-error-validation.xml | 2 +- .../VesselType-service-warning-validation.xml | 2 +- .../WeightMeasureType-service-error-validation.xml | 2 +- ...eightMeasureType-service-warning-validation.xml | 2 +- .../BaitHaulingStatus-service-error-validation.xml | 2 +- ...aitHaulingStatus-service-warning-validation.xml | 2 +- .../BaitSettingStatus-service-error-validation.xml | 2 +- ...aitSettingStatus-service-warning-validation.xml | 2 +- .../longline/BaitType-service-error-validation.xml | 2 +- .../BaitType-service-warning-validation.xml | 2 +- .../CatchFateLongline-service-error-validation.xml | 2 +- ...atchFateLongline-service-warning-validation.xml | 2 +- .../EncounterType-service-error-validation.xml | 2 +- .../EncounterType-service-warning-validation.xml | 2 +- .../Healthness-service-error-validation.xml | 2 +- .../Healthness-service-warning-validation.xml | 2 +- .../HookPosition-service-error-validation.xml | 2 +- .../HookPosition-service-warning-validation.xml | 2 +- .../longline/HookSize-service-error-validation.xml | 2 +- .../HookSize-service-warning-validation.xml | 2 +- .../longline/HookType-service-error-validation.xml | 2 +- .../HookType-service-warning-validation.xml | 2 +- ...HorizontalPosition-service-error-validation.xml | 2 +- ...rizontalPosition-service-warning-validation.xml | 2 +- ...emVerticalPosition-service-error-validation.xml | 2 +- ...VerticalPosition-service-warning-validation.xml | 2 +- .../LightsticksColor-service-error-validation.xml | 2 +- ...LightsticksColor-service-warning-validation.xml | 2 +- .../LightsticksType-service-error-validation.xml | 2 +- .../LightsticksType-service-warning-validation.xml | 2 +- .../longline/LineType-service-error-validation.xml | 2 +- .../LineType-service-warning-validation.xml | 2 +- .../MaturityStatus-service-error-validation.xml | 2 +- .../MaturityStatus-service-warning-validation.xml | 2 +- .../MitigationType-service-error-validation.xml | 2 +- .../MitigationType-service-warning-validation.xml | 2 +- .../SensorBrand-service-error-validation.xml | 2 +- .../SensorBrand-service-warning-validation.xml | 2 +- .../SensorDataFormat-service-error-validation.xml | 2 +- ...SensorDataFormat-service-warning-validation.xml | 2 +- .../SensorType-service-error-validation.xml | 2 +- .../SensorType-service-warning-validation.xml | 2 +- .../SettingShape-service-error-validation.xml | 2 +- .../SettingShape-service-warning-validation.xml | 2 +- .../StomacFullness-service-error-validation.xml | 2 +- .../StomacFullness-service-warning-validation.xml | 2 +- .../longline/TripType-service-error-validation.xml | 2 +- .../TripType-service-warning-validation.xml | 2 +- ...elActivityLongline-service-error-validation.xml | 2 +- ...ActivityLongline-service-warning-validation.xml | 2 +- .../DetectionMode-service-error-validation.xml | 2 +- .../DetectionMode-service-warning-validation.xml | 2 +- .../seine/ObjectFate-service-error-validation.xml | 2 +- .../ObjectFate-service-warning-validation.xml | 2 +- .../ObjectOperation-service-error-validation.xml | 2 +- .../ObjectOperation-service-warning-validation.xml | 2 +- .../seine/ObjectType-service-error-validation.xml | 2 +- .../ObjectType-service-warning-validation.xml | 2 +- .../ObservedSystem-service-error-validation.xml | 2 +- .../ObservedSystem-service-warning-validation.xml | 2 +- .../ReasonForDiscard-service-error-validation.xml | 2 +- ...ReasonForDiscard-service-warning-validation.xml | 2 +- ...ReasonForNoFishing-service-error-validation.xml | 2 +- ...asonForNoFishing-service-warning-validation.xml | 2 +- .../ReasonForNullSet-service-error-validation.xml | 2 +- ...ReasonForNullSet-service-warning-validation.xml | 2 +- .../seine/SpeciesFate-service-error-validation.xml | 2 +- .../SpeciesFate-service-warning-validation.xml | 2 +- .../SpeciesStatus-service-error-validation.xml | 2 +- .../SpeciesStatus-service-warning-validation.xml | 2 +- ...urroundingActivity-service-error-validation.xml | 2 +- ...roundingActivity-service-warning-validation.xml | 2 +- ...ttingBuoyOperation-service-error-validation.xml | 2 +- ...ingBuoyOperation-service-warning-validation.xml | 2 +- ...ansmittingBuoyType-service-error-validation.xml | 2 +- ...smittingBuoyType-service-warning-validation.xml | 2 +- ...esselActivitySeine-service-error-validation.xml | 2 +- ...selActivitySeine-service-warning-validation.xml | 2 +- .../WeightCategory-service-error-validation.xml | 2 +- .../WeightCategory-service-warning-validation.xml | 2 +- .../seine/Wind-service-error-validation.xml | 2 +- .../seine/Wind-service-warning-validation.xml | 2 +- .../ActivitySeine-service-error-validation.xml | 2 +- ...ine-service-observedSystem-error-validation.xml | 2 +- ...e-service-observedSystem-warning-validation.xml | 2 +- .../ActivitySeine-service-warning-validation.xml | 2 +- .../FloatingObject-service-error-validation.xml | 2 +- ...rvice-objectSchoolEstimate-error-validation.xml | 2 +- ...-transmittingBuoyOperation-error-validation.xml | 2 +- .../FloatingObject-service-warning-validation.xml | 2 +- ...arUseFeaturesSeine-service-error-validation.xml | 2 +- .../NonTargetCatch-service-error-validation.xml | 2 +- .../NonTargetCatch-service-warning-validation.xml | 2 +- .../NonTargetLength-service-error-validation.xml | 2 +- .../NonTargetLength-service-warning-validation.xml | 2 +- .../NonTargetSample-service-error-validation.xml | 2 +- ...ectObservedSpecies-service-error-validation.xml | 2 +- ...jectSchoolEstimate-service-error-validation.xml | 2 +- ...ctSchoolEstimate-service-warning-validation.xml | 2 +- .../seine/Route-service-error-validation.xml | 2 +- .../seine/Route-service-warning-validation.xml | 2 +- .../SchoolEstimate-service-error-validation.xml | 2 +- .../seine/SetSeine-service-error-validation.xml | 2 +- ...ine-service-nonTargetCatch-error-validation.xml | 2 +- ...ine-service-schoolEstimate-error-validation.xml | 2 +- ...tSeine-service-targetCatch-error-validation.xml | 2 +- ...ne-service-targetDiscarded-error-validation.xml | 2 +- .../seine/SetSeine-service-warning-validation.xml | 2 +- ...tCatch-service-targetCatch-error-validation.xml | 2 +- ...atch-service-targetCatch-warning-validation.xml | 2 +- ...ch-service-targetDiscarded-error-validation.xml | 2 +- ...-service-targetDiscarded-warning-validation.xml | 2 +- .../TargetLength-service-error-validation.xml | 2 +- .../TargetLength-service-warning-validation.xml | 2 +- .../TargetSample-service-error-validation.xml | 2 +- .../TransmittingBuoy-service-error-validation.xml | 2 +- ...TransmittingBuoy-service-warning-validation.xml | 2 +- .../seine/TripSeine-service-error-validation.xml | 2 +- ...-service-gearUseFeatures-warning-validation.xml | 2 +- .../seine/TripSeine-service-warning-validation.xml | 2 +- services-validation/src/main/resources/xwork.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 4 ++-- .../ActivitySeineSpeedValidatorTest.java | 4 ++-- .../seine/Route-testSpeed-error-validation.xml | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/validators.xml | 2 +- .../validators/AbstractSpeciesFieldValidator.java | 4 ++-- .../ActivityFinDeVeilleExistsValidator.java | 4 ++-- .../validators/ActivitySimpleSpeedValidator.java | 4 ++-- .../topia/validators/ActivitySpeedValidator.java | 4 ++-- .../validators/CollectionUniqueKeyValidator2.java | 4 ++-- .../ObserveCollectionUniqueKeyValidator.java | 4 ++-- .../topia/validators/QuadrantFieldValidator.java | 4 ++-- .../SetLonglineUniqueHomeIdValidator.java | 4 ++-- .../SetLonglineUniqueNumberValidator.java | 4 ++-- .../validators/SpeciesLengthFieldValidator.java | 4 ++-- .../validators/SpeciesWeightFieldValidator.java | 4 ++-- .../src/main/filters/observe-reports.properties | 2 +- .../fr/ird/observe/services/ObserveService.java | 4 ++-- .../observe/services/ObserveServiceFactory.java | 4 ++-- .../services/ObserveServiceFactorySupport.java | 4 ++-- .../services/ObserveServiceInitializer.java | 4 ++-- .../observe/services/ObserveServicesProvider.java | 4 ++-- .../observe/services/dto/AbstractObserveDto.java | 4 ++-- .../observe/services/dto/AbstractReference.java | 4 ++-- .../fr/ird/observe/services/dto/DataReference.java | 4 ++-- .../observe/services/dto/DataReferenceList.java | 2 +- .../ird/observe/services/dto/DataReferenceSet.java | 2 +- .../dto/DataSourceCreateConfigurationDto.java | 4 ++-- ...urceCreateWithNoReferentialImportException.java | 4 ++-- .../java/fr/ird/observe/services/dto/Form.java | 2 +- .../java/fr/ird/observe/services/dto/IdDto.java | 2 +- .../java/fr/ird/observe/services/dto/IdHelper.java | 2 +- ...ibleDataSourceCreateConfigurationException.java | 4 ++-- .../services/dto/ObserveBlobsContainer.java | 4 ++-- .../observe/services/dto/ObserveDbUserHelper.java | 2 +- .../fr/ird/observe/services/dto/ObserveDto.java | 2 +- .../ird/observe/services/dto/ObserveModelType.java | 4 ++-- .../dto/ObserveSpeciesListConfiguration.java | 4 ++-- .../services/dto/ReferenceCollectionSupport.java | 2 +- .../fr/ird/observe/services/dto/ReferenceMap.java | 2 +- .../dto/ReferenceValueNotFoundException.java | 4 ++-- .../services/dto/UnauthorizedException.java | 2 +- .../fr/ird/observe/services/dto/WithComment.java | 24 +++++++++++++++++++++- .../services/dto/actions/report/DataMatrix.java | 4 ++-- .../services/dto/actions/report/Report.java | 2 +- .../dto/actions/report/ReportOperation.java | 4 ++-- .../services/dto/actions/report/ReportRequest.java | 4 ++-- .../dto/actions/report/ReportVariable.java | 4 ++-- .../services/dto/constants/ObserveDbRole.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 4 ++-- .../dto/gson/ArrayListMultimapAdapter.java | 4 ++-- .../ird/observe/services/dto/gson/BlobAdapter.java | 2 +- .../observe/services/dto/gson/ClassAdapter.java | 2 +- .../ird/observe/services/dto/gson/DateAdapter.java | 2 +- .../ird/observe/services/dto/gson/FormAdapter.java | 2 +- .../services/dto/gson/ImmutableListAdapter.java | 2 +- .../services/dto/gson/ImmutableMapAdapter.java | 2 +- .../dto/gson/ImmutableMultimapAdapter.java | 2 +- .../services/dto/gson/ImmutableSetAdapter.java | 2 +- .../observe/services/dto/gson/IntegerAdapter.java | 2 +- .../services/dto/gson/MultimapAdapterSupport.java | 4 ++-- .../dto/gson/ObserveBlobsContainerAdapter.java | 4 ++-- .../services/dto/gson/ObserveDtoGsonSupplier.java | 4 ++-- .../dto/gson/ReferentialMultimapAdapter.java | 2 +- .../services/dto/gson/ReportVariableAdapter.java | 2 +- .../services/dto/gson/SetMultimapAdapter.java | 4 ++-- .../observe/services/dto/gson/VersionAdapter.java | 2 +- .../gson/reference/AbstractReferenceAdapter.java | 4 ++-- .../dto/gson/reference/DataReferenceAdapter.java | 4 ++-- .../gson/reference/DataReferenceListAdapter.java | 4 ++-- .../gson/reference/DataReferenceSetAdapter.java | 4 ++-- .../ReferenceCollectionSupportAdapter.java | 4 ++-- .../reference/ReferentialReferenceAdapter.java | 4 ++-- .../reference/ReferentialReferenceSetAdapter.java | 4 ++-- .../gson/reference/UnknownReferenceAdapter.java | 2 +- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../dto/longline/ActivityLonglineHelper.java | 2 +- .../dto/longline/BasketWithSectionIdDto.java | 2 +- .../dto/longline/BranchlineWithBasketIdDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../dto/longline/LonglineCompositionDto.java | 4 ++-- .../dto/longline/LonglinePositionAwareDto.java | 4 ++-- .../dto/longline/LonglinePositionSetDto.java | 2 +- .../services/dto/longline/SectionTemplate.java | 4 ++-- .../services/dto/longline/SectionWithTemplate.java | 4 ++-- .../dto/longline/SectionWithTemplateHelper.java | 4 ++-- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- .../services/dto/longline/TripLonglineHelper.java | 2 +- .../dto/presets/RemoteDataSourceConfiguration.java | 24 +++++++++++++++++++++- .../dto/presets/ServerDataSourceConfiguration.java | 24 +++++++++++++++++++++- .../dto/reference/DataReferenceSetDefinitions.java | 4 ++-- .../dto/reference/ReferenceBinderEngine.java | 4 ++-- .../reference/ReferenceBinderEngineSupplier.java | 4 ++-- .../dto/reference/ReferenceSetDefinition.java | 4 ++-- .../ReferentialReferenceSetDefinitions.java | 4 ++-- .../request/ReferenceSetRequestDefinition.java | 4 ++-- .../request/ReferenceSetRequestDefinitions.java | 4 ++-- .../request/ReferenceSetRequestKeyDefinition.java | 4 ++-- .../referential/GearCaracteristicTypeHelper.java | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- .../dto/referential/I18nReferentialHelper.java | 2 +- .../dto/referential/LengthLengthParameterDto.java | 2 +- .../dto/referential/LengthWeightParameterDto.java | 2 +- .../services/dto/referential/PersonHelper.java | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../services/dto/referential/ProgramHelper.java | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- .../dto/referential/ReferentialHelper.java | 2 +- .../dto/referential/ReferentialMultimap.java | 2 +- .../dto/referential/ReferentialReference.java | 4 ++-- .../dto/referential/ReferentialReferenceSet.java | 2 +- .../dto/referential/ReferentialReferences.java | 4 ++-- .../dto/referential/SizeMeasureTypeHelper.java | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../services/dto/referential/VesselHelper.java | 2 +- .../longline/VesselActivityLonglineHelper.java | 2 +- .../seine/VesselActivitySeineHelper.java | 2 +- .../referential/seine/WeightCategoryHelper.java | 2 +- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../services/dto/result/SaveResultHelper.java | 2 +- .../dto/result/TripChildSaveResultHelper.java | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineHelper.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../dto/seine/DiscardedTargetCatchDto.java | 4 ++-- .../dto/seine/DiscardedTargetSampleDto.java | 4 ++-- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../services/dto/seine/KeptTargetCatchDto.java | 4 ++-- .../services/dto/seine/KeptTargetSampleDto.java | 4 ++-- .../ird/observe/services/dto/seine/RouteDto.java | 2 +- .../observe/services/dto/seine/SetSeineDto.java | 2 +- .../services/dto/seine/TargetCatchHelper.java | 2 +- .../services/dto/seine/TargetLengthDto.java | 2 +- .../services/dto/seine/TargetLengthHelper.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 2 +- .../services/dto/seine/TripSeineHelper.java | 2 +- .../observe/services/http/ObserveHttpError.java | 2 +- .../security/AdminApiKeyNotFoundException.java | 4 ++-- .../AuthenticationTokenNotFoundException.java | 4 ++-- .../BadObserveWebUserPasswordException.java | 4 ++-- .../security/InvalidAdminKeyApiException.java | 4 ++-- .../InvalidAuthenticationTokenException.java | 4 ++-- .../ObserveWebSecurityExceptionSupport.java | 4 ++-- .../SecurityRequestContextNotFoundException.java | 4 ++-- .../security/UnknownObserveWebUserException.java | 4 ++-- .../UnknownObserveWebUserForDatabaseException.java | 4 ++-- .../security/UserLoginNotFoundException.java | 4 ++-- .../security/UserPasswordNotFoundException.java | 4 ++-- .../services/service/BabModelVersionException.java | 2 +- .../service/ConcurrentModificationException.java | 2 +- .../service/DataFileNotFoundException.java | 4 ++-- .../services/service/DataNotFoundException.java | 4 ++-- .../services/service/DataSourceService.java | 4 ++-- .../DatabaseConnexionNotAuthorizedException.java | 4 ++-- .../DatabaseDestroyNotAuthorizedException.java | 4 ++-- .../service/DatabaseNotFoundException.java | 4 ++-- .../services/service/LastUpdateDateService.java | 2 +- .../ird/observe/services/service/PingService.java | 4 ++-- .../ConsolidateActivitySeineDataResult.java | 4 ++-- .../consolidate/ConsolidateDataService.java | 4 ++-- .../ConsolidateTripSeineDataRequest.java | 4 ++-- .../ConsolidateTripSeineDataResult.java | 4 ++-- .../service/actions/report/ReportBuilder.java | 4 ++-- .../service/actions/report/ReportService.java | 2 +- .../diff/ReferentialDataSourceState.java | 4 ++-- .../diff/ReferentialDataSourceStates.java | 4 ++-- .../diff/ReferentialSynchronizeDiff.java | 4 ++-- .../diff/ReferentialSynchronizeDiffService.java | 4 ++-- .../diff/ReferentialSynchronizeDiffState.java | 4 ++-- .../diff/ReferentialSynchronizeDiffStateType.java | 4 ++-- .../diff/ReferentialSynchronizeDiffs.java | 4 ++-- .../diff/ReferentialSynchronizeDiffsEngine.java | 4 ++-- ...ionalReferentialSynchronizeCallbackRequest.java | 4 ++-- ...onalReferentialSynchronizeCallbackRequests.java | 4 ++-- ...tionalReferentialSynchronizeCallbackResult.java | 4 ++-- ...ionalReferentialSynchronizeCallbackResults.java | 4 ++-- ...nidirectionalReferentialSynchronizeContext.java | 4 ++-- ...UnidirectionalReferentialSynchronizeEngine.java | 4 ++-- ...ectionalReferentialSynchronizeLocalService.java | 4 ++-- ...nidirectionalReferentialSynchronizeRequest.java | 4 ++-- ...UnidirectionalReferentialSynchronizeResult.java | 4 ++-- .../ng/ReferentialSynchronizeRequest.java | 4 ++-- .../ng/ReferentialSynchronizeService.java | 4 ++-- .../ng/ReferentialSynchronizeServiceEngine.java | 4 ++-- ...entialSynchronizeServiceProduceSqlsRequest.java | 4 ++-- ...rentialSynchronizeServiceProduceSqlsResult.java | 4 ++-- .../ng/ReferentialSynchronizeSqlsRequest.java | 4 ++-- .../ng/task/ReferentialSynchronizeTask.java | 4 ++-- .../ng/task/ReferentialSynchronizeTaskType.java | 4 ++-- .../actions/validate/ValidateDataRequest.java | 4 ++-- .../actions/validate/ValidateDataResult.java | 4 ++-- .../validate/ValidateReferentialsRequest.java | 4 ++-- .../validate/ValidateReferentialsResult.java | 4 ++-- .../actions/validate/ValidateResultForDto.java | 2 +- .../validate/ValidateResultForDtoHelper.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 4 ++-- .../service/actions/validate/ValidateService.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 2 +- .../actions/validate/ValidationMessage.java | 2 +- .../service/actions/validate/ValidatorDto.java | 2 +- .../service/actions/validate/ValidatorHelper.java | 2 +- .../validate/ValidatorInitializationException.java | 4 ++-- .../services/service/data/DeleteTripRequest.java | 4 ++-- .../services/service/data/DeleteTripResult.java | 4 ++-- .../services/service/data/ExportTripRequest.java | 4 ++-- .../services/service/data/ExportTripResult.java | 4 ++-- .../services/service/data/ImportTripRequest.java | 4 ++-- .../services/service/data/ImportTripResult.java | 4 ++-- .../services/service/data/NavigationRequest.java | 2 +- .../services/service/data/NavigationResult.java | 2 +- .../services/service/data/NavigationService.java | 2 +- .../service/data/TripManagementService.java | 4 ++-- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../data/longline/ActivityLonglineService.java | 2 +- .../service/data/longline/BranchlineService.java | 2 +- .../data/longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/data/longline/SetLonglineService.java | 2 +- .../services/service/data/longline/TdrService.java | 2 +- .../data/longline/TripLonglineGearUseService.java | 2 +- .../service/data/longline/TripLonglineService.java | 2 +- .../service/data/seine/ActivitySeineService.java | 2 +- .../service/data/seine/FloatingObjectService.java | 2 +- .../service/data/seine/NonTargetCatchService.java | 2 +- .../service/data/seine/NonTargetSampleService.java | 2 +- .../data/seine/ObjectObservedSpeciesService.java | 2 +- .../data/seine/ObjectSchoolEstimateService.java | 2 +- .../services/service/data/seine/RouteService.java | 2 +- .../service/data/seine/SchoolEstimateService.java | 2 +- .../service/data/seine/SetSeineService.java | 2 +- .../service/data/seine/TargetCatchService.java | 2 +- .../service/data/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../data/seine/TripSeineGearUseService.java | 2 +- .../service/data/seine/TripSeineService.java | 2 +- .../referential/MissingReferentialResult.java | 2 +- .../referential/ObserveReferentialCache.java | 4 ++-- .../service/referential/ReferenceSetsRequest.java | 4 ++-- .../service/referential/ReferentialService.java | 4 ++-- .../service/sql/AddSqlScriptProducerRequest.java | 4 ++-- .../service/sql/AddSqlScriptProducerResult.java | 4 ++-- .../sql/DeleteSqlScriptProducerRequest.java | 4 ++-- .../service/sql/SqlScriptProducerService.java | 4 ++-- .../fr/ird/observe/services/spi/DeleteRequest.java | 2 +- .../fr/ird/observe/services/spi/NoDataAccess.java | 4 ++-- .../fr/ird/observe/services/spi/PostRequest.java | 2 +- .../observe/services/spi/ReadDataPermission.java | 4 ++-- .../services/spi/ReadReferentialPermission.java | 4 ++-- .../java/fr/ird/observe/services/spi/Write.java | 4 ++-- .../observe/services/spi/WriteDataPermission.java | 4 ++-- .../services/spi/WriteReferentialPermission.java | 4 ++-- .../service/actions/report/ReportBuilderTest.java | 2 +- .../actions/report/observe-reports-test.properties | 2 +- services/src/test/resources/log4j.properties | 2 +- src/site/rst/architecture-logicielle.rst | 2 +- src/site/rst/index.rst | 2 +- src/site/rst/install-serverPG.rst | 2 +- src/site/rst/install.rst | 2 +- .../java/fr/ird/observe/test/DatabaseName.java | 2 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- .../ird/observe/test/ObserveTestConfiguration.java | 2 +- .../fr/ird/observe/test/ObserveTestResources.java | 2 +- .../ird/observe/test/TestClassResourceSupport.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 2 +- .../observe/test/TestMethodResourceSupport.java | 2 +- .../test/spi/CopyDatabaseConfiguration.java | 2 +- .../test/spi/CopyDatabaseConfigurations.java | 2 +- .../ird/observe/test/spi/DatabaseClassifier.java | 2 +- .../test/spi/DatabaseLoginConfiguration.java | 2 +- .../test/spi/DatabaseNameConfiguration.java | 2 +- .../test/spi/DatabaseNameConfigurations.java | 2 +- .../test/spi/DatabasePasswordConfiguration.java | 2 +- .../test/spi/DatabaseServerNameConfiguration.java | 2 +- .../observe/test/spi/DatabaseUrlConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfigurations.java | 2 +- .../maven/plugins/toolbox/CheckApiMojo.java | 4 ++-- .../plugins/toolbox/GenerateI18nTypesMojo.java | 4 ++-- .../toolbox/GenerateI18nValidatorFieldsMojo.java | 4 ++-- .../toolbox/GenerateValidatorMojoSupport.java | 4 ++-- .../toolbox/GenerateValidatorsDescriptorMojo.java | 4 ++-- .../toolbox/GenerateWebmotionMappingMojo.java | 4 ++-- .../MismatchMethodParameterNameException.java | 4 ++-- .../plugins/toolbox/MissingClassException.java | 4 ++-- .../plugins/toolbox/MissingMethodException.java | 4 ++-- .../maven/plugins/toolbox/ToolboxMojoSupport.java | 4 ++-- .../plugins/toolbox/ValidatorCacheRequest.java | 4 ++-- .../maven/plugins/toolbox/ValidatorsCache.java | 4 ++-- .../src/main/resources/log4j.properties | 2 +- .../support/TopiaMetadataModelSupportImpl.java | 2 +- .../persistence/metadata/TopiaMetadataEntity.java | 2 +- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../metadata/TopiaMetadataModelVisitor.java | 2 +- .../support/TopiaMetadataModelSupport.java | 2 +- .../topia/service/sql/batch/SqlRequests.java | 2 +- .../nuiton/topia/service/sql/batch/SqlResult.java | 2 +- .../service/sql/batch/TopiaSqlBatchService.java | 2 +- .../batch/TopiaSqlBatchServiceConfiguration.java | 2 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 2 +- .../sql/batch/actions/AbstractSchemaAction.java | 2 +- .../sql/batch/actions/AbstractSchemaRequest.java | 2 +- .../sql/batch/actions/AbstractSqlAction.java | 2 +- .../sql/batch/actions/AbstractSqlRequest.java | 2 +- .../sql/batch/actions/AbstractTablesAction.java | 2 +- .../sql/batch/actions/AbstractTablesRequest.java | 4 ++-- .../service/sql/batch/actions/BlobsContainer.java | 2 +- .../sql/batch/actions/CreateSchemaAction.java | 4 ++-- .../sql/batch/actions/CreateSchemaRequest.java | 2 +- .../sql/batch/actions/DeleteTablesAction.java | 2 +- .../sql/batch/actions/DeleteTablesRequest.java | 2 +- .../sql/batch/actions/DropSchemaAction.java | 4 ++-- .../sql/batch/actions/DropSchemaRequest.java | 2 +- .../sql/batch/actions/ReplicateTablesAction.java | 2 +- .../sql/batch/actions/ReplicateTablesRequest.java | 2 +- .../batch/actions/TopiaSqlTableSelectArgument.java | 2 +- .../sql/batch/actions/UpdateTablesAction.java | 2 +- .../sql/batch/actions/UpdateTablesRequest.java | 2 +- .../service/sql/batch/tables/TopiaSqlTable.java | 2 +- .../service/sql/batch/tables/TopiaSqlTables.java | 6 +++--- .../sql/batch/tables/TopiaSqlTablesFactory.java | 2 +- .../templates/TopiaMetadataModelGenerator.java | 2 +- 1649 files changed, 2522 insertions(+), 2090 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (390f79f -> 88baa79)
by codelutin.com scm 22 Dec '16

22 Dec '16

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(a)codelutin.com> Date: Thu Dec 22 17:02:37 2016 +0100 Renommage de modules de services commit e98d19c1b97677f2bc1f0a31f7a68935a1a60009 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 16:45:09 2016 +0100 Simplification des modules de service commit 7cf5dc0f1aaacd0e65d3f711abaf1e02cd2462e7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 16:23:31 2016 +0100 Introduction module common commit 9c0762ba03a006891e791b8d3d139f6da46afd86 Author: Tony CHEMIT <chemit(a)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(a)codelutin.com>.

1 4

branch develop updated (d5b6b96 -> 390f79f)
by codelutin.com scm 22 Dec '16

22 Dec '16

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 d5b6b96 Amélioration menu Navigation new 390f79f Amélioration de l'écran générale des référentiels The 1 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 390f79fc87bb2245d2fb60b4d41e55916992b2c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 13:10:48 2016 +0100 Amélioration de l'écran générale des référentiels Summary of changes: .../swing/ui/content/ObserveFocusManager.java | 30 ++++++++++++++- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- ...zer.java => ContentReferenceUIInitializer.java} | 4 +- .../ui/content/ref/ReferenceHomeCommonUI.java | 17 +++++++++ .../ui/content/ref/ReferenceHomeLonglineUI.java | 18 +++++++++ .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 17 +++++++++ .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 15 +++----- .../swing/ui/content/ref/ReferenceHomeUI.jcss | 6 +-- .../ui/content/ref/ReferenceHomeUIHandler.java | 33 +++++++++++++++- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 44 +++++++++++++++++++++- .../swing/ui/tree/navigation/NavigationTree.java | 1 - .../ui/tree/navigation/NavigationTreeModel.java | 13 +++---- .../nodes/NavigationTreeNodeSupport.java | 24 ++++++++++++ .../ReferentialsCommonNavigationTreeNode.java} | 23 +++++------ .../ReferentialsLonglineNavigationTreeNode.java} | 23 +++++------ ... => ReferentialsNavigationTreeNodeSupport.java} | 21 ++--------- .../ReferentialsSeineNavigationTreeNode.java} | 23 +++++------ 17 files changed, 228 insertions(+), 88 deletions(-) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/{ReferentialContentUIInitializer.java => ContentReferenceUIInitializer.java} (88%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeCommonUI.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeLonglineUI.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/{longline/TdrLonglineNavigationTreeNode.java => referential/ReferentialsCommonNavigationTreeNode.java} (64%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/{longline/TdrLonglineNavigationTreeNode.java => referential/ReferentialsLonglineNavigationTreeNode.java} (63%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/{ReferentialsNavigationTreeNode.java => ReferentialsNavigationTreeNodeSupport.java} (73%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/{longline/TdrLonglineNavigationTreeNode.java => referential/ReferentialsSeineNavigationTreeNode.java} (64%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (0a323bb -> d5b6b96)
by codelutin.com scm 22 Dec '16

22 Dec '16

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 0a323bb Merge branch 'feature/22' into 'develop' new d5b6b96 Amélioration menu Navigation The 1 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 d5b6b962cb2eb6d90d5c7edef10b9cf5a615ba01 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 22 12:02:46 2016 +0100 Amélioration menu Navigation Summary of changes: .../ird/observe/application/swing/ui/ObserveMainUI.jaxx | 8 ++++++-- .../ird/observe/application/swing/ui/ObserveMainUI.jcss | 14 ++++++++++++-- ...entialAction.java => GotoReferentialCommonAction.java} | 13 +++++++------ ...tialAction.java => GotoReferentialLonglineAction.java} | 14 +++++++------- ...rentialAction.java => GotoReferentialSeineAction.java} | 15 ++++++++------- .../swing/ui/tree/navigation/NavigationTree.java | 4 ++-- .../tree/navigation/nodes/NavigationTreeNodeSupport.java | 2 +- .../resources/i18n/application-swing_en_GB.properties | 3 +++ .../resources/i18n/application-swing_es_ES.properties | 3 +++ .../resources/i18n/application-swing_fr_FR.properties | 4 +++- 10 files changed, 52 insertions(+), 28 deletions(-) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/{GotoReferentialAction.java => GotoReferentialCommonAction.java} (78%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/{GotoReferentialAction.java => GotoReferentialLonglineAction.java} (78%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/{GotoReferentialAction.java => GotoReferentialSeineAction.java} (77%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/23 deleted (was 27142ba)
by codelutin.com scm 21 Dec '16

21 Dec '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/23 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 27142ba La plage de date n'est pas persisté sur l'écran d'édition des RTP (closes #23) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/22 deleted (was 1b0ff61)
by codelutin.com scm 21 Dec '16

21 Dec '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/22 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (c86bf74 -> 0a323bb)
by codelutin.com scm 21 Dec '16

21 Dec '16

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 c86bf74 Merge branch 'feature/21' into 'develop' adds 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) new 0a323bb Merge branch 'feature/22' into 'develop' The 1 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 0a323bb9eeaa1608624ac12b12b6e0f238f8d147 Merge: c86bf74 1b0ff61 Author: Tony Chemit <chemit(a)codelutin.com> Date: Wed Dec 21 18:13:58 2016 +0100 Merge branch 'feature/22' into 'develop' Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + r… …evue des écrans du référentiel (Closes #22) See merge request !98 Summary of changes: .../ui/content/ref/ContentI18nReferenceUI.jaxx | 16 ++++++------- .../ui/content/ref/ContentI18nReferenceUI.jcss | 8 +++++++ .../swing/ui/content/ref/impl/CountryUI.jaxx | 9 ++++--- .../swing/ui/content/ref/impl/CountryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 10 ++++---- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 7 +++--- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 11 ++++----- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 1 + .../swing/ui/content/ref/impl/GearUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/HarbourUI.jcss | 2 ++ .../content/ref/impl/LengthLengthParameterUI.jaxx | 11 ++++----- .../content/ref/impl/LengthLengthParameterUI.jcss | 3 +++ .../content/ref/impl/LengthWeightParameterUI.jaxx | 15 +++++------- .../content/ref/impl/LengthWeightParameterUI.jcss | 5 ++++ .../ref/impl/LengthWeightParameterUIModel.java | 6 +++-- .../swing/ui/content/ref/impl/OceanUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/OrganismUI.jcss | 1 + .../swing/ui/content/ref/impl/PersonUI.jaxx | 14 ++++------- .../swing/ui/content/ref/impl/PersonUI.jcss | 6 ++--- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 20 +++++++++------- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 2 ++ .../swing/ui/content/ref/impl/SexUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/ShipOwnerUI.jcss | 1 + .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++++++++--------- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 4 ++-- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 8 +++---- .../ui/content/ref/impl/VesselSizeCategoryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 28 ++++++++-------------- .../swing/ui/content/ref/impl/VesselUI.jaxx | 19 ++++++++------- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 7 +++--- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 4 ++-- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 4 ++-- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 4 ++-- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 4 ++-- .../content/ref/impl/longline/HookPositionUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksColorUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 4 ++-- .../ref/impl/longline/MaturityStatusUI.jaxx | 9 ++++--- .../ref/impl/longline/MaturityStatusUI.jcss | 2 ++ .../ref/impl/longline/MitigationTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SensorBrandUI.jaxx | 7 +++--- .../content/ref/impl/longline/SensorBrandUI.jcss | 1 + .../ref/impl/longline/SensorDataFormatUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SettingShapeUI.jaxx | 4 ++-- .../ref/impl/longline/StomacFullnessUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 4 ++-- .../impl/longline/VesselActivityLonglineUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 4 ++-- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 4 ++-- .../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 | 4 ++-- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 4 ++-- .../ref/impl/seine/SurroundingActivityUI.jaxx | 4 ++-- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 4 ++-- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/seine/WindUI.jcss | 3 +++ .../application/swing/ui/util/JComment.jaxx | 2 +- 78 files changed, 243 insertions(+), 230 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/22 created (now 1b0ff61)
by codelutin.com scm 21 Dec '16

21 Dec '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/22 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) This branch includes the following new commits: new 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) The 1 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 1b0ff61dd9359fb2090674476b745f4b944ccdb3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 21 18:13:28 2016 +0100 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1