[Observe-commits] 03/06: [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master'

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6ab4608f69daac3d4eb60fe188e3c0c632288c88 Merge: 14f81d8 2b48d4b Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 23 16:36:41 2016 +0100 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' application-swing-configuration/pom.xml | 10 +- .../src/main/config/ObserveSwingApplication.ini | 53 +- .../ObserveSwingApplicationConfig.java | 85 +- .../configuration/constants/CreationMode.java | 6 +- .../swing/configuration/constants/DbMode.java | 4 +- ...pplication-swing-configuration_en_GB.properties | 10 +- ...pplication-swing-configuration_es_ES.properties | 10 +- ...pplication-swing-configuration_fr_FR.properties | 10 +- .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/observe-log4j.properties | 4 +- .../src/main/resources/validators.xml | 22 +- application-swing-decoration/pom.xml | 11 +- .../swing/decoration/DecoratorService.java | 12 +- .../decoration/ObserveI18nDecoratorHelper.java | 10 +- .../decorators/DataReferenceDecorator.java | 4 +- .../decorators/LengthLengthParameterDecorator.java | 2 +- .../decorators/LengthWeightParameterDecorator.java | 2 +- .../decorators/NonTargetCatchDecorator.java | 2 +- .../decorators/NonTargetLengthDecorator.java | 2 +- .../decorators/ObjectObservedSpeciesDecorator.java | 2 +- .../decoration/decorators/ObserveDecorator.java | 4 +- .../decorators/ReferentialReferenceDecorator.java | 2 +- .../decoration/decorators/SpeciesDecorator.java | 2 +- .../decorators/TargetCatchDecorator.java | 2 +- .../decorators/TripLonglineDecorator.java | 2 +- .../decoration/decorators/TripSeineDecorator.java | 2 +- application-swing-validation/pom.xml | 6 +- .../validation/BeanValidatorDetectorTest.java | 2 +- application-swing-validators/pom.xml | 9 +- .../AbstractSpeciesFieldDtoValidator.java | 4 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../ActivitySimpleSpeedDtoValidator.java | 32 +- .../validators/ActivitySpeedDtoValidator.java | 10 +- .../CollectionUniqueKeyDtoValidator.java | 2 +- .../CoordinateLatitudeDtoFieldValidator.java | 2 +- .../CoordinateLongitudeDtoFieldValidator.java | 2 +- .../ObserveCollectionUniqueKeyDtoValidator.java | 2 +- .../validators/OpenableDtoFieldValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 4 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 4 +- .../SetLonglineUniqueNumberDtoValidator.java | 4 +- .../validators/SpeciesLengthFieldDtoValidator.java | 2 +- .../validators/SpeciesWeightFieldDtoValidator.java | 2 +- application-swing/pom.xml | 25 +- .../application/swing/LocalDatabaseBackupTask.java | 2 +- .../application/swing/ObserveActionExecutor.java | 13 +- .../observe/application/swing/ObserveCLAction.java | 13 +- .../application/swing/ObserveResourceManager.java | 32 +- .../observe/application/swing/ObserveRunner.java | 4 +- .../swing/ObserveSwingApplicationContext.java | 8 +- .../ObserveSwingApplicationDataSourcesManager.java | 18 +- .../swing/ObserveSwingSessionHelper.java | 2 +- .../swing/ObserveSwingTechnicalException.java | 2 +- .../ird/observe/application/swing/RunObserve.java | 2 +- .../swing/db/ObserveSwingDataSource.java | 14 +- .../swing/db/constants/ConnexionStatus.java | 4 +- .../swing/db/constants/DataContextType.java | 2 +- .../db/event/ObserveSwingDataSourceEvent.java | 2 +- .../db/event/ObserveSwingDataSourceListener.java | 2 +- .../ObserveSwingDataSourceListenerAdapter.java | 2 +- .../application/swing/ui/MnemonicHelper.java | 167 - .../application/swing/ui/ObserveKeyStrokes.java | 211 + .../application/swing/ui/ObserveMainUI.jaxx | 12 +- .../application/swing/ui/ObserveMainUI.jcss | 26 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../swing/ui/ObserveMainUIInitializer.java | 32 +- .../application/swing/ui/ObserveMainUIModel.java | 63 +- .../application/swing/ui/ObserveUICallback.java | 2 +- .../application/swing/ui/ObserveUIMode.java | 6 +- .../ird/observe/application/swing/ui/UIHelper.java | 142 +- .../swing/ui/actions/AbstractObserveAction.java | 8 +- .../swing/ui/actions/AbstractUIAction.java | 18 +- .../actions/content/AbstractContentUIAction.java | 9 +- .../content/AddActivityLonglineSetUIAction.java | 5 +- .../AddActivitySeineFloatingObjectUIAction.java | 5 +- .../content/AddActivitySeineSetUIAction.java | 5 +- .../content/BackToReferentialListUIAction.java | 5 +- .../ui/actions/content/CloseAndCreateUIAction.java | 61 +- .../ui/actions/content/CloseOpenUIAction.java | 5 +- .../content/CreateNewReferentialUIAction.java | 5 +- .../ui/actions/content/CreateOpenUIAction.java | 8 +- .../ui/actions/content/DeleteDataUIAction.java | 6 +- .../actions/content/DeleteReferenceUIAction.java | 6 +- .../actions/content/DeleteTableEntryUIAction.java | 6 +- .../content/EditReferentialFromListUIAction.java | 5 +- .../actions/content/EditReferentialUIAction.java | 5 +- .../swing/ui/actions/content/GoDownUIAction.java | 8 +- .../swing/ui/actions/content/GoUpUIAction.java | 13 +- .../content/MoveActivityLonglinesUIAction.java | 6 +- .../content/MoveActivitySeinesUIAction.java | 6 +- .../ui/actions/content/MoveRoutesUIAction.java | 6 +- .../actions/content/MoveTripLonglinesUIAction.java | 5 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 7 +- .../ui/actions/content/MoveTripsUIAction.java | 4 +- .../ui/actions/content/NewTableEntryUIAction.java | 6 +- .../swing/ui/actions/content/ReOpenUIAction.java | 7 +- .../ui/actions/content/ResetEditUIAction.java | 5 +- .../actions/content/ResetTableEntryUIAction.java | 6 +- .../swing/ui/actions/content/SaveEditUIAction.java | 6 +- .../ui/actions/content/SaveTableEntryUIAction.java | 8 +- .../ui/actions/content/SelectNodeUIAction.java | 7 +- .../ui/actions/content/SelectOpenNodeUIAction.java | 5 +- .../ui/actions/global/AbstractGlobalUIAction.java | 5 +- .../actions/global/ChangeFocusGlobalUIAction.java | 5 +- .../actions/global/DeleteDataGlobalUIAction.java | 5 +- .../actions/global/NewNextDataGlobalUIAction.java | 6 +- .../global/OpenCloseDataGlobalUIAction.java | 5 +- .../ui/actions/global/ResetDataGlobalUIAction.java | 6 +- .../ui/actions/global/SaveDataGlobalUIAction.java | 5 +- .../menu/action/LaunchAdminActionSupport.java | 2 +- .../menu/action/LaunchConsolidateAction.java | 4 +- .../menu/action/LaunchDataSynchronizeAction.java | 4 +- .../menu/action/LaunchExportDataAction.java | 4 +- .../action/LaunchReferentialSynchronizeAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 4 +- .../menu/action/LaunchSynchronizeAction.java | 4 +- .../actions/menu/action/LaunchValidateAction.java | 4 +- .../ChangeApplicationLanguageActionSupport.java | 2 +- .../ChangeApplicationLanguageToEnglishAction.java | 2 +- .../ChangeApplicationLanguageToFrenchAction.java | 2 +- .../ChangeApplicationLanguageToSpanishAction.java | 4 +- .../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 | 45 +- .../menu/config/ShowDataSourcePresetsAction.java | 56 + .../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 +- .../menu/navigation/GotoReferentialAction.java | 64 - .../navigation/GotoReferentialCommonAction.java | 64 + .../navigation/GotoReferentialLonglineAction.java | 64 + .../navigation/GotoReferentialSeineAction.java | 64 + .../actions/menu/storage/ChangeStorageAction.java | 2 +- .../actions/menu/storage/CloseStorageAction.java | 5 +- .../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 | 3 +- .../menu/storage/StopH2WebServerAction.java | 2 +- .../actions/menu/storage/StopServerModeAction.java | 2 +- .../SaveCurrentRemoteConfigurationUIAction.java | 123 + .../SaveCurrentServerConfigurationUIAction.java | 125 + .../storage/UseRemoteConfigurationUIAction.java | 82 + .../storage/UseServerConfigurationUIAction.java | 84 + .../swing/ui/admin/AdminActionModel.java | 2 +- .../swing/ui/admin/AdminActionWorker.java | 2 +- .../application/swing/ui/admin/AdminStep.java | 10 +- .../swing/ui/admin/AdminTabUIHandler.java | 6 +- .../application/swing/ui/admin/AdminUI.jaxx | 1 - .../application/swing/ui/admin/AdminUIHandler.java | 18 +- .../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 | 17 +- .../swing/ui/admin/config/SelectDataModel.java | 8 +- .../swing/ui/admin/config/SelectDataUIHandler.java | 2 +- .../ui/admin/consolidate/ConsolidateModel.java | 3 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 10 +- .../swing/ui/admin/export/ExportModel.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 19 +- .../swing/ui/admin/export/TripEntry.java | 4 +- .../ui/admin/export/TripToExportTableModel.java | 6 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 4 +- .../swing/ui/admin/report/ReportModel.java | 7 +- .../swing/ui/admin/report/ReportUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 20 +- .../swing/ui/admin/report/ResultTableModel.java | 11 +- .../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 | 8 +- .../admin/synchronize/data/DataSynchroModel.java | 3 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 18 +- .../data/DataSynchronizeTaskListCellRenderer.java | 2 +- .../data/task/CopyToLeftDataSynchronizeTask.java | 8 +- .../data/task/CopyToRightDataSynchronizeTask.java | 6 +- .../data/task/DataSynchronizeTaskSupport.java | 6 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 6 +- .../task/DeleteFromRightDataSynchronizeTask.java | 6 +- .../referential/ReferentialSynchronizeMode.java | 2 +- .../legacy/ObsoleteReferentialReference.java | 6 +- .../referential/legacy/SynchronizeModel.java | 8 +- .../referential/legacy/SynchronizeUIHandler.java | 10 +- .../referential/ng/ReferentialReplaceUI.jaxx | 2 +- .../ng/ReferentialReplaceUIHandler.java | 4 +- .../referential/ng/ReferentialSynchroModel.java | 6 +- .../ng/ReferentialSynchroUIHandler.java | 8 +- .../ng/ReferentialSynchronizeResources.java | 4 +- ...ReferentialSynchronizeTaskListCellRenderer.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 4 +- .../referential/ng/action/ApplyAction.java | 2 +- .../ng/action/RegisterAddTaskAction.java | 6 +- .../ng/action/RegisterCopyTaskAction.java | 6 +- .../ng/action/RegisterDeleteTaskAction.java | 6 +- .../ng/action/RegisterDesactivateTaskAction.java | 4 +- .../ng/action/RegisterRevertTaskAction.java | 6 +- .../ng/action/RegisterSkipTaskAction.java | 6 +- .../ng/action/RegisterTasksActionSupport.java | 4 +- .../ng/action/RegisterUpdateTaskAction.java | 6 +- .../ng/task/AddReferentialSynchronizeTask.java | 6 +- .../ng/task/DeleteReferentialSynchronizeTask.java | 6 +- .../DesactivateReferentialSynchronizeTask.java | 6 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 6 +- ...ferentialSynchronizeTaskWithReplaceSupport.java | 6 +- .../ng/task/RevertReferentialSynchronizeTask.java | 6 +- .../ng/task/SkipReferentialSynchronizeTask.java | 6 +- .../ng/task/UpdateReferentialSynchronizeTask.java | 6 +- .../ReferentialSynchronizeTreeCellRenderer.java | 4 +- .../ng/tree/ReferentialSynchronizeTreeModel.java | 4 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 27 +- .../node/AddedReferenceReferentialSynchroNode.java | 4 +- .../ReferenceReferentialSynchroNodeSupport.java | 6 +- .../tree/node/ReferentialSynchroNodeSupport.java | 2 +- .../ng/tree/node/RootReferentialSynchroNode.java | 2 +- .../ng/tree/node/TypeReferentialSynchroNode.java | 2 +- .../UpdatedReferenceReferentialSynchroNode.java | 4 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 4 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../swing/ui/admin/validate/ValidateModel.java | 4 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 16 +- .../application/swing/ui/content/Common.jcss | 10 +- .../application/swing/ui/content/ContentMode.java | 2 +- .../application/swing/ui/content/ContentUI.jaxx | 37 +- .../swing/ui/content/ContentUIBlockingLayerUI.java | 17 +- .../swing/ui/content/ContentUIHandler.java | 178 +- .../swing/ui/content/ContentUIInitializer.java | 45 +- .../swing/ui/content/ContentUIManager.java | 28 +- .../swing/ui/content/ContentUIModel.java | 12 +- .../swing/ui/content/ObserveActionMap.java | 4 +- .../swing/ui/content/ObserveContentUI.java | 2 +- .../swing/ui/content/ObserveFocusManager.java | 104 +- .../content/impl/longline/BasketsTableModel.java | 2 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 9 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../content/impl/longline/BranchlineUIModel.java | 4 +- .../impl/longline/BranchlinesTableModel.java | 2 +- .../LonglineCompositionTableModelSupport.java | 4 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 6 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../LonglineDetailCompositionUIInitializer.java | 2 +- .../longline/LonglineDetailCompositionUIModel.java | 4 +- ...onglineDetailCompositionUIValidationHelper.java | 4 +- ...LonglineDetailCompositionValidationContext.java | 2 +- .../LonglineDetailCompositionValidatorService.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 8 +- .../LonglineGlobalCompositionUIHandler.java | 12 +- .../longline/LonglineGlobalCompositionUIModel.java | 4 +- .../impl/longline/SectionTemplatesTableModel.java | 8 +- .../content/impl/longline/SectionsTableModel.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 8 +- .../impl/longline/SetLonglineUIHandler.java | 10 +- .../content/impl/longline/SetLonglineUIModel.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 11 +- .../FloatingObjectTransmittingBuoyOperationUI.jcss | 8 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 12 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 4 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 8 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 7 +- .../impl/seine/FloatingObjectUIHandler.java | 10 +- .../content/impl/seine/FloatingObjectUIModel.java | 4 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 8 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 12 +- .../ui/content/impl/seine/SetSeineUIModel.java | 2 +- .../swing/ui/content/list/ContentListUI.jaxx | 2 +- .../ui/content/list/ContentListUIHandler.java | 9 +- .../swing/ui/content/list/ContentListUIModel.java | 4 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIModel.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 6 +- .../list/impl/longline/TripLonglinesUIModel.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIModel.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 4 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 4 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 +- .../content/list/impl/seine/TripSeinesUIModel.java | 6 +- .../application/swing/ui/content/list/package.html | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 18 +- .../ui/content/open/ContentOpenableUIModel.java | 4 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 8 +- .../impl/longline/ActivityLonglineUIHandler.java | 10 +- .../impl/longline/ActivityLonglineUIModel.java | 6 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 8 +- .../content/open/impl/longline/TripLonglineUI.jcss | 9 - .../open/impl/longline/TripLonglineUIHandler.java | 10 +- .../open/impl/longline/TripLonglineUIModel.java | 4 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 8 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 9 - .../open/impl/seine/ActivitySeineUIHandler.java | 12 +- .../open/impl/seine/ActivitySeineUIModel.java | 4 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 8 +- .../swing/ui/content/open/impl/seine/RouteUI.jcss | 9 - .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../ui/content/open/impl/seine/RouteUIModel.java | 4 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 11 +- .../ui/content/open/impl/seine/TripSeineUI.jcss | 9 - .../open/impl/seine/TripSeineUIHandler.java | 10 +- .../content/open/impl/seine/TripSeineUIModel.java | 4 +- .../ui/content/ref/ContentI18nReferenceUI.jaxx | 16 +- .../ui/content/ref/ContentI18nReferenceUI.jcss | 8 + .../swing/ui/content/ref/ContentReferenceUI.jaxx | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 117 +- .../content/ref/ContentReferenceUIInitializer.java | 50 + .../ui/content/ref/ContentReferenceUIModel.java | 124 +- .../ui/content/ref/ReferenceHomeCommonUI.java | 39 + .../ui/content/ref/ReferenceHomeLonglineUI.java | 40 + .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 39 + .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 15 +- .../swing/ui/content/ref/ReferenceHomeUI.jcss | 6 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 35 +- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 45 +- .../ref/ReferentialContentUIInitializer.java | 50 - .../swing/ui/content/ref/UniqueKeyTableModel.java | 2 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 11 +- .../swing/ui/content/ref/impl/CountryUI.jcss | 2 + .../ui/content/ref/impl/CountryUIHandler.java | 2 +- .../swing/ui/content/ref/impl/CountryUIModel.java | 2 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 12 +- .../ui/content/ref/impl/FpaZoneUIHandler.java | 2 +- .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 9 +- .../ref/impl/GearCaracteristicTypeUIHandler.java | 2 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 15 +- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 1 + .../ref/impl/GearCaracteristicUIHandler.java | 2 +- .../content/ref/impl/GearCaracteristicUIModel.java | 2 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 23 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 4 +- .../swing/ui/content/ref/impl/GearUIModel.java | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 12 +- .../swing/ui/content/ref/impl/HarbourUI.jcss | 2 + .../ui/content/ref/impl/HarbourUIHandler.java | 2 +- .../swing/ui/content/ref/impl/HarbourUIModel.java | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 23 +- .../content/ref/impl/LengthLengthParameterUI.jcss | 13 +- .../ref/impl/LengthLengthParameterUIHandler.java | 4 +- .../ref/impl/LengthLengthParameterUIModel.java | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 35 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 13 +- .../ref/impl/LengthWeightParameterUIHandler.java | 7 +- .../ref/impl/LengthWeightParameterUIModel.java | 8 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 8 +- .../swing/ui/content/ref/impl/OceanUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OceanUIModel.java | 2 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OrganismUI.jcss | 1 + .../ui/content/ref/impl/OrganismUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OrganismUIModel.java | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 20 +- .../swing/ui/content/ref/impl/PersonUI.jcss | 6 +- .../swing/ui/content/ref/impl/PersonUIHandler.java | 2 +- .../swing/ui/content/ref/impl/PersonUIModel.java | 2 +- .../content/ref/impl/ProgramObservationEnum.java | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 33 +- .../swing/ui/content/ref/impl/ProgramUI.jcss | 7 +- .../ui/content/ref/impl/ProgramUIHandler.java | 4 +- .../swing/ui/content/ref/impl/ProgramUIModel.java | 2 +- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 2 + .../swing/ui/content/ref/impl/SexUI.jaxx | 6 +- .../swing/ui/content/ref/impl/SexUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SexUIModel.java | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 10 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jcss | 1 + .../ui/content/ref/impl/ShipOwnerUIHandler.java | 2 +- .../ui/content/ref/impl/ShipOwnerUIModel.java | 4 +- .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 6 +- .../content/ref/impl/SizeMeasureTypeUIHandler.java | 2 +- .../content/ref/impl/SizeMeasureTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 6 +- .../ui/content/ref/impl/SpeciesGroupUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesGroupUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 23 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 4 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 27 +- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 4 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 4 +- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 2 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 10 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jcss | 2 + .../ref/impl/VesselSizeCategoryUIHandler.java | 2 +- .../ref/impl/VesselSizeCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 30 +- .../ui/content/ref/impl/VesselTypeUIHandler.java | 2 +- .../ui/content/ref/impl/VesselTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 23 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 4 +- .../swing/ui/content/ref/impl/VesselUIModel.java | 2 +- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 9 +- .../ref/impl/WeightMeasureTypeUIHandler.java | 2 +- .../content/ref/impl/WeightMeasureTypeUIModel.java | 2 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 6 +- .../impl/longline/BaitHaulingStatusUIHandler.java | 2 +- .../impl/longline/BaitHaulingStatusUIModel.java | 2 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 4 +- .../impl/longline/BaitSettingStatusUIHandler.java | 2 +- .../impl/longline/BaitSettingStatusUIModel.java | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 6 +- .../ref/impl/longline/BaitTypeUIHandler.java | 3 +- .../content/ref/impl/longline/BaitTypeUIModel.java | 2 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 6 +- .../impl/longline/CatchFateLonglineUIHandler.java | 2 +- .../impl/longline/CatchFateLonglineUIModel.java | 2 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 6 +- .../ref/impl/longline/EncounterTypeUIHandler.java | 2 +- .../ref/impl/longline/EncounterTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 6 +- .../ref/impl/longline/HealthnessUIHandler.java | 2 +- .../ref/impl/longline/HealthnessUIModel.java | 2 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 6 +- .../ref/impl/longline/HookPositionUIHandler.java | 2 +- .../ref/impl/longline/HookPositionUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 6 +- .../ref/impl/longline/HookSizeUIHandler.java | 2 +- .../content/ref/impl/longline/HookSizeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 4 +- .../ref/impl/longline/HookTypeUIHandler.java | 2 +- .../content/ref/impl/longline/HookTypeUIModel.java | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 6 +- .../longline/ItemHorizontalPositionUIHandler.java | 2 +- .../longline/ItemHorizontalPositionUIModel.java | 2 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 6 +- .../longline/ItemVerticalPositionUIHandler.java | 2 +- .../impl/longline/ItemVerticalPositionUIModel.java | 2 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 6 +- .../impl/longline/LightsticksColorUIHandler.java | 2 +- .../ref/impl/longline/LightsticksColorUIModel.java | 2 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 6 +- .../impl/longline/LightsticksTypeUIHandler.java | 2 +- .../ref/impl/longline/LightsticksTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 6 +- .../ref/impl/longline/LineTypeUIHandler.java | 2 +- .../content/ref/impl/longline/LineTypeUIModel.java | 2 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 11 +- .../ref/impl/longline/MaturityStatusUI.jcss | 2 + .../ref/impl/longline/MaturityStatusUIHandler.java | 2 +- .../ref/impl/longline/MaturityStatusUIModel.java | 2 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 6 +- .../ref/impl/longline/MitigationTypeUIHandler.java | 2 +- .../ref/impl/longline/MitigationTypeUIModel.java | 2 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 9 +- .../content/ref/impl/longline/SensorBrandUI.jcss | 1 + .../ref/impl/longline/SensorBrandUIHandler.java | 2 +- .../ref/impl/longline/SensorBrandUIModel.java | 2 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 6 +- .../impl/longline/SensorDataFormatUIHandler.java | 2 +- .../ref/impl/longline/SensorDataFormatUIModel.java | 2 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 6 +- .../ref/impl/longline/SensorTypeUIHandler.java | 2 +- .../ref/impl/longline/SensorTypeUIModel.java | 2 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 6 +- .../ref/impl/longline/SettingShapeUIHandler.java | 2 +- .../ref/impl/longline/SettingShapeUIModel.java | 2 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 6 +- .../ref/impl/longline/StomacFullnessUIHandler.java | 2 +- .../ref/impl/longline/StomacFullnessUIModel.java | 2 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 6 +- .../ref/impl/longline/TripTypeUIHandler.java | 2 +- .../content/ref/impl/longline/TripTypeUIModel.java | 2 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 6 +- .../longline/VesselActivityLonglineUIHandler.java | 2 +- .../longline/VesselActivityLonglineUIModel.java | 2 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 6 +- .../ref/impl/seine/DetectionModeUIHandler.java | 2 +- .../ref/impl/seine/DetectionModeUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 6 +- .../ref/impl/seine/ObjectFateUIHandler.java | 2 +- .../content/ref/impl/seine/ObjectFateUIModel.java | 2 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 4 +- .../ref/impl/seine/ObjectOperationUIHandler.java | 2 +- .../ref/impl/seine/ObjectOperationUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 6 +- .../ref/impl/seine/ObjectTypeUIHandler.java | 2 +- .../content/ref/impl/seine/ObjectTypeUIModel.java | 2 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 8 +- .../ref/impl/seine/ObservedSystemUIHandler.java | 2 +- .../ref/impl/seine/ObservedSystemUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 4 +- .../ref/impl/seine/ReasonForDiscardUIHandler.java | 2 +- .../ref/impl/seine/ReasonForDiscardUIModel.java | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 4 +- .../impl/seine/ReasonForNoFishingUIHandler.java | 2 +- .../ref/impl/seine/ReasonForNoFishingUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 6 +- .../ref/impl/seine/ReasonForNullSetUIHandler.java | 2 +- .../ref/impl/seine/ReasonForNullSetUIModel.java | 2 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 4 +- .../ref/impl/seine/SpeciesFateUIHandler.java | 2 +- .../content/ref/impl/seine/SpeciesFateUIModel.java | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 6 +- .../ref/impl/seine/SpeciesStatusUIHandler.java | 2 +- .../ref/impl/seine/SpeciesStatusUIModel.java | 2 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 6 +- .../impl/seine/SurroundingActivityUIHandler.java | 2 +- .../ref/impl/seine/SurroundingActivityUIModel.java | 2 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 4 +- .../seine/TransmittingBuoyOperationUIHandler.java | 2 +- .../seine/TransmittingBuoyOperationUIModel.java | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 6 +- .../impl/seine/TransmittingBuoyTypeUIHandler.java | 2 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 2 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 2 +- .../impl/seine/VesselActivitySeineUIHandler.java | 2 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 8 +- .../ref/impl/seine/WeightCategoryUIHandler.java | 2 +- .../ref/impl/seine/WeightCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 10 +- .../swing/ui/content/ref/impl/seine/WindUI.jcss | 3 + .../ui/content/ref/impl/seine/WindUIHandler.java | 2 +- .../ui/content/ref/impl/seine/WindUIModel.java | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 76 + .../content/ref/usage/UsageForDeleteUIHandler.java | 70 + .../content/ref/usage/UsageForDesactivateUI.jaxx | 78 + .../ref/usage/UsageForDesactivateUIHandler.java | 71 + .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 60 + .../ref/usage/UsageForDisplayUIHandler.java | 53 + .../content/ref/usage/UsageUIHandlerSupport.java | 193 + .../swing/ui/content/table/CommonTable.jcss | 4 + .../swing/ui/content/table/ContentTableMeta.java | 2 +- .../swing/ui/content/table/ContentTableModel.java | 4 +- .../swing/ui/content/table/ContentTableUI.jaxx | 21 +- .../swing/ui/content/table/ContentTableUI.jcss | 29 +- .../ui/content/table/ContentTableUIHandler.java | 24 +- .../content/table/ContentTableUIInitializer.java | 49 +- .../ui/content/table/ContentTableUIModel.java | 10 +- .../ui/content/table/ObserveContentTableUI.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 4 +- .../GearUseFeatureMeasurementCellRenderer.java | 4 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 2 +- .../impl/longline/BaitsCompositionUIHandler.java | 4 +- .../impl/longline/BaitsCompositionUIModel.java | 2 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 4 +- .../longline/BranchlinesCompositionUIModel.java | 2 +- .../impl/longline/CatchAcquisitionModeEnum.java | 4 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../impl/longline/CatchLonglineTableModel.java | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 10 +- .../table/impl/longline/CatchLonglineUI.jcss | 11 +- .../impl/longline/CatchLonglineUIHandler.java | 12 +- .../table/impl/longline/CatchLonglineUIModel.java | 2 +- .../content/table/impl/longline/EncounterUI.jaxx | 9 +- .../content/table/impl/longline/EncounterUI.jcss | 3 +- .../table/impl/longline/EncounterUIHandler.java | 10 +- .../table/impl/longline/EncounterUIModel.java | 2 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 4 +- .../longline/FloatlinesCompositionUIModel.java | 2 +- .../GearUseFeaturesLonglineTableModel.java | 4 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 8 +- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 8 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 19 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 +- .../table/impl/longline/HooksCompositionUI.jaxx | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 4 +- .../impl/longline/HooksCompositionUIModel.java | 2 +- .../impl/longline/LonglinePositionHelper.java | 4 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 10 +- .../content/table/impl/longline/SensorUsedUI.jcss | 3 +- .../table/impl/longline/SensorUsedUIHandler.java | 6 +- .../table/impl/longline/SensorUsedUIModel.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 6 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 4 +- .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../ui/content/table/impl/longline/TdrUIModel.java | 10 +- .../impl/longline/WeightMeasuresTableModel.java | 6 +- .../table/impl/seine/AbstractSampleUIHandler.java | 16 +- .../content/table/impl/seine/CodeMesureEnum.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 8 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 19 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 9 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 8 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 12 +- .../table/impl/seine/NonTargetCatchUIModel.java | 2 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 8 +- .../table/impl/seine/NonTargetSampleUI.jcss | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 12 +- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 8 +- .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 10 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 10 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 8 +- .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 7 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 10 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 2 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 10 +- .../content/table/impl/seine/SchoolEstimateUI.jcss | 10 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 10 +- .../table/impl/seine/SchoolEstimateUIModel.java | 2 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 10 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +- .../table/impl/seine/TargetCatchUIHandler.java | 10 +- .../table/impl/seine/TargetCatchUIModel.java | 2 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 9 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 14 +- .../impl/seine/TargetDiscardCatchUIModel.java | 2 +- .../impl/seine/TargetSampleCaptureUIHandler.java | 2 +- .../impl/seine/TargetSampleRejeteUIHandler.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 7 +- .../content/table/impl/seine/TargetSampleUI.jcss | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 12 +- .../table/impl/seine/TargetSampleUIModel.java | 4 +- .../ird/observe/application/swing/ui/package.html | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 6 +- .../swing/ui/storage/RemoteUILauncher.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 12 +- .../application/swing/ui/storage/StorageStep.java | 2 +- .../swing/ui/storage/StorageUIHandler.java | 55 +- .../swing/ui/storage/StorageUILauncher.java | 11 +- .../swing/ui/storage/StorageUIModel.java | 27 +- .../swing/ui/storage/presets/RemotePresetsUI.jaxx | 160 + .../swing/ui/storage/presets/RemotePresetsUI.jcss | 115 + .../ui/storage/presets/RemotePresetsUIHandler.java | 344 + .../ui/storage/presets/RemotePresetsUIModel.java | 100 + .../swing/ui/storage/tabs/BackupUIHandler.java | 12 +- .../ui/storage/tabs/ChooseDbModeUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigDataUIHandler.java | 2 +- .../storage/tabs/ConfigReferentielUIHandler.java | 12 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 53 +- .../swing/ui/storage/tabs/ConfigUI.jcss | 36 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 95 +- .../swing/ui/storage/tabs/ConfirmUIHandler.java | 2 +- .../swing/ui/storage/tabs/RolesTableModel.java | 5 +- .../swing/ui/storage/tabs/RolesUIHandler.java | 2 +- .../swing/ui/storage/tabs/SecurityModel.java | 2 +- .../swing/ui/storage/tabs/SelectDataUIHandler.java | 7 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 4 +- .../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/menu/MoveNodeMenuPopulator.java | 8 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 18 +- .../navigation/NavigationTreeCellRenderer.java | 2 +- .../ui/tree/navigation/NavigationTreeHeader.jcss | 14 +- .../navigation/NavigationTreeHeaderHandler.java | 59 +- .../ui/tree/navigation/NavigationTreeModel.java | 19 +- .../navigation/nodes/ClassNavigationTreeNode.java | 2 +- .../nodes/NavigationTreeNodeSupport.java | 36 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 4 +- .../navigation/nodes/RootNavigationTreeNode.java | 4 +- .../nodes/StringNavigationTreeNodeSupport.java | 2 +- .../tree/navigation/nodes/WithChildsToReload.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 6 +- .../ActivityLonglineNavigationTreeNode.java | 4 +- .../longline/CatchLonglineNavigationTreeNode.java | 2 +- .../EncounterLonglineNavigationTreeNode.java | 2 +- .../GearUseFeaturesLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 6 +- .../SensorUsedLonglineNavigationTreeNode.java | 2 +- ...etailCompositionLonglineNavigationTreeNode.java | 2 +- ...lobalCompositionLonglineNavigationTreeNode.java | 2 +- .../longline/SetLonglineNavigationTreeNode.java | 4 +- .../longline/TdrLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 4 +- .../referential/ReferentialNavigationTreeNode.java | 2 +- .../ReferentialsCommonNavigationTreeNode.java | 47 + .../ReferentialsLonglineNavigationTreeNode.java | 47 + .../ReferentialsNavigationTreeNode.java | 77 - .../ReferentialsNavigationTreeNodeSupport.java | 65 + .../ReferentialsSeineNavigationTreeNode.java | 47 + .../seine/ActivitiesSeineNavigationTreeNode.java | 6 +- .../seine/ActivitySeineNavigationTreeNode.java | 6 +- ...cardedTargetCatchesSeineNavigationTreeNode.java | 2 +- ...cardedTargetSamplesSeineNavigationTreeNode.java | 2 +- .../FloatingObjectSeineNavigationTreeNode.java | 4 +- ...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 | 6 +- .../nodes/seine/RouteSeineNavigationTreeNode.java | 4 +- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 6 +- .../SchoolEstimatesSeineNavigationTreeNode.java | 2 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 4 +- .../nodes/seine/TripSeineNavigationTreeNode.java | 4 +- .../swing/ui/tree/selection/SelectionTree.java | 9 +- .../tree/selection/SelectionTreeCellRenderer.java | 2 +- .../tree/selection/SelectionTreeHeaderHandler.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 6 +- .../selection/nodes/ProgramSelectionTreeNode.java | 6 +- .../nodes/ReferenceSelectionTreeNodeSupport.java | 4 +- .../nodes/ReferentialSelectionTreeNode.java | 2 +- .../nodes/ReferentialsSelectionTreeNode.java | 2 +- .../selection/nodes/RootSelectionTreeNode.java | 2 +- .../selection/nodes/SelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 4 +- .../nodes/TripSeineSelectionTreeNode.java | 4 +- .../nodes/TripSelectionTreeNodeSupport.java | 4 +- .../application/swing/ui/usage/UsagesUI.jaxx | 86 - .../swing/ui/usage/UsagesUIHandler.java | 197 - .../application/swing/ui/util/BooleanEditor.java | 5 +- .../application/swing/ui/util/FloatConverter.java | 2 +- .../application/swing/ui/util/JComment.jaxx | 43 + .../application/swing/ui/util/JComment.jcss | 14 + .../swing/ui/util/JVetoableTabbedPane.java | 4 +- .../ObserveSwingValidatorMessageTableModel.java | 2 +- .../ObserveValidationMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../application/swing/ui/util/ProgressModel.java | 2 +- .../application/swing/ui/util/SpringUtilities.java | 109 +- .../ui/util/table/AbstractSelectTableAction.java | 2 +- .../AutotSelectRowAndShowPopupActionSupport.java | 5 +- .../swing/ui/util/table/EditableList.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 12 +- .../EditableTableWithCacheTableModelSupport.java | 2 +- ...nlineTableAutotSelectRowAndShowPopupAction.java | 2 +- .../util/table/MoveToNextEditableCellAction.java | 6 +- .../ui/util/table/MoveToNextEditableRowAction.java | 4 +- .../table/MoveToPreviousEditableCellAction.java | 4 +- .../table/MoveToPreviousEditableRowAction.java | 4 +- .../table/ObserveBooleanTableCellRenderer.java | 4 +- .../swing/ui/util/tripMap/ObserveMapPane.java | 19 +- .../ui/util/tripMap/TripMapContentBuilder.java | 20 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 +- .../swing/validation/ObserveSwingValidator.java | 2 +- .../swing/validation/ValidationContext.java | 4 +- .../swing/validation/ValidationModelMode.java | 2 +- .../i18n/application-swing_en_GB.properties | 128 +- .../i18n/application-swing_es_ES.properties | 128 +- .../i18n/application-swing_fr_FR.properties | 129 +- ...glineDetailCompositionValidatorServiceTest.java | 2 +- application-web-configuration/pom.xml | 6 +- .../configuration/ObserveWebApplicationConfig.java | 6 +- .../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 | 6 +- .../db/impl/ObserveWebDatabaseRoleBean.java | 4 +- .../db/impl/ObserveWebDatabaseRoleImmutable.java | 4 +- .../db/impl/ObserveWebDatabasesBean.java | 6 +- .../db/impl/ObserveWebDatabasesImmutable.java | 8 +- .../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 | 6 +- .../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/observeweb-log4j.conf | 3 + .../src/main/resources/validators.xml | 22 +- application-web/pom.xml | 17 +- .../web/ObserveWebApplicationContext.java | 6 +- .../ObserveWebApplicationContextInitException.java | 4 +- .../application/web/ObserveWebMainHandler.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 4 +- .../application/web/ObserveWebMotionRender.java | 2 +- .../web/controller/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 14 +- .../v1/LastUpdateDateServiceController.java | 2 +- ...serveAuthenticatedServiceControllerSupport.java | 2 +- .../v1/ObserveServiceControllerSupport.java | 2 +- .../controller/v1/ObserveWebErrorController.java | 6 +- .../web/controller/v1/PingServiceController.java | 2 +- .../v1/actions/report/ReportServiceController.java | 4 +- ...eferentialSynchronizeDiffServiceController.java | 4 +- ...ferentialSynchronizeLocalServiceController.java | 6 +- .../ReferentialSynchronizeServiceController.java | 2 +- .../v1/data/NavigationServiceController.java | 2 +- .../v1/data/TripManagementServiceController.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 | 13 +- .../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 | 13 +- .../referential/ReferentialServiceController.java | 10 +- .../v1/sql/SqlScriptProducerServiceController.java | 2 +- .../web/converter/ObserveDtoConverter.java | 4 +- .../application/web/injector/DateInjector.java | 2 +- .../web/injector/ImmutableSetInjector.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 8 +- .../ObserveReferenceSetRequestInjector.java | 2 +- .../web/request/ObserveWebRequestContext.java | 4 +- .../ObserveWebSecurityApplicationContext.java | 22 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 20 +- application-web/src/main/resources/mapping | 2 - .../db/ObserveWebDatabasesHelperTest.java | 2 +- .../user/ObserveWebUsersHelperTest.java | 2 +- changelog.txt | 16 +- {services-topia-validators => common}/LICENSE.txt | 0 {services-topia-validators => common}/README.md | 0 common/pom.xml | 60 + common/src/license/THIRD-PARTY.properties | 23 + .../fr/ird/observe/common/CoordinateHelper.java | 54 + .../java/fr/ird/observe/common/FormulaHelper.java | 187 + .../main/java/fr/ird/observe/common/GPSPoint.java | 211 + .../java/fr/ird/observe/common/ObserveUtil.java | 92 + .../java/fr/ird/observe/common/TripMapPoint.java | 81 + .../java/fr/ird/observe/common/WithFormula.java | 41 + .../fr/ird/observe/common/constants/GearType.java | 49 + .../observe/common/constants/ReferenceStatus.java | 40 + .../observe/common/constants/TripMapPointType.java | 51 + .../seine/NonTargetCatchComputedValueSource.java | 52 + .../observe/common/constants/seine/Ownership.java | 51 + .../observe/common/constants/seine/SchoolType.java | 41 + .../seine/TypeTransmittingBuoyOperation.java | 68 + .../fr/ird/observe/common/FormulaHelperTest.java | 66 + .../fr/ird/observe/common/RelationRegexTest.java | 84 + .../java/fr/ird/observe/common/ScriptTest.java | 114 + common/src/test/resources/log4j.properties | 31 + doc/cr/CR_10_04_2009.pdf | Bin 65565 -> 0 bytes doc/cr/CR_10_04_2009.rst | 187 - doc/cr/CR_10_12_2014.txt | 174 - doc/cr/CR_21_11_2008.pdf | Bin 129327 -> 0 bytes doc/cr/CR_21_11_2008.rst | 588 - doc/cr/CR_26_11_2014.txt | 100 - doc/entities/BDGen_ObsTuna1h_gen.mdb | Bin 1769472 -> 0 bytes doc/entities/MCD_OBSTUNA_V2_1.pdf | Bin 29504 -> 0 bytes doc/entities/MLD_OBSTUNA_V2_1.pdf | Bin 23836 -> 0 bytes doc/entities/OBSTUNA_V2_1_POSTGRESQL.mpd | 18017 ---- doc/entities/ObsTuna_v2.1.mcd | 12274 --- doc/entities/export-script.sh | 4 - doc/entities/obstuna_postgres_v2_1.sql | 2236 - doc/entities/obstuna_postgres_v2_1_tables.txt | 1059 - ...bstuna_postgres_v2_1_tables_non_referentiel.txt | 433 - .../obstuna_postgres_v2_1_tables_referentiel.txt | 631 - doc/especes/Espece_DCR_verif_Obstuna(V1.5).csv | 191 - doc/especes/Espece_DCR_verif_Obstuna(V1.5).xls | Bin 100864 -> 0 bytes doc/especes/taille_-_faunaminmax.xls | Bin 122368 -> 0 bytes doc/gps/exemple_GL50_13_tronque.gpx | 54296 ------------ doc/gps/exemple_GL50_13_tronque.kml | 81484 ------------------- doc/old/Formulaires_V 3.0_20081125.xls | Bin 2207232 -> 0 bytes doc/old/PCO080827-03-IRD-ObServe.pdf | Bin 1504722 -> 0 bytes doc/old/cdc_ot_observe_vb_4_2_tabletpc.pdf | Bin 2102652 -> 0 bytes doc/old/controles_saisie_v1_3.doc | Bin 161280 -> 0 bytes doc/old/mode_d_utilisation.pdf | Bin 1262447 -> 0 bytes ...ification_pour_requetes_Rapport_Observateur.odt | Bin 380214 -> 0 bytes doc/retours_v1/Reponse_Tests_proto4.pdf | Bin 74001 -> 0 bytes doc/retours_v1/Reponse_Tests_proto4.rst | 212 - doc/retours_v1/Reponse_Tests_proto4_v2.pdf | Bin 82899 -> 0 bytes doc/retours_v1/Reponse_Tests_proto4_v2.rst | 233 - .../reponse_resultats_tests_proto2_observe_v2.odt | Bin 314203 -> 0 bytes doc/retours_v1/reponse_retour_test.rst | 416 - .../resultats_tests_proto2_observe_v2.odt | Bin 311721 -> 0 bytes .../resultats_tests_proto2_observe_v2.pdf | Bin 337500 -> 0 bytes doc/retours_v1/retours_pca_proto4.odt | Bin 33521 -> 0 bytes .../synth_corrections_proto4_20090403.odt | Bin 193041 -> 0 bytes doc/retours_v1/tests-alain-19062009.odt | Bin 55271 -> 0 bytes ...00000521.critiques_des_observateurs_pour_v2.odt | Bin 49240 -> 0 bytes doc/retours_v2/notes sur Observe sept 2010 AD.doc | Bin 5404672 -> 0 bytes doc/retours_v2/reponse_tests-decembre2010.txt | 177 - doc/retours_v2/test_ad_revu_pca_decembre_2010.doc | Bin 1270784 -> 0 bytes doc/retours_v2/tests_ad.doc | Bin 3046912 -> 0 bytes doc/retours_v2/tests_observe_v22_v23-r1365-bis.odt | Bin 665210 -> 0 bytes doc/retours_v2/tests_observe_v22_v23-r1365.odt | Bin 39844 -> 0 bytes doc/v3/chiffrage/chiffrage_v3.txt | 254 - doc/v3/chiffrage/nouvelles_fonctions_v3.odt | Bin 274982 -> 0 bytes doc/v3/chiffrage/nouvelles_fonctions_v3_1_2.odt | Bin 270238 -> 0 bytes doc/v4/constrainsts.csv | 100 - doc/v4/data-longline.txt | 17 - doc/v4/data-seine.txt | 16 - doc/v4/generate-ll-ref.sh | 19 - doc/v4/ref-common.txt | 16 - doc/v4/ref-longline.txt | 27 - doc/v4/ref-seine.txt | 16 - doc/v4/rename-seine-migration.sh | 18 - doc/v4/rename.sh | 98 - doc/v4/seine.txt | 32 - doc/v4/templateH2-table.sql | 4 - doc/v4/templatePG-table.sql | 4 - doc/v4/traduction.csv | 575 - doc/v4/traduction_attributes.csv | 172 - doc/v4/traduction_tables.csv | 47 - doc/v4/translateCode.sh | 135 - doc/v4/translateModel.sh | 131 - entities-migration/LICENSE.txt | 674 - entities-migration/README.md | 0 entities-migration/pom.xml | 115 - .../src/license/THIRD-PARTY.properties | 33 - .../DataSourceMigrationForVersion_5_0.java | 116 - .../DataSourceMigrationForVersion_6_0.java | 302 - .../old/DataSourceMigrationForVersion_3_1.java | 111 - .../old/DataSourceMigrationForVersion_3_10.java | 77 - .../old/DataSourceMigrationForVersion_3_11.java | 78 - .../old/DataSourceMigrationForVersion_3_12.java | 73 - .../old/DataSourceMigrationForVersion_3_14.java | 76 - .../old/DataSourceMigrationForVersion_3_15.java | 75 - .../old/DataSourceMigrationForVersion_3_16.java | 156 - .../old/DataSourceMigrationForVersion_3_5.java | 231 - .../old/DataSourceMigrationForVersion_3_7.java | 82 - .../old/DataSourceMigrationForVersion_3_8.java | 76 - .../old/DataSourceMigrationForVersion_3_9.java | 74 - .../old/DataSourceMigrationForVersion_4_0.java | 75 - .../old/DataSourceMigrationForVersion_4_0_1.java | 216 - .../old/DataSourceMigrationForVersion_4_0_2.java | 76 - .../old/DataSourceMigrationForVersion_4_0_4.java | 72 - .../old/DataSourceMigrationForVersion_4_0_RC2.java | 106 - .../old/DataSourceMigrationForVersion_4_0_RC3.java | 280 - .../old/DataSourceMigrationForVersion_4_0_RC4.java | 76 - .../old/DataSourceMigrationForVersion_4_0_RC6.java | 93 - .../old/DataSourceMigrationForVersion_4_0_RC7.java | 82 - .../db/migration/5.0/01_remove_open_field-H2.sql | 26 - .../db/migration/5.0/01_remove_open_field-PG.sql | 26 - .../5.0/02_add_lastUpdateDate_field-H2.sql | 697 - .../5.0/02_add_lastUpdateDate_field-PG.sql | 697 - .../5.0/03_add_lastUpdateDate_table-H2.sql | 127 - .../5.0/03_add_lastUpdateDate_table-PG.sql | 127 - .../db/migration/5.0/04_remove_unit_field-H2.sql | 22 - .../db/migration/5.0/04_remove_unit_field-PG.sql | 22 - .../db/migration/5.0/05_remove_gender_field-H2.sql | 22 - .../db/migration/5.0/05_remove_gender_field-PG.sql | 22 - .../migration/5.0/06_remove_duplicate_rows-H2.sql | 42 - .../migration/5.0/06_remove_duplicate_rows-PG.sql | 42 - ...drop_not_null_constraint_gearUseFeatures-H2.sql | 22 - ...drop_not_null_constraint_gearUseFeatures-PG.sql | 22 - ...p_not_null_constraint_hauling_identifier-H2.sql | 24 - ...p_not_null_constraint_hauling_identifier-PG.sql | 24 - .../5.0/09_add_non_target_length_sex_fk-H2.sql | 22 - .../5.0/09_add_non_target_length_sex_fk-PG.sql | 22 - .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 22 - .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 22 - .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 23 - .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 23 - .../03_evol_6997_delete_supportVesselName-H2.sql | 22 - .../03_evol_6997_delete_supportVesselName-PG.sql | 22 - ...ranchlineComposition_add_tracelineLength-H2.sql | 22 - ...ranchlineComposition_add_tracelineLength-PG.sql | 22 - .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 22 - .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 22 - .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 23 - .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 23 - .../6.0/07_evol_8389_rename_source_columns-H2.sql | 25 - .../6.0/07_evol_8389_rename_source_columns-PG.sql | 25 - .../6.0/08_1_evol_8390_measure_type-H2.sql | 32 - .../6.0/08_1_evol_8390_measure_type-PG.sql | 32 - .../migration/6.0/08_evol_8390_measure_type-H2.sql | 40 - .../migration/6.0/08_evol_8390_measure_type-PG.sql | 41 - .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 23 - .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 23 - ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 23 - ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 23 - .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 24 - .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 24 - .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 28 - .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 28 - .../6.0/13_evol_7901_add_armateur_table-H2.sql | 58 - .../6.0/13_evol_7901_add_armateur_table-PG.sql | 58 - ...ol_8196_lengthWeightParameter_add_source-H2.sql | 24 - ...ol_8196_lengthWeightParameter_add_source-PG.sql | 24 - ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 23 - ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 23 - .../16_evol_8377_speciesFate_add_discard-H2.sql | 29 - .../16_evol_8377_speciesFate_add_discard-PG.sql | 29 - ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 25 - ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 25 - .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 35 - .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 35 - .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 25 - .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 25 - ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 22 - ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 22 - .../old/3.10/V3_10_01_remove-person-H2.sql | 28 - .../old/3.10/V3_10_01_remove-person-PG.sql | 28 - .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 26 - .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 26 - .../3.10/V3_10_03_increase-comment-field-H2.sql | 23 - .../3.10/V3_10_03_increase-comment-field-PG.sql | 23 - .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 22 - .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 22 - .../old/3.10/V3_10_05_normalize-sections-H2.sql | 27 - .../old/3.10/V3_10_05_normalize-sections-PG.sql | 27 - ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 26 - ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 26 - ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 23 - ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 23 - .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 62 - .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 62 - .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 22 - .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 22 - .../old/3.11/V3_11_05_add-person-country-H2.sql | 23 - .../old/3.11/V3_11_05_add-person-country-PG.sql | 23 - .../old/3.11/V3_11_06_add-harbours-H2.sql | 107 - .../old/3.11/V3_11_06_add-harbours-PG.sql | 108 - .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 22 - .../old/3.12/V3_12_01_add-missing-boat-PG.sql | 22 - ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 23 - ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 22 - ...3_14_02_fix-targetsample-discarded-value-H2.sql | 22 - ...3_14_02_fix-targetsample-discarded-value-PG.sql | 22 - .../V3_14_03_remove-orphan-seine-sample-H2.sql | 22 - .../V3_14_03_remove-orphan-seine-sample-PG.sql | 22 - ...4_04_remove-targetlength-discarded-field-H2.sql | 22 - ...4_04_remove-targetlength-discarded-field-PG.sql | 22 - ..._15_01_change-tdr-integer-field-to-float-H2.sql | 29 - ..._15_01_change-tdr-integer-field-to-float-PG.sql | 30 - ..._15_02_remove-set-longline-length-fields-H2.sql | 23 - ..._15_02_remove-set-longline-length-fields-PG.sql | 23 - .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 23 - .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 23 - .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 141 - .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 140 - .../old/3.16/V3_16_02_add-gear-data-H2.sql | 39 - .../old/3.16/V3_16_02_add-gear-data-PG.sql | 39 - .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 24 - .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 24 - .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 944 - .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 945 - .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 226 - .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 226 - .../3.5/V3_5_03_update-common-references-H2.sql | 51 - .../3.5/V3_5_03_update-common-references-PG.sql | 51 - .../old/3.5/V3_5_04_add-longline-references-H2.sql | 214 - .../old/3.5/V3_5_04_add-longline-references-PG.sql | 214 - .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 71 - .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 72 - .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 22 - .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 22 - .../3.7/V3_7_03_add-referential-needComment-H2.sql | 115 - .../3.7/V3_7_03_add-referential-needComment-PG.sql | 115 - .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 27 - .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 26 - .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 23 - .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 23 - .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 23 - .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 24 - .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 25 - .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 27 - .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 27 - .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 28 - .../old/3.7/V3_7_09_add-species-list-H2.sql | 87 - .../old/3.7/V3_7_09_add-species-list-PG.sql | 87 - .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 23 - .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 23 - .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 22 - .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 22 - .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 25 - .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 24 - .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 24 - .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 24 - .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 26 - .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 26 - .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 23 - .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 23 - .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 23 - .../old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql | 23 - .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 65 - .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 28 - .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 27 - ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 22 - ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 22 - .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 22 - .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 22 - .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 39 - .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql | 40 - ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 26 - ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 26 - ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 22 - ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 22 - .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 22 - .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 22 - .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 22 - .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 26 - .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 26 - .../4.0.2/V4_0_2_01_remove-gender-column-PG.sql | 22 - ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 23 - ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 23 - .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 23 - .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 23 - ...rveMigrationCallBackForVersionResolverTest.java | 72 - .../src/test/resources/log4j.properties | 33 - entities/LICENSE.txt | 674 - entities/README.md | 0 entities/pom.xml | 240 - .../fr/ird/observe/AbstractObserveTopiaDao.java | 77 - .../observe/ObserveTopiaApplicationContext.java | 544 - .../fr/ird/observe/ObserveTopiaConfiguration.java | 69 - .../observe/ObserveTopiaConfigurationFactory.java | 167 - .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 45 - .../observe/ObserveTopiaPersistenceContext.java | 167 - .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 137 - .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 53 - .../java/fr/ird/observe/entities/Activity.java | 37 - .../java/fr/ird/observe/entities/Entities.java | 245 - .../java/fr/ird/observe/entities/EntityMap.java | 45 - .../observe/entities/LastUpdateDateTopiaDao.java | 31 - .../observe/entities/LengthWeightComputable.java | 48 - .../java/fr/ird/observe/entities/ObserveSet.java | 35 - .../main/java/fr/ird/observe/entities/Trip.java | 94 - .../java/fr/ird/observe/entities/TripMapPoint.java | 81 - .../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 - .../ird/observe/entities/gps/CoordinateHelper.java | 55 - .../entities/longline/ActivityLonglineImpl.java | 131 - .../longline/ActivityLonglineTopiaDao.java | 141 - .../entities/longline/ActivityLonglines.java | 52 - .../observe/entities/longline/BasketTopiaDao.java | 48 - .../fr/ird/observe/entities/longline/Baskets.java | 50 - .../observe/entities/longline/BranchlineImpl.java | 59 - .../entities/longline/BranchlineTopiaDao.java | 46 - .../ird/observe/entities/longline/Branchlines.java | 49 - .../longline/GearUseFeaturesLonglineImpl.java | 58 - .../longline/LonglineCompositionEntity.java | 43 - .../entities/longline/LonglinePositionAware.java | 47 - .../observe/entities/longline/SectionTemplate.java | 182 - .../observe/entities/longline/SectionTopiaDao.java | 45 - .../entities/longline/SectionWithTemplate.java | 39 - .../entities/longline/SectionWithTemplateImpl.java | 259 - .../entities/longline/SectionWithTemplates.java | 52 - .../fr/ird/observe/entities/longline/Sections.java | 47 - .../observe/entities/longline/SetLonglineImpl.java | 340 - .../fr/ird/observe/entities/longline/TdrImpl.java | 136 - .../ird/observe/entities/longline/TdrTopiaDao.java | 103 - .../entities/longline/TripLonglineImpl.java | 61 - .../entities/longline/TripLonglineTopiaDao.java | 432 - .../observe/entities/longline/TripLonglines.java | 54 - .../migration/AbstractDataSourceMigration.java | 52 - .../AbstractObserveMigrationCallBack.java | 123 - .../entities/migration/H2DataSourceMigration.java | 281 - .../entities/migration/MigrationVersion.java | 42 - ...ObserveMigrationCallBackForVersionResolver.java | 87 - .../ObserveMigrationConfigurationProvider.java | 140 - .../entities/migration/ObserveMigrationEngine.java | 42 - .../entities/migration/PGDataSourceMigration.java | 367 - .../DuplicateLengthWeightParameterException.java | 74 - .../entities/referentiel/FormulaHelper.java | 191 - .../entities/referentiel/FormulaSupportImpl.java | 110 - .../referentiel/GearCaracteristicTypes.java | 83 - .../observe/entities/referentiel/HarbourImpl.java | 52 - .../referentiel/I18nReferenceEntities.java | 116 - .../referentiel/LengthLengthParameterImpl.java | 77 - .../referentiel/LengthLengthParameterTopiaDao.java | 38 - .../referentiel/LengthLengthParameters.java | 43 - .../referentiel/LengthWeightParameterImpl.java | 69 - .../LengthWeightParameterNotFoundException.java | 67 - .../referentiel/LengthWeightParameters.java | 295 - .../referentiel/ObserveReferentialEntities.java | 113 - .../referentiel/ObserveReferentialEntityImpl.java | 41 - .../ird/observe/entities/referentiel/Persons.java | 39 - .../observe/entities/referentiel/ProgramImpl.java | 51 - .../ird/observe/entities/referentiel/Programs.java | 62 - .../ird/observe/entities/referentiel/Species2.java | 104 - .../observe/entities/referentiel/SpeciesImpl.java | 70 - .../observe/entities/referentiel/VesselImpl.java | 57 - .../ird/observe/entities/referentiel/Vessels.java | 79 - .../observe/entities/seine/ActivitySeineImpl.java | 204 - .../entities/seine/ActivitySeineTopiaDao.java | 139 - .../ird/observe/entities/seine/ActivitySeines.java | 303 - .../observe/entities/seine/FloatingObjectImpl.java | 80 - .../entities/seine/FloatingObjectTopiaDao.java | 121 - .../entities/seine/GearUseFeaturesSeineImpl.java | 58 - .../observe/entities/seine/NonTargetCatchImpl.java | 151 - .../observe/entities/seine/NonTargetCatches.java | 38 - .../entities/seine/NonTargetLengthImpl.java | 51 - .../fr/ird/observe/entities/seine/RouteImpl.java | 51 - .../ird/observe/entities/seine/RouteTopiaDao.java | 148 - .../java/fr/ird/observe/entities/seine/Routes.java | 93 - .../ird/observe/entities/seine/SetSeineImpl.java | 196 - .../fr/ird/observe/entities/seine/SetSeines.java | 55 - .../observe/entities/seine/TargetCatchImpl.java | 54 - .../ird/observe/entities/seine/TargetCatchs.java | 40 - .../observe/entities/seine/TargetLengthImpl.java | 60 - .../ird/observe/entities/seine/TripSeineImpl.java | 47 - .../observe/entities/seine/TripSeineTopiaDao.java | 372 - .../fr/ird/observe/entities/seine/TripSeines.java | 50 - entities/src/main/xmi/observe-common.zargo | Bin 45811 -> 0 bytes entities/src/main/xmi/observe-seine.zargo | Bin 87287 -> 0 bytes entities/src/main/xmi/observe.ini | 307 - .../java/fr/ird/observe/RelationRegexTest.java | 84 - .../src/test/java/fr/ird/observe/ScriptTest.java | 114 - .../entities/longline/SectionTemplateTest.java | 172 - .../entities/referentiel/FormulaHelperTest.java | 49 - entities/src/test/resources/log4j.properties | 33 - .../LICENSE.txt | 0 .../README.md | 0 persistence/pom.xml | 241 + .../src/license/THIRD-PARTY.properties | 0 .../java/fr/ird/observe/entities/Activity.java | 37 + .../java/fr/ird/observe/entities/EntityMap.java | 45 + .../observe/entities/LastUpdateDateTopiaDao.java | 31 + .../observe/entities/LengthWeightComputable.java | 48 + .../java/fr/ird/observe/entities/ObserveSet.java | 35 + .../main/java/fr/ird/observe/entities/Trip.java | 94 + .../entities/longline/ActivityLonglineImpl.java | 131 + .../longline/ActivityLonglineTopiaDao.java | 132 + .../entities/longline/ActivityLonglines.java | 51 + .../observe/entities/longline/BasketTopiaDao.java | 46 + .../observe/entities/longline/BranchlineImpl.java | 59 + .../entities/longline/BranchlineTopiaDao.java | 46 + .../longline/GearUseFeaturesLonglineImpl.java | 58 + .../longline/LonglineCompositionEntity.java | 43 + .../entities/longline/LonglinePositionAware.java | 47 + .../observe/entities/longline/SectionTemplate.java | 182 + .../observe/entities/longline/SectionTopiaDao.java | 45 + .../entities/longline/SectionWithTemplate.java | 39 + .../entities/longline/SectionWithTemplateImpl.java | 259 + .../entities/longline/SectionWithTemplates.java | 52 + .../observe/entities/longline/SetLonglineImpl.java | 330 + .../fr/ird/observe/entities/longline/TdrImpl.java | 136 + .../entities/longline/TripLonglineImpl.java | 61 + .../entities/longline/TripLonglineTopiaDao.java | 300 + .../observe/entities/longline/TripLonglines.java | 54 + .../DuplicateLengthWeightParameterException.java | 74 + .../entities/referentiel/FormulaSupportImpl.java | 112 + .../observe/entities/referentiel/HarbourImpl.java | 52 + .../referentiel/I18nReferenceEntities.java | 102 + .../referentiel/LengthLengthParameterImpl.java | 80 + .../referentiel/LengthLengthParameterTopiaDao.java | 38 + .../referentiel/LengthLengthParameters.java | 43 + .../referentiel/LengthWeightParameterImpl.java | 71 + .../LengthWeightParameterNotFoundException.java | 67 + .../referentiel/LengthWeightParameters.java | 296 + .../referentiel/ObserveReferentialEntityImpl.java | 41 + .../observe/entities/referentiel/ProgramImpl.java | 51 + .../ird/observe/entities/referentiel/Species2.java | 66 + .../observe/entities/referentiel/SpeciesImpl.java | 70 + .../observe/entities/referentiel/VesselImpl.java | 57 + .../observe/entities/seine/ActivitySeineImpl.java | 204 + .../entities/seine/ActivitySeineTopiaDao.java | 114 + .../ird/observe/entities/seine/ActivitySeines.java | 300 + .../observe/entities/seine/FloatingObjectImpl.java | 80 + .../entities/seine/FloatingObjectTopiaDao.java | 99 + .../entities/seine/GearUseFeaturesSeineImpl.java | 58 + .../observe/entities/seine/NonTargetCatchImpl.java | 151 + .../observe/entities/seine/NonTargetCatches.java | 38 + .../entities/seine/NonTargetLengthImpl.java | 51 + .../fr/ird/observe/entities/seine/RouteImpl.java | 51 + .../ird/observe/entities/seine/RouteTopiaDao.java | 127 + .../java/fr/ird/observe/entities/seine/Routes.java | 39 + .../ird/observe/entities/seine/SetSeineImpl.java | 196 + .../fr/ird/observe/entities/seine/SetSeines.java | 64 + .../observe/entities/seine/TargetCatchImpl.java | 54 + .../ird/observe/entities/seine/TargetCatchs.java | 40 + .../observe/entities/seine/TargetLengthImpl.java | 60 + .../ird/observe/entities/seine/TripSeineImpl.java | 47 + .../observe/entities/seine/TripSeineTopiaDao.java | 247 + .../fr/ird/observe/entities/seine/TripSeines.java | 50 + .../persistence/AbstractObserveTopiaDao.java | 77 + .../java/fr/ird/observe/persistence/Entities.java | 245 + .../ObserveTopiaApplicationContext.java | 543 + .../persistence/ObserveTopiaConfiguration.java | 69 + .../ObserveTopiaConfigurationFactory.java | 167 + .../observe/persistence/ObserveTopiaIdFactory.java | 45 + .../ObserveTopiaPersistenceContext.java | 167 + .../observe/persistence/RunScriptTopiaSqlWork.java | 137 + .../persistence/RunScriptsTopiaSqlWork.java | 53 + .../migration/AbstractDataSourceMigration.java | 52 + .../AbstractObserveMigrationCallBack.java | 123 + .../DataSourceMigrationForVersion_5_0.java | 116 + .../DataSourceMigrationForVersion_6_0.java | 302 + .../migration/H2DataSourceMigration.java | 269 + .../persistence/migration/MigrationVersion.java | 42 + ...ObserveMigrationCallBackForVersionResolver.java | 87 + .../ObserveMigrationConfigurationProvider.java | 140 + .../migration/ObserveMigrationEngine.java | 42 + .../migration/PGDataSourceMigration.java | 358 + .../old/DataSourceMigrationForVersion_3_1.java | 111 + .../old/DataSourceMigrationForVersion_3_10.java | 77 + .../old/DataSourceMigrationForVersion_3_11.java | 78 + .../old/DataSourceMigrationForVersion_3_12.java | 73 + .../old/DataSourceMigrationForVersion_3_14.java | 76 + .../old/DataSourceMigrationForVersion_3_15.java | 75 + .../old/DataSourceMigrationForVersion_3_16.java | 153 + .../old/DataSourceMigrationForVersion_3_5.java | 231 + .../old/DataSourceMigrationForVersion_3_7.java | 82 + .../old/DataSourceMigrationForVersion_3_8.java | 76 + .../old/DataSourceMigrationForVersion_3_9.java | 74 + .../old/DataSourceMigrationForVersion_4_0.java | 75 + .../old/DataSourceMigrationForVersion_4_0_1.java | 210 + .../old/DataSourceMigrationForVersion_4_0_2.java | 76 + .../old/DataSourceMigrationForVersion_4_0_4.java | 72 + .../old/DataSourceMigrationForVersion_4_0_RC2.java | 103 + .../old/DataSourceMigrationForVersion_4_0_RC3.java | 277 + .../old/DataSourceMigrationForVersion_4_0_RC4.java | 76 + .../old/DataSourceMigrationForVersion_4_0_RC6.java | 93 + .../old/DataSourceMigrationForVersion_4_0_RC7.java | 82 + .../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 | 26 + .../db/migration/5.0/01_remove_open_field-PG.sql | 26 + .../5.0/02_add_lastUpdateDate_field-H2.sql | 697 + .../5.0/02_add_lastUpdateDate_field-PG.sql | 697 + .../5.0/03_add_lastUpdateDate_table-H2.sql | 127 + .../5.0/03_add_lastUpdateDate_table-PG.sql | 127 + .../db/migration/5.0/04_remove_unit_field-H2.sql | 22 + .../db/migration/5.0/04_remove_unit_field-PG.sql | 22 + .../db/migration/5.0/05_remove_gender_field-H2.sql | 22 + .../db/migration/5.0/05_remove_gender_field-PG.sql | 22 + .../migration/5.0/06_remove_duplicate_rows-H2.sql | 42 + .../migration/5.0/06_remove_duplicate_rows-PG.sql | 42 + ...drop_not_null_constraint_gearUseFeatures-H2.sql | 22 + ...drop_not_null_constraint_gearUseFeatures-PG.sql | 22 + ...p_not_null_constraint_hauling_identifier-H2.sql | 24 + ...p_not_null_constraint_hauling_identifier-PG.sql | 24 + .../5.0/09_add_non_target_length_sex_fk-H2.sql | 22 + .../5.0/09_add_non_target_length_sex_fk-PG.sql | 22 + .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 22 + .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 22 + .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 23 + .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 23 + .../03_evol_6997_delete_supportVesselName-H2.sql | 22 + .../03_evol_6997_delete_supportVesselName-PG.sql | 22 + ...ranchlineComposition_add_tracelineLength-H2.sql | 22 + ...ranchlineComposition_add_tracelineLength-PG.sql | 22 + .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 22 + .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 22 + .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 23 + .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 23 + .../6.0/07_evol_8389_rename_source_columns-H2.sql | 25 + .../6.0/07_evol_8389_rename_source_columns-PG.sql | 25 + .../6.0/08_1_evol_8390_measure_type-H2.sql | 32 + .../6.0/08_1_evol_8390_measure_type-PG.sql | 32 + .../migration/6.0/08_evol_8390_measure_type-H2.sql | 40 + .../migration/6.0/08_evol_8390_measure_type-PG.sql | 41 + .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 23 + .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 23 + ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 23 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 23 + .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 24 + .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 24 + .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 28 + .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 28 + .../6.0/13_evol_7901_add_armateur_table-H2.sql | 58 + .../6.0/13_evol_7901_add_armateur_table-PG.sql | 58 + ...ol_8196_lengthWeightParameter_add_source-H2.sql | 24 + ...ol_8196_lengthWeightParameter_add_source-PG.sql | 24 + ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 23 + ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 23 + .../16_evol_8377_speciesFate_add_discard-H2.sql | 29 + .../16_evol_8377_speciesFate_add_discard-PG.sql | 29 + ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 25 + ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 25 + .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 35 + .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 35 + .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 25 + .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 25 + ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 22 + ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 22 + .../old/3.10/V3_10_01_remove-person-H2.sql | 28 + .../old/3.10/V3_10_01_remove-person-PG.sql | 28 + .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 26 + .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 26 + .../3.10/V3_10_03_increase-comment-field-H2.sql | 23 + .../3.10/V3_10_03_increase-comment-field-PG.sql | 23 + .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 22 + .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 22 + .../old/3.10/V3_10_05_normalize-sections-H2.sql | 27 + .../old/3.10/V3_10_05_normalize-sections-PG.sql | 27 + ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 26 + ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 26 + ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 23 + ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 23 + .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 62 + .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 62 + .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 22 + .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 22 + .../old/3.11/V3_11_05_add-person-country-H2.sql | 23 + .../old/3.11/V3_11_05_add-person-country-PG.sql | 23 + .../old/3.11/V3_11_06_add-harbours-H2.sql | 107 + .../old/3.11/V3_11_06_add-harbours-PG.sql | 108 + .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 22 + .../old/3.12/V3_12_01_add-missing-boat-PG.sql | 22 + ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 23 + ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 22 + ...3_14_02_fix-targetsample-discarded-value-H2.sql | 22 + ...3_14_02_fix-targetsample-discarded-value-PG.sql | 22 + .../V3_14_03_remove-orphan-seine-sample-H2.sql | 22 + .../V3_14_03_remove-orphan-seine-sample-PG.sql | 22 + ...4_04_remove-targetlength-discarded-field-H2.sql | 22 + ...4_04_remove-targetlength-discarded-field-PG.sql | 22 + ..._15_01_change-tdr-integer-field-to-float-H2.sql | 29 + ..._15_01_change-tdr-integer-field-to-float-PG.sql | 30 + ..._15_02_remove-set-longline-length-fields-H2.sql | 23 + ..._15_02_remove-set-longline-length-fields-PG.sql | 23 + .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 23 + .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 23 + .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 141 + .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 140 + .../old/3.16/V3_16_02_add-gear-data-H2.sql | 39 + .../old/3.16/V3_16_02_add-gear-data-PG.sql | 39 + .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 24 + .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 24 + .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 944 + .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 945 + .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 226 + .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 226 + .../3.5/V3_5_03_update-common-references-H2.sql | 51 + .../3.5/V3_5_03_update-common-references-PG.sql | 51 + .../old/3.5/V3_5_04_add-longline-references-H2.sql | 214 + .../old/3.5/V3_5_04_add-longline-references-PG.sql | 214 + .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 71 + .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 72 + .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 22 + .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 22 + .../3.7/V3_7_03_add-referential-needComment-H2.sql | 115 + .../3.7/V3_7_03_add-referential-needComment-PG.sql | 115 + .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 27 + .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 26 + .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 23 + .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 23 + .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 23 + .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 24 + .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 25 + .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 27 + .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 27 + .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 28 + .../old/3.7/V3_7_09_add-species-list-H2.sql | 87 + .../old/3.7/V3_7_09_add-species-list-PG.sql | 87 + .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 23 + .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 23 + .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 22 + .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 22 + .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 25 + .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 24 + .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 24 + .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 24 + .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 26 + .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 26 + .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 23 + .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 23 + .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 23 + .../old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql | 23 + .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 65 + .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 28 + .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 27 + ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 22 + ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 22 + .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 22 + .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 22 + .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 39 + .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql | 40 + ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 26 + ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 26 + ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 22 + ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 22 + .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 22 + .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 22 + .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 22 + .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 26 + .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 26 + .../4.0.2/V4_0_2_01_remove-gender-column-PG.sql | 22 + ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 23 + ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 23 + .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 23 + .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 23 + 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 persistence/src/main/xmi/observe.ini | 310 + .../entities/longline/SectionTemplateTest.java | 172 + ...rveMigrationCallBackForVersionResolverTest.java | 74 + persistence/src/test/resources/log4j.properties | 33 + pom.xml | 33 +- .../LICENSE.txt | 0 .../README.md | 0 services-binder/pom.xml | 78 + .../src/license/THIRD-PARTY.properties | 0 .../ird/observe/services/binder/BinderEngine.java | 250 + .../services/binder/BinderEngineInitializer.java | 1187 + .../ird/observe/services/binder/BinderSupport.java | 196 + .../DefaultReferenceBinderEngineSupplier.java | 37 + .../services/binder/data/DataBinderSupport.java | 324 + .../data/longline/ActivityLonglineBinder.java | 96 + .../ActivityLonglineEncouterDtoBinder.java | 60 + .../ActivityLonglineSensorUsedDtoBinder.java | 61 + .../longline/ActivityLonglineStubDtoBinder.java | 60 + .../data/longline/BaitsCompositionBinder.java | 95 + .../binder/data/longline/BasketBinder.java | 83 + .../binder/data/longline/BranchlineBinder.java | 129 + .../longline/BranchlinesCompositionBinder.java | 92 + .../binder/data/longline/CatchLonglineBinder.java | 146 + .../binder/data/longline/EncounterBinder.java | 88 + .../data/longline/FloatlinesCompositionBinder.java | 86 + .../longline/GearUseFeaturesLonglineBinder.java | 67 + .../GearUseFeaturesMeasurementLonglineBinder.java | 62 + .../data/longline/HooksCompositionBinder.java | 91 + .../binder/data/longline/SectionBinder.java | 79 + .../binder/data/longline/SensorUsedBinder.java | 103 + .../binder/data/longline/SetLonglineBinder.java | 158 + .../data/longline/SetLonglineCatchDtoBinder.java | 60 + .../SetLonglineDetailCompositionDtoBinder.java | 75 + .../SetLonglineGlobalCompositionDtoBinder.java | 76 + .../data/longline/SetLonglineStubDtoBinder.java | 57 + .../data/longline/SetLonglineTdrDtoBinder.java | 62 + .../binder/data/longline/SizeMeasureBinder.java | 82 + .../services/binder/data/longline/TdrBinder.java | 144 + .../longline/TripLonglineActivityDtoBinder.java | 58 + .../binder/data/longline/TripLonglineBinder.java | 130 + .../longline/TripLonglineGearUseDtoBinder.java | 60 + .../binder/data/longline/WeightMeasureBinder.java | 81 + .../binder/data/seine/ActivitySeineBinder.java | 129 + .../data/seine/ActivitySeineStubDtoBinder.java | 63 + .../binder/data/seine/FloatingObjectBinder.java | 86 + .../FloatingObjectObservedSpeciesDtoBinder.java | 60 + .../FloatingObjectSchoolEstimateDtoBinder.java | 60 + .../FloatingObjectTransmittingBuoyDtoBinder.java | 60 + .../GearUseFeaturesMeasurementSeineBinder.java | 63 + .../data/seine/GearUseFeaturesSeineBinder.java | 68 + .../binder/data/seine/NonTargetCatchBinder.java | 107 + .../binder/data/seine/NonTargetLengthBinder.java | 101 + .../binder/data/seine/NonTargetSampleBinder.java | 60 + .../data/seine/ObjectObservedSpeciesBinder.java | 79 + .../data/seine/ObjectSchoolEstimateBinder.java | 73 + .../services/binder/data/seine/RouteBinder.java | 83 + .../binder/data/seine/RouteStubDtoBinder.java | 62 + .../binder/data/seine/SchoolEstimateBinder.java | 85 + .../services/binder/data/seine/SetSeineBinder.java | 111 + .../seine/SetSeineNonTargetCatchDtoBinder.java | 59 + .../seine/SetSeineSchoolEstimateDtoBinder.java | 59 + .../data/seine/SetSeineTargetCatchDtoBinder.java | 64 + .../binder/data/seine/TargetCatchBinder.java | 87 + .../binder/data/seine/TargetLengthBinder.java | 103 + .../binder/data/seine/TargetSampleBinder.java | 65 + .../binder/data/seine/TransmittingBuoyBinder.java | 90 + .../binder/data/seine/TripSeineBinder.java | 127 + .../data/seine/TripSeineGearUseDtoBinder.java | 61 + .../referential/ReferentialBinderSupport.java | 171 + .../binder/referential/common/CountryBinder.java | 77 + .../binder/referential/common/FpaZoneBinder.java | 77 + .../binder/referential/common/GearBinder.java | 76 + .../common/GearCaracteristicBinder.java | 83 + .../common/GearCaracteristicTypeBinder.java | 73 + .../binder/referential/common/HarbourBinder.java | 85 + .../common/LengthLengthParameterBinder.java | 93 + .../common/LengthWeightParameterBinder.java | 105 + .../binder/referential/common/OceanBinder.java | 73 + .../binder/referential/common/OrganismBinder.java | 81 + .../binder/referential/common/PersonBinder.java | 95 + .../binder/referential/common/ProgramBinder.java | 116 + .../binder/referential/common/SexBinder.java | 75 + .../binder/referential/common/ShipOwnerBinder.java | 79 + .../referential/common/SizeMeasureTypeBinder.java | 75 + .../binder/referential/common/SpeciesBinder.java | 111 + .../referential/common/SpeciesGroupBinder.java | 75 + .../referential/common/SpeciesListBinder.java | 77 + .../binder/referential/common/VesselBinder.java | 126 + .../common/VesselSizeCategoryBinder.java | 81 + .../referential/common/VesselTypeBinder.java | 75 + .../common/WeightMeasureTypeBinder.java | 75 + .../longline/BaitHaulingStatusBinder.java | 73 + .../longline/BaitSettingStatusBinder.java | 73 + .../referential/longline/BaitTypeBinder.java | 73 + .../longline/CatchFateLonglineBinder.java | 73 + .../referential/longline/EncounterTypeBinder.java | 73 + .../referential/longline/HealthnessBinder.java | 73 + .../referential/longline/HookPositionBinder.java | 73 + .../referential/longline/HookSizeBinder.java | 75 + .../referential/longline/HookTypeBinder.java | 73 + .../longline/ItemHorizontalPositionBinder.java | 75 + .../longline/ItemVerticalPositionBinder.java | 75 + .../longline/LightsticksColorBinder.java | 73 + .../longline/LightsticksTypeBinder.java | 73 + .../referential/longline/LineTypeBinder.java | 73 + .../referential/longline/MaturityStatusBinder.java | 77 + .../referential/longline/MitigationTypeBinder.java | 73 + .../referential/longline/SensorBrandBinder.java | 77 + .../longline/SensorDataFormatBinder.java | 75 + .../referential/longline/SensorTypeBinder.java | 75 + .../referential/longline/SettingShapeBinder.java | 75 + .../referential/longline/StomacFullnessBinder.java | 75 + .../referential/longline/TripTypeBinder.java | 75 + .../longline/VesselActivityLonglineBinder.java | 75 + .../referential/seine/DetectionModeBinder.java | 73 + .../binder/referential/seine/ObjectFateBinder.java | 73 + .../referential/seine/ObjectOperationBinder.java | 73 + .../binder/referential/seine/ObjectTypeBinder.java | 73 + .../referential/seine/ObservedSystemBinder.java | 77 + .../referential/seine/ReasonForDiscardBinder.java | 75 + .../seine/ReasonForNoFishingBinder.java | 75 + .../referential/seine/ReasonForNullSetBinder.java | 75 + .../referential/seine/SpeciesFateBinder.java | 72 + .../referential/seine/SpeciesStatusBinder.java | 75 + .../seine/SurroundingActivityBinder.java | 75 + .../seine/TransmittingBuoyOperationBinder.java | 75 + .../seine/TransmittingBuoyTypeBinder.java | 75 + .../seine/VesselActivitySeineBinder.java | 81 + .../referential/seine/WeightCategoryBinder.java | 83 + .../binder/referential/seine/WindBinder.java | 80 + .../services/binder/BinderEngineMetadataTest.java | 188 + .../services/binder/ReferenceBinderEngineTest.java | 45 + services-configuration-rest/pom.xml | 2 +- .../rest/ObserveDataSourceConfigurationRest.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 +- .../rest/ObserveDataSourceConnectionRest.java | 2 +- services-configuration-topia/pom.xml | 2 +- .../ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../ObserveDataSourceConfigurationTopiaPG.java | 2 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 2 +- .../topia/ObserveDataSourceConnectionTopia.java | 2 +- services-configuration/pom.xml | 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 +- services-dto-gson/LICENSE.txt | 674 - services-dto-gson/README.md | 0 services-dto-gson/pom.xml | 68 - .../src/license/THIRD-PARTY.properties | 24 - .../dto/gson/ArrayListMultimapAdapter.java | 38 - .../ird/observe/services/dto/gson/BlobAdapter.java | 78 - .../observe/services/dto/gson/ClassAdapter.java | 84 - .../ird/observe/services/dto/gson/DateAdapter.java | 116 - .../ird/observe/services/dto/gson/FormAdapter.java | 60 - .../services/dto/gson/ImmutableListAdapter.java | 59 - .../services/dto/gson/ImmutableMapAdapter.java | 54 - .../dto/gson/ImmutableMultimapAdapter.java | 75 - .../services/dto/gson/ImmutableSetAdapter.java | 60 - .../observe/services/dto/gson/IntegerAdapter.java | 58 - .../services/dto/gson/MultimapAdapterSupport.java | 69 - .../dto/gson/ObserveBlobsContainerAdapter.java | 64 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 142 - .../dto/gson/ReferentialMultimapAdapter.java | 82 - .../services/dto/gson/ReportVariableAdapter.java | 82 - .../services/dto/gson/SetMultimapAdapter.java | 39 - .../observe/services/dto/gson/VersionAdapter.java | 54 - .../gson/reference/AbstractReferenceAdapter.java | 128 - .../dto/gson/reference/DataReferenceAdapter.java | 49 - .../gson/reference/DataReferenceListAdapter.java | 64 - .../gson/reference/DataReferenceSetAdapter.java | 64 - .../ReferenceCollectionSupportAdapter.java | 84 - .../reference/ReferentialReferenceAdapter.java | 100 - .../reference/ReferentialReferenceSetAdapter.java | 75 - .../gson/reference/UnknownReferenceAdapter.java | 69 - services-dto-reference/pom.xml | 65 - .../src/license/THIRD-PARTY.properties | 23 - .../dto/reference/DataReferenceSetDefinitions.java | 323 - .../dto/reference/ReferenceBinderEngine.java | 44 - .../reference/ReferenceBinderEngineSupplier.java | 70 - .../dto/reference/ReferenceSetDefinition.java | 117 - .../ReferentialReferenceSetDefinitions.java | 329 - .../request/ReferenceSetRequestDefinition.java | 119 - .../request/ReferenceSetRequestDefinitions.java | 537 - .../request/ReferenceSetRequestKeyDefinition.java | 100 - services-dto/pom.xml | 136 - services-dto/src/license/THIRD-PARTY.properties | 19 - .../observe/services/dto/AbstractObserveDto.java | 56 - .../observe/services/dto/AbstractReference.java | 187 - .../fr/ird/observe/services/dto/DataReference.java | 76 - .../observe/services/dto/DataReferenceList.java | 50 - .../ird/observe/services/dto/DataReferenceSet.java | 50 - .../dto/DataSourceCreateConfigurationDto.java | 149 - ...urceCreateWithNoReferentialImportException.java | 43 - .../java/fr/ird/observe/services/dto/Form.java | 94 - .../java/fr/ird/observe/services/dto/IdDto.java | 65 - .../java/fr/ird/observe/services/dto/IdHelper.java | 167 - ...ibleDataSourceCreateConfigurationException.java | 44 - .../services/dto/ObserveBlobsContainer.java | 59 - .../observe/services/dto/ObserveDbUserHelper.java | 44 - .../fr/ird/observe/services/dto/ObserveDto.java | 29 - .../ird/observe/services/dto/ObserveModelType.java | 34 - .../dto/ObserveSpeciesListConfiguration.java | 171 - .../services/dto/ReferenceCollectionSupport.java | 72 - .../fr/ird/observe/services/dto/ReferenceMap.java | 36 - .../dto/ReferenceValueNotFoundException.java | 50 - .../services/dto/UnauthorizedException.java | 46 - .../services/dto/actions/report/DataMatrix.java | 259 - .../services/dto/actions/report/Report.java | 201 - .../dto/actions/report/ReportOperation.java | 43 - .../services/dto/actions/report/ReportRequest.java | 187 - .../dto/actions/report/ReportVariable.java | 92 - .../observe/services/dto/constants/GearType.java | 49 - .../services/dto/constants/ObserveDbRole.java | 36 - .../services/dto/constants/ReferenceStatus.java | 40 - .../services/dto/constants/ReferentialLocale.java | 131 - .../services/dto/constants/TripMapPointType.java | 51 - .../seine/NonTargetCatchComputedValueSource.java | 52 - .../services/dto/constants/seine/Ownership.java | 51 - .../services/dto/constants/seine/SchoolType.java | 41 - .../seine/TypeTransmittingBuoyOperation.java | 68 - .../services/dto/longline/ActivityLonglineDto.java | 70 - .../dto/longline/ActivityLonglineHelper.java | 48 - .../dto/longline/BasketWithSectionIdDto.java | 30 - .../dto/longline/BranchlineWithBasketIdDto.java | 31 - .../GearUseFeaturesMeasurementLonglineDto.java | 33 - .../dto/longline/LonglineCompositionDto.java | 43 - .../dto/longline/LonglinePositionAwareDto.java | 53 - .../dto/longline/LonglinePositionSetDto.java | 99 - .../services/dto/longline/SectionTemplate.java | 182 - .../services/dto/longline/SectionWithTemplate.java | 171 - .../dto/longline/SectionWithTemplateHelper.java | 60 - .../longline/SetLonglineGlobalCompositionDto.java | 109 - .../services/dto/longline/TripLonglineHelper.java | 50 - .../services/dto/referential/FormulaHelper.java | 156 - .../referential/GearCaracteristicTypeHelper.java | 93 - .../dto/referential/I18nReferentialDto.java | 31 - .../dto/referential/I18nReferentialHelper.java | 63 - .../dto/referential/LengthLengthParameterDto.java | 70 - .../dto/referential/LengthWeightParameterDto.java | 70 - .../services/dto/referential/PersonHelper.java | 72 - .../services/dto/referential/ProgramDto.java | 39 - .../services/dto/referential/ProgramHelper.java | 74 - .../services/dto/referential/ReferentialDto.java | 50 - .../dto/referential/ReferentialHelper.java | 141 - .../dto/referential/ReferentialMultimap.java | 185 - .../dto/referential/ReferentialReference.java | 106 - .../dto/referential/ReferentialReferenceSet.java | 67 - .../dto/referential/ReferentialReferences.java | 68 - .../dto/referential/SizeMeasureTypeHelper.java | 63 - .../services/dto/referential/SpeciesListDto.java | 36 - .../services/dto/referential/VesselHelper.java | 60 - .../longline/VesselActivityLonglineHelper.java | 44 - .../seine/VesselActivitySeineHelper.java | 72 - .../referential/seine/WeightCategoryHelper.java | 69 - .../observe/services/dto/result/SaveResultDto.java | 36 - .../services/dto/result/SaveResultHelper.java | 36 - .../dto/result/TripChildSaveResultHelper.java | 34 - .../services/dto/seine/ActivitySeineDto.java | 64 - .../services/dto/seine/ActivitySeineHelper.java | 32 - .../services/dto/seine/ActivitySeineStubDto.java | 36 - .../dto/seine/DiscardedTargetCatchDto.java | 32 - .../dto/seine/DiscardedTargetSampleDto.java | 32 - .../seine/FloatingObjectTransmittingBuoyDto.java | 82 - .../seine/GearUseFeaturesMeasurementSeineDto.java | 33 - .../services/dto/seine/KeptTargetCatchDto.java | 32 - .../services/dto/seine/KeptTargetSampleDto.java | 32 - .../ird/observe/services/dto/seine/RouteDto.java | 84 - .../observe/services/dto/seine/SetSeineDto.java | 99 - .../services/dto/seine/TargetCatchHelper.java | 56 - .../services/dto/seine/TargetLengthDto.java | 40 - .../services/dto/seine/TargetLengthHelper.java | 35 - .../observe/services/dto/seine/TripSeineDto.java | 52 - .../services/dto/seine/TripSeineHelper.java | 49 - .../main/java/fr/ird/observe/util/GPSPoint.java | 248 - .../main/java/fr/ird/observe/util/ObserveUtil.java | 98 - .../src/main/xmi/observe-services-dto-common.zargo | Bin 49022 -> 0 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 68017 -> 0 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60919 -> 0 bytes services-dto/src/main/xmi/observe-services-dto.ini | 281 - services-rest/pom.xml | 18 +- .../rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 4 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../observe/services/rest/http/ObserveRequest.java | 2 +- .../services/rest/http/ObserveRequestBuilder.java | 5 +- .../services/rest/http/ObserveRequestMethod.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 4 +- .../services/rest/RestTestClassResource.java | 2 +- .../services/rest/RestTestMethodResource.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 8 +- .../services/rest/service/PingServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 8 +- .../rest/service/ReferentialServiceRestTest.java | 6 +- .../ConsolidateDataServiceRestTest.java | 2 +- .../report/AbstractReportServiceRestTest.java | 12 +- .../report/ReportAccessoryCatchRestTest.java | 8 +- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 43 +- services-runner/pom.xml | 12 +- .../ObserveDataSourceConfigurationMainFactory.java | 2 +- .../services/runner/ObserveServiceMainFactory.java | 2 +- services-topia-binder/pom.xml | 83 - .../services/topia/binder/BinderEngine.java | 251 - .../topia/binder/BinderEngineInitializer.java | 1192 - .../services/topia/binder/BinderSupport.java | 245 - .../binder/ReferenceBinderEngineSupplierTopia.java | 40 - .../topia/binder/data/DataBinderSupport.java | 324 - .../data/longline/ActivityLonglineBinder.java | 96 - .../ActivityLonglineEncouterDtoBinder.java | 61 - .../ActivityLonglineSensorUsedDtoBinder.java | 62 - .../longline/ActivityLonglineStubDtoBinder.java | 61 - .../data/longline/BaitsCompositionBinder.java | 97 - .../topia/binder/data/longline/BasketBinder.java | 83 - .../binder/data/longline/BranchlineBinder.java | 129 - .../longline/BranchlinesCompositionBinder.java | 94 - .../binder/data/longline/CatchLonglineBinder.java | 146 - .../binder/data/longline/EncounterBinder.java | 88 - .../data/longline/FloatlinesCompositionBinder.java | 86 - .../longline/GearUseFeaturesLonglineBinder.java | 68 - .../GearUseFeaturesMeasurementLonglineBinder.java | 63 - .../data/longline/HooksCompositionBinder.java | 91 - .../topia/binder/data/longline/SectionBinder.java | 79 - .../binder/data/longline/SensorUsedBinder.java | 103 - .../binder/data/longline/SetLonglineBinder.java | 158 - .../data/longline/SetLonglineCatchDtoBinder.java | 62 - .../SetLonglineDetailCompositionDtoBinder.java | 76 - .../SetLonglineGlobalCompositionDtoBinder.java | 77 - .../data/longline/SetLonglineStubDtoBinder.java | 58 - .../data/longline/SetLonglineTdrDtoBinder.java | 63 - .../binder/data/longline/SizeMeasureBinder.java | 82 - .../topia/binder/data/longline/TdrBinder.java | 144 - .../longline/TripLonglineActivityDtoBinder.java | 59 - .../binder/data/longline/TripLonglineBinder.java | 130 - .../longline/TripLonglineGearUseDtoBinder.java | 61 - .../binder/data/longline/WeightMeasureBinder.java | 81 - .../binder/data/seine/ActivitySeineBinder.java | 129 - .../data/seine/ActivitySeineStubDtoBinder.java | 63 - .../binder/data/seine/FloatingObjectBinder.java | 86 - .../FloatingObjectObservedSpeciesDtoBinder.java | 61 - .../FloatingObjectSchoolEstimateDtoBinder.java | 61 - .../FloatingObjectTransmittingBuoyDtoBinder.java | 61 - .../GearUseFeaturesMeasurementSeineBinder.java | 64 - .../data/seine/GearUseFeaturesSeineBinder.java | 69 - .../binder/data/seine/NonTargetCatchBinder.java | 107 - .../binder/data/seine/NonTargetLengthBinder.java | 101 - .../binder/data/seine/NonTargetSampleBinder.java | 61 - .../data/seine/ObjectObservedSpeciesBinder.java | 79 - .../data/seine/ObjectSchoolEstimateBinder.java | 73 - .../topia/binder/data/seine/RouteBinder.java | 83 - .../binder/data/seine/RouteStubDtoBinder.java | 63 - .../binder/data/seine/SchoolEstimateBinder.java | 85 - .../topia/binder/data/seine/SetSeineBinder.java | 111 - .../seine/SetSeineNonTargetCatchDtoBinder.java | 59 - .../seine/SetSeineSchoolEstimateDtoBinder.java | 61 - .../data/seine/SetSeineTargetCatchDtoBinder.java | 64 - .../topia/binder/data/seine/TargetCatchBinder.java | 89 - .../binder/data/seine/TargetLengthBinder.java | 103 - .../binder/data/seine/TargetSampleBinder.java | 66 - .../binder/data/seine/TransmittingBuoyBinder.java | 90 - .../topia/binder/data/seine/TripSeineBinder.java | 127 - .../data/seine/TripSeineGearUseDtoBinder.java | 61 - .../referential/ReferentialBinderSupport.java | 171 - .../binder/referential/common/CountryBinder.java | 77 - .../binder/referential/common/FpaZoneBinder.java | 77 - .../binder/referential/common/GearBinder.java | 76 - .../common/GearCaracteristicBinder.java | 83 - .../common/GearCaracteristicTypeBinder.java | 73 - .../binder/referential/common/HarbourBinder.java | 85 - .../common/LengthLengthParameterBinder.java | 93 - .../common/LengthWeightParameterBinder.java | 101 - .../binder/referential/common/OceanBinder.java | 73 - .../binder/referential/common/OrganismBinder.java | 81 - .../binder/referential/common/PersonBinder.java | 95 - .../binder/referential/common/ProgramBinder.java | 116 - .../topia/binder/referential/common/SexBinder.java | 75 - .../binder/referential/common/ShipOwnerBinder.java | 79 - .../referential/common/SizeMeasureTypeBinder.java | 75 - .../binder/referential/common/SpeciesBinder.java | 111 - .../referential/common/SpeciesGroupBinder.java | 75 - .../referential/common/SpeciesListBinder.java | 77 - .../binder/referential/common/VesselBinder.java | 126 - .../common/VesselSizeCategoryBinder.java | 81 - .../referential/common/VesselTypeBinder.java | 75 - .../common/WeightMeasureTypeBinder.java | 75 - .../longline/BaitHaulingStatusBinder.java | 73 - .../longline/BaitSettingStatusBinder.java | 73 - .../referential/longline/BaitTypeBinder.java | 73 - .../longline/CatchFateLonglineBinder.java | 73 - .../referential/longline/EncounterTypeBinder.java | 73 - .../referential/longline/HealthnessBinder.java | 73 - .../referential/longline/HookPositionBinder.java | 73 - .../referential/longline/HookSizeBinder.java | 75 - .../referential/longline/HookTypeBinder.java | 73 - .../longline/ItemHorizontalPositionBinder.java | 75 - .../longline/ItemVerticalPositionBinder.java | 75 - .../longline/LightsticksColorBinder.java | 73 - .../longline/LightsticksTypeBinder.java | 73 - .../referential/longline/LineTypeBinder.java | 73 - .../referential/longline/MaturityStatusBinder.java | 77 - .../referential/longline/MitigationTypeBinder.java | 73 - .../referential/longline/SensorBrandBinder.java | 77 - .../longline/SensorDataFormatBinder.java | 75 - .../referential/longline/SensorTypeBinder.java | 75 - .../referential/longline/SettingShapeBinder.java | 75 - .../referential/longline/StomacFullnessBinder.java | 75 - .../referential/longline/TripTypeBinder.java | 75 - .../longline/VesselActivityLonglineBinder.java | 75 - .../referential/seine/DetectionModeBinder.java | 73 - .../binder/referential/seine/ObjectFateBinder.java | 73 - .../referential/seine/ObjectOperationBinder.java | 73 - .../binder/referential/seine/ObjectTypeBinder.java | 73 - .../referential/seine/ObservedSystemBinder.java | 77 - .../referential/seine/ReasonForDiscardBinder.java | 75 - .../seine/ReasonForNoFishingBinder.java | 75 - .../referential/seine/ReasonForNullSetBinder.java | 75 - .../referential/seine/SpeciesFateBinder.java | 72 - .../referential/seine/SpeciesStatusBinder.java | 75 - .../seine/SurroundingActivityBinder.java | 75 - .../seine/TransmittingBuoyOperationBinder.java | 75 - .../seine/TransmittingBuoyTypeBinder.java | 75 - .../seine/VesselActivitySeineBinder.java | 81 - .../referential/seine/WeightCategoryBinder.java | 83 - .../topia/binder/referential/seine/WindBinder.java | 80 - .../topia/binder/BinderEngineMetadataTest.java | 188 - .../topia/binder/ReferenceBinderEngineTest.java | 47 - services-topia-validation/pom.xml | 210 - ...Longline-service-encounter-error-validation.xml | 37 - .../ActivityLongline-service-error-validation.xml | 167 - ...ongline-service-sensorUsed-error-validation.xml | 37 - ...ActivityLongline-service-warning-validation.xml | 46 - .../BaitsComposition-service-error-validation.xml | 110 - .../Basket-service-table-error-validation.xml | 66 - ...line-service-catchLongline-error-validation.xml | 39 - .../Branchline-service-error-validation.xml | 111 - .../Branchline-service-table-error-validation.xml | 66 - .../Branchline-service-warning-validation.xml | 45 - ...chlinesComposition-service-error-validation.xml | 97 - .../CatchLongline-service-error-validation.xml | 173 - .../CatchLongline-service-warning-validation.xml | 61 - .../Encounter-service-error-validation.xml | 56 - .../Encounter-service-warning-validation.xml | 54 - ...atlinesComposition-service-error-validation.xml | 80 - ...seFeaturesLongline-service-error-validation.xml | 56 - .../HooksComposition-service-error-validation.xml | 96 - .../Section-service-table-error-validation.xml | 36 - .../SensorUsed-service-error-validation.xml | 70 - .../SensorUsed-service-warning-validation.xml | 37 - ...e-service-baitsComposition-error-validation.xml | 51 - ...ice-branchlinesComposition-error-validation.xml | 51 - .../SetLongline-service-error-validation.xml | 612 - ...vice-floatlinesComposition-error-validation.xml | 51 - ...-service-globalComposition-error-validation.xml | 37 - ...e-service-hooksComposition-error-validation.xml | 51 - .../SetLongline-service-warning-validation.xml | 36 - .../longline/Tdr-service-error-validation.xml | 123 - .../longline/Tdr-service-warning-validation.xml | 61 - .../TripLongline-service-error-validation.xml | 204 - .../TripLongline-service-warning-validation.xml | 63 - .../Country-service-error-validation.xml | 109 - .../Country-service-warning-validation.xml | 67 - .../FpaZone-service-error-validation.xml | 73 - .../FpaZone-service-warning-validation.xml | 81 - .../referentiel/Gear-service-error-validation.xml | 73 - .../Gear-service-warning-validation.xml | 65 - .../GearCaracteristic-service-error-validation.xml | 88 - ...earCaracteristic-service-warning-validation.xml | 65 - ...rCaracteristicType-service-error-validation.xml | 73 - ...aracteristicType-service-warning-validation.xml | 65 - .../Harbour-service-error-validation.xml | 72 - .../Harbour-service-warning-validation.xml | 65 - ...gthLengthParameter-service-error-validation.xml | 87 - ...hLengthParameter-service-warning-validation.xml | 46 - ...gthWeightParameter-service-error-validation.xml | 132 - ...hWeightParameter-service-warning-validation.xml | 62 - .../referentiel/Ocean-service-error-validation.xml | 74 - .../Ocean-service-warning-validation.xml | 67 - .../Organism-service-error-validation.xml | 88 - .../Organism-service-warning-validation.xml | 74 - .../Person-service-error-validation.xml | 82 - .../Person-service-warning-validation.xml | 46 - .../Program-service-error-validation.xml | 89 - .../Program-service-warning-validation.xml | 91 - .../referentiel/Sex-service-error-validation.xml | 73 - .../referentiel/Sex-service-warning-validation.xml | 65 - .../ShipOwner-service-error-validation.xml | 77 - .../ShipOwner-service-warning-validation.xml | 44 - .../SizeMeasureType-service-error-validation.xml | 75 - .../SizeMeasureType-service-warning-validation.xml | 68 - .../Species-service-error-validation.xml | 148 - .../Species-service-warning-validation.xml | 100 - .../SpeciesGroup-service-error-validation.xml | 74 - .../SpeciesGroup-service-warning-validation.xml | 67 - .../SpeciesList-service-error-validation.xml | 75 - .../SpeciesList-service-warning-validation.xml | 75 - .../Vessel-service-error-validation.xml | 144 - .../Vessel-service-warning-validation.xml | 127 - ...VesselSizeCategory-service-error-validation.xml | 67 - ...sselSizeCategory-service-warning-validation.xml | 46 - .../VesselType-service-error-validation.xml | 74 - .../VesselType-service-warning-validation.xml | 67 - .../WeightMeasureType-service-error-validation.xml | 75 - ...eightMeasureType-service-warning-validation.xml | 68 - .../BaitHaulingStatus-service-error-validation.xml | 75 - ...aitHaulingStatus-service-warning-validation.xml | 68 - .../BaitSettingStatus-service-error-validation.xml | 75 - ...aitSettingStatus-service-warning-validation.xml | 68 - .../longline/BaitType-service-error-validation.xml | 75 - .../BaitType-service-warning-validation.xml | 68 - .../CatchFateLongline-service-error-validation.xml | 75 - ...atchFateLongline-service-warning-validation.xml | 68 - .../EncounterType-service-error-validation.xml | 75 - .../EncounterType-service-warning-validation.xml | 68 - .../Healthness-service-error-validation.xml | 75 - .../Healthness-service-warning-validation.xml | 68 - .../HookPosition-service-error-validation.xml | 75 - .../HookPosition-service-warning-validation.xml | 68 - .../longline/HookSize-service-error-validation.xml | 75 - .../HookSize-service-warning-validation.xml | 68 - .../longline/HookType-service-error-validation.xml | 75 - .../HookType-service-warning-validation.xml | 68 - ...HorizontalPosition-service-error-validation.xml | 75 - ...rizontalPosition-service-warning-validation.xml | 68 - ...emVerticalPosition-service-error-validation.xml | 75 - ...VerticalPosition-service-warning-validation.xml | 68 - .../LightsticksColor-service-error-validation.xml | 75 - ...LightsticksColor-service-warning-validation.xml | 68 - .../LightsticksType-service-error-validation.xml | 75 - .../LightsticksType-service-warning-validation.xml | 68 - .../longline/LineType-service-error-validation.xml | 75 - .../LineType-service-warning-validation.xml | 68 - .../MaturityStatus-service-error-validation.xml | 75 - .../MaturityStatus-service-warning-validation.xml | 68 - .../MitigationType-service-error-validation.xml | 75 - .../MitigationType-service-warning-validation.xml | 68 - .../SensorBrand-service-error-validation.xml | 61 - .../SensorBrand-service-warning-validation.xml | 47 - .../SensorDataFormat-service-error-validation.xml | 75 - ...SensorDataFormat-service-warning-validation.xml | 68 - .../SensorType-service-error-validation.xml | 75 - .../SensorType-service-warning-validation.xml | 68 - .../SettingShape-service-error-validation.xml | 75 - .../SettingShape-service-warning-validation.xml | 68 - .../StomacFullness-service-error-validation.xml | 75 - .../StomacFullness-service-warning-validation.xml | 68 - .../longline/TripType-service-error-validation.xml | 75 - .../TripType-service-warning-validation.xml | 68 - ...elActivityLongline-service-error-validation.xml | 75 - ...ActivityLongline-service-warning-validation.xml | 68 - .../DetectionMode-service-error-validation.xml | 74 - .../DetectionMode-service-warning-validation.xml | 67 - .../seine/ObjectFate-service-error-validation.xml | 74 - .../ObjectFate-service-warning-validation.xml | 67 - .../ObjectOperation-service-error-validation.xml | 74 - .../ObjectOperation-service-warning-validation.xml | 67 - .../seine/ObjectType-service-error-validation.xml | 74 - .../ObjectType-service-warning-validation.xml | 67 - .../ObservedSystem-service-error-validation.xml | 74 - .../ObservedSystem-service-warning-validation.xml | 67 - .../ReasonForDiscard-service-error-validation.xml | 74 - ...ReasonForDiscard-service-warning-validation.xml | 67 - ...ReasonForNoFishing-service-error-validation.xml | 74 - ...asonForNoFishing-service-warning-validation.xml | 67 - .../ReasonForNullSet-service-error-validation.xml | 74 - ...ReasonForNullSet-service-warning-validation.xml | 67 - .../seine/SpeciesFate-service-error-validation.xml | 74 - .../SpeciesFate-service-warning-validation.xml | 67 - .../SpeciesStatus-service-error-validation.xml | 74 - .../SpeciesStatus-service-warning-validation.xml | 67 - ...urroundingActivity-service-error-validation.xml | 74 - ...roundingActivity-service-warning-validation.xml | 67 - ...ttingBuoyOperation-service-error-validation.xml | 74 - ...ingBuoyOperation-service-warning-validation.xml | 67 - ...ansmittingBuoyType-service-error-validation.xml | 74 - ...smittingBuoyType-service-warning-validation.xml | 67 - ...esselActivitySeine-service-error-validation.xml | 74 - ...selActivitySeine-service-warning-validation.xml | 67 - .../WeightCategory-service-error-validation.xml | 75 - .../WeightCategory-service-warning-validation.xml | 67 - .../seine/Wind-service-error-validation.xml | 89 - .../seine/Wind-service-warning-validation.xml | 67 - .../ActivitySeine-service-error-validation.xml | 281 - ...ine-service-observedSystem-error-validation.xml | 63 - ...e-service-observedSystem-warning-validation.xml | 50 - .../ActivitySeine-service-warning-validation.xml | 104 - .../FloatingObject-service-error-validation.xml | 98 - ...rvice-objectSchoolEstimate-error-validation.xml | 50 - ...-transmittingBuoyOperation-error-validation.xml | 54 - .../FloatingObject-service-warning-validation.xml | 55 - ...arUseFeaturesSeine-service-error-validation.xml | 53 - .../NonTargetCatch-service-error-validation.xml | 150 - .../NonTargetCatch-service-warning-validation.xml | 91 - .../NonTargetLength-service-error-validation.xml | 129 - .../NonTargetLength-service-warning-validation.xml | 62 - .../NonTargetSample-service-error-validation.xml | 49 - ...ectObservedSpecies-service-error-validation.xml | 77 - ...jectSchoolEstimate-service-error-validation.xml | 55 - ...ctSchoolEstimate-service-warning-validation.xml | 40 - .../seine/Route-service-error-validation.xml | 111 - .../seine/Route-service-warning-validation.xml | 111 - .../SchoolEstimate-service-error-validation.xml | 76 - .../seine/SetSeine-service-error-validation.xml | 209 - ...ine-service-nonTargetCatch-error-validation.xml | 42 - ...ine-service-schoolEstimate-error-validation.xml | 65 - ...tSeine-service-targetCatch-error-validation.xml | 41 - ...ne-service-targetDiscarded-error-validation.xml | 41 - .../seine/SetSeine-service-warning-validation.xml | 51 - ...tCatch-service-targetCatch-error-validation.xml | 91 - ...atch-service-targetCatch-warning-validation.xml | 40 - ...ch-service-targetDiscarded-error-validation.xml | 107 - ...-service-targetDiscarded-warning-validation.xml | 40 - .../TargetLength-service-error-validation.xml | 134 - .../TargetLength-service-warning-validation.xml | 56 - .../TargetSample-service-error-validation.xml | 49 - .../TransmittingBuoy-service-error-validation.xml | 75 - ...TransmittingBuoy-service-warning-validation.xml | 38 - .../seine/TripSeine-service-error-validation.xml | 206 - ...-service-gearUseFeatures-warning-validation.xml | 39 - .../seine/TripSeine-service-warning-validation.xml | 89 - .../src/main/resources/xwork.xml | 28 - .../validation/BeanValidatorDetectorTest.java | 292 - .../ActivitySeineSpeedValidatorTest.java | 121 - .../seine/Route-testSpeed-error-validation.xml | 39 - .../src/test/resources/log4j.properties | 33 - .../src/test/resources/validators.xml | 66 - services-topia-validators/pom.xml | 85 - .../validators/AbstractSpeciesFieldValidator.java | 294 - .../ActivityFinDeVeilleExistsValidator.java | 185 - .../validators/ActivitySimpleSpeedValidator.java | 182 - .../topia/validators/ActivitySpeedValidator.java | 220 - .../validators/CollectionUniqueKeyValidator2.java | 50 - .../ObserveCollectionUniqueKeyValidator.java | 275 - .../topia/validators/QuadrantFieldValidator.java | 75 - .../SetLonglineUniqueHomeIdValidator.java | 98 - .../SetLonglineUniqueNumberValidator.java | 98 - .../validators/SpeciesLengthFieldValidator.java | 49 - .../validators/SpeciesWeightFieldValidator.java | 49 - services-topia/pom.xml | 29 +- .../services/topia/ObserveSecurityHelper.java | 2 +- .../services/topia/ObserveServiceContextTopia.java | 6 +- .../services/topia/ObserveServiceFactoryTopia.java | 8 +- .../services/topia/ObserveServiceTopia.java | 28 +- .../ObserveTopiaApplicationContextFactory.java | 8 +- .../topia/service/DataSourceServiceTopia.java | 20 +- .../topia/service/LastUpdateDateServiceTopia.java | 4 +- .../ConsolidateActivitySeineDataResultBuilder.java | 15 +- .../consolidate/ConsolidateDataServiceTopia.java | 42 +- .../service/actions/report/ReportServiceTopia.java | 29 +- .../ReferentialSynchronizeDiffServiceTopia.java | 24 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 27 +- .../ng/ReferentialSynchronizeServiceTopia.java | 8 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 83 +- .../referential/sql/ApplySqlRequestWork.java | 2 +- .../sql/DeleteSqlStatementGenerator.java | 2 +- .../sql/DesactivateSqlStatementGenerator.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 46 +- .../InsertSqlWithCascadeStatementGenerator.java | 24 +- .../sql/ReplaceSqlStatementGenerator.java | 13 +- .../sql/UpdateSqlStatementGenerator.java | 15 +- .../UpdateSqlWithCascadeStatementGenerator.java | 27 +- .../validate/ServiceValidationException.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 8 +- .../actions/validate/ValidationDataContext.java | 2 +- .../validate/ValidationMessageDetector.java | 10 +- .../service/actions/validate/ValidatorsMap.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 4 +- .../topia/service/data/NavigationServiceTopia.java | 8 +- .../service/data/TripManagementServiceTopia.java | 4 +- .../topia/service/data/TripMapDtoFactory.java | 21 +- .../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 | 33 +- .../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 | 14 +- .../data/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/data/seine/SetSeineServiceTopia.java | 20 +- .../data/seine/TargetCatchServiceTopia.java | 8 +- .../data/seine/TargetSampleServiceTopia.java | 10 +- .../TransmittingBuoyOperationServiceTopia.java | 6 +- .../data/seine/TripSeineGearUseServiceTopia.java | 6 +- .../service/data/seine/TripSeineServiceTopia.java | 35 +- .../referential/ReferentialServiceTopia.java | 36 +- .../referential/ReferentialsShellBuilder.java | 6 +- .../service/sql/SqlScriptProducerServiceTopia.java | 14 +- .../services/topia/DataSourcesForTestManager.java | 4 +- .../services/topia/TopiaTestClassResource.java | 8 +- .../services/topia/TopiaTestMethodResource.java | 6 +- .../services/topia/binder/BinderEngineTest.java | 5 +- .../topia/entity/LengthWeightParemetersTest.java | 10 +- .../topia/entity/ReplicateReferentialsTest.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 10 +- .../topia/entity/ReplicateTripLonglineTest.java | 6 +- .../topia/entity/ReplicateTripSeineTest.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 10 +- .../topia/service/DataSourceServiceTopiaTest.java | 10 +- .../topia/service/ReferentialServiceTopiaTest.java | 8 +- .../observe/services/topia/service/RigthTest.java | 6 +- .../ConsolidateDataServiceTopiaTest.java | 4 +- .../report/AbstractReportServiceTopiaTest.java | 12 +- .../actions/report/ReportAccessoryCatch2Test.java | 4 +- .../report/ReportAccessoryCatchByGroup2Test.java | 4 +- .../report/ReportAccessoryCatchByGroupTest.java | 8 +- .../actions/report/ReportAccessoryCatchTest.java | 8 +- .../report/ReportActivityWithCommentTest.java | 8 +- .../actions/report/ReportAllActivitysTest.java | 8 +- .../actions/report/ReportDailySetAndCatchTest.java | 8 +- .../service/actions/report/ReportDcpUsageTest.java | 8 +- .../actions/report/ReportSeineEquipmentsTest.java | 8 +- .../actions/report/ReportSetByAssociationTest.java | 8 +- .../report/ReportTargetCatchByAssociationTest.java | 8 +- .../ReportTargetDiscardedByAssociationTest.java | 8 +- .../UnidirectionalSynchronizeReferentialTest.java | 8 +- .../data/TripManagementServiceTopiaTest.java | 10 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 4 +- .../service/data/seine/RouteServiceTopiaTest.java | 2 +- .../data/seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 2 +- .../data/seine/TripSeineServiceTopiaTest.java | 45 +- .../topia/service/sql/MigrateTestsDatabases.java | 12 +- .../sql/SqlScriptProducerServiceTopiaTest.java | 2 +- services-topia/src/test/resources/log4j.properties | 2 +- services-topia/src/test/resources/validators.xml | 20 +- {services-dto => services-validation}/LICENSE.txt | 0 {services-dto => services-validation}/README.md | 0 services-validation/pom.xml | 210 + .../src/license/THIRD-PARTY.properties | 0 ...Longline-service-encounter-error-validation.xml | 37 + .../ActivityLongline-service-error-validation.xml | 167 + ...ongline-service-sensorUsed-error-validation.xml | 37 + ...ActivityLongline-service-warning-validation.xml | 46 + .../BaitsComposition-service-error-validation.xml | 110 + .../Basket-service-table-error-validation.xml | 66 + ...line-service-catchLongline-error-validation.xml | 39 + .../Branchline-service-error-validation.xml | 111 + .../Branchline-service-table-error-validation.xml | 66 + .../Branchline-service-warning-validation.xml | 45 + ...chlinesComposition-service-error-validation.xml | 97 + .../CatchLongline-service-error-validation.xml | 173 + .../CatchLongline-service-warning-validation.xml | 61 + .../Encounter-service-error-validation.xml | 56 + .../Encounter-service-warning-validation.xml | 54 + ...atlinesComposition-service-error-validation.xml | 80 + ...seFeaturesLongline-service-error-validation.xml | 56 + .../HooksComposition-service-error-validation.xml | 96 + .../Section-service-table-error-validation.xml | 36 + .../SensorUsed-service-error-validation.xml | 70 + .../SensorUsed-service-warning-validation.xml | 37 + ...e-service-baitsComposition-error-validation.xml | 51 + ...ice-branchlinesComposition-error-validation.xml | 51 + .../SetLongline-service-error-validation.xml | 612 + ...vice-floatlinesComposition-error-validation.xml | 51 + ...-service-globalComposition-error-validation.xml | 37 + ...e-service-hooksComposition-error-validation.xml | 51 + .../SetLongline-service-warning-validation.xml | 36 + .../longline/Tdr-service-error-validation.xml | 123 + .../longline/Tdr-service-warning-validation.xml | 61 + .../TripLongline-service-error-validation.xml | 204 + .../TripLongline-service-warning-validation.xml | 63 + .../Country-service-error-validation.xml | 109 + .../Country-service-warning-validation.xml | 67 + .../FpaZone-service-error-validation.xml | 73 + .../FpaZone-service-warning-validation.xml | 81 + .../referentiel/Gear-service-error-validation.xml | 73 + .../Gear-service-warning-validation.xml | 65 + .../GearCaracteristic-service-error-validation.xml | 88 + ...earCaracteristic-service-warning-validation.xml | 65 + ...rCaracteristicType-service-error-validation.xml | 73 + ...aracteristicType-service-warning-validation.xml | 65 + .../Harbour-service-error-validation.xml | 72 + .../Harbour-service-warning-validation.xml | 65 + ...gthLengthParameter-service-error-validation.xml | 87 + ...hLengthParameter-service-warning-validation.xml | 46 + ...gthWeightParameter-service-error-validation.xml | 132 + ...hWeightParameter-service-warning-validation.xml | 62 + .../referentiel/Ocean-service-error-validation.xml | 74 + .../Ocean-service-warning-validation.xml | 67 + .../Organism-service-error-validation.xml | 88 + .../Organism-service-warning-validation.xml | 74 + .../Person-service-error-validation.xml | 82 + .../Person-service-warning-validation.xml | 46 + .../Program-service-error-validation.xml | 89 + .../Program-service-warning-validation.xml | 91 + .../referentiel/Sex-service-error-validation.xml | 73 + .../referentiel/Sex-service-warning-validation.xml | 65 + .../ShipOwner-service-error-validation.xml | 77 + .../ShipOwner-service-warning-validation.xml | 44 + .../SizeMeasureType-service-error-validation.xml | 75 + .../SizeMeasureType-service-warning-validation.xml | 68 + .../Species-service-error-validation.xml | 148 + .../Species-service-warning-validation.xml | 100 + .../SpeciesGroup-service-error-validation.xml | 74 + .../SpeciesGroup-service-warning-validation.xml | 67 + .../SpeciesList-service-error-validation.xml | 75 + .../SpeciesList-service-warning-validation.xml | 75 + .../Vessel-service-error-validation.xml | 144 + .../Vessel-service-warning-validation.xml | 127 + ...VesselSizeCategory-service-error-validation.xml | 67 + ...sselSizeCategory-service-warning-validation.xml | 46 + .../VesselType-service-error-validation.xml | 74 + .../VesselType-service-warning-validation.xml | 67 + .../WeightMeasureType-service-error-validation.xml | 75 + ...eightMeasureType-service-warning-validation.xml | 68 + .../BaitHaulingStatus-service-error-validation.xml | 75 + ...aitHaulingStatus-service-warning-validation.xml | 68 + .../BaitSettingStatus-service-error-validation.xml | 75 + ...aitSettingStatus-service-warning-validation.xml | 68 + .../longline/BaitType-service-error-validation.xml | 75 + .../BaitType-service-warning-validation.xml | 68 + .../CatchFateLongline-service-error-validation.xml | 75 + ...atchFateLongline-service-warning-validation.xml | 68 + .../EncounterType-service-error-validation.xml | 75 + .../EncounterType-service-warning-validation.xml | 68 + .../Healthness-service-error-validation.xml | 75 + .../Healthness-service-warning-validation.xml | 68 + .../HookPosition-service-error-validation.xml | 75 + .../HookPosition-service-warning-validation.xml | 68 + .../longline/HookSize-service-error-validation.xml | 75 + .../HookSize-service-warning-validation.xml | 68 + .../longline/HookType-service-error-validation.xml | 75 + .../HookType-service-warning-validation.xml | 68 + ...HorizontalPosition-service-error-validation.xml | 75 + ...rizontalPosition-service-warning-validation.xml | 68 + ...emVerticalPosition-service-error-validation.xml | 75 + ...VerticalPosition-service-warning-validation.xml | 68 + .../LightsticksColor-service-error-validation.xml | 75 + ...LightsticksColor-service-warning-validation.xml | 68 + .../LightsticksType-service-error-validation.xml | 75 + .../LightsticksType-service-warning-validation.xml | 68 + .../longline/LineType-service-error-validation.xml | 75 + .../LineType-service-warning-validation.xml | 68 + .../MaturityStatus-service-error-validation.xml | 75 + .../MaturityStatus-service-warning-validation.xml | 68 + .../MitigationType-service-error-validation.xml | 75 + .../MitigationType-service-warning-validation.xml | 68 + .../SensorBrand-service-error-validation.xml | 61 + .../SensorBrand-service-warning-validation.xml | 47 + .../SensorDataFormat-service-error-validation.xml | 75 + ...SensorDataFormat-service-warning-validation.xml | 68 + .../SensorType-service-error-validation.xml | 75 + .../SensorType-service-warning-validation.xml | 68 + .../SettingShape-service-error-validation.xml | 75 + .../SettingShape-service-warning-validation.xml | 68 + .../StomacFullness-service-error-validation.xml | 75 + .../StomacFullness-service-warning-validation.xml | 68 + .../longline/TripType-service-error-validation.xml | 75 + .../TripType-service-warning-validation.xml | 68 + ...elActivityLongline-service-error-validation.xml | 75 + ...ActivityLongline-service-warning-validation.xml | 68 + .../DetectionMode-service-error-validation.xml | 74 + .../DetectionMode-service-warning-validation.xml | 67 + .../seine/ObjectFate-service-error-validation.xml | 74 + .../ObjectFate-service-warning-validation.xml | 67 + .../ObjectOperation-service-error-validation.xml | 74 + .../ObjectOperation-service-warning-validation.xml | 67 + .../seine/ObjectType-service-error-validation.xml | 74 + .../ObjectType-service-warning-validation.xml | 67 + .../ObservedSystem-service-error-validation.xml | 74 + .../ObservedSystem-service-warning-validation.xml | 67 + .../ReasonForDiscard-service-error-validation.xml | 74 + ...ReasonForDiscard-service-warning-validation.xml | 67 + ...ReasonForNoFishing-service-error-validation.xml | 74 + ...asonForNoFishing-service-warning-validation.xml | 67 + .../ReasonForNullSet-service-error-validation.xml | 74 + ...ReasonForNullSet-service-warning-validation.xml | 67 + .../seine/SpeciesFate-service-error-validation.xml | 74 + .../SpeciesFate-service-warning-validation.xml | 67 + .../SpeciesStatus-service-error-validation.xml | 74 + .../SpeciesStatus-service-warning-validation.xml | 67 + ...urroundingActivity-service-error-validation.xml | 74 + ...roundingActivity-service-warning-validation.xml | 67 + ...ttingBuoyOperation-service-error-validation.xml | 74 + ...ingBuoyOperation-service-warning-validation.xml | 67 + ...ansmittingBuoyType-service-error-validation.xml | 74 + ...smittingBuoyType-service-warning-validation.xml | 67 + ...esselActivitySeine-service-error-validation.xml | 74 + ...selActivitySeine-service-warning-validation.xml | 67 + .../WeightCategory-service-error-validation.xml | 75 + .../WeightCategory-service-warning-validation.xml | 67 + .../seine/Wind-service-error-validation.xml | 89 + .../seine/Wind-service-warning-validation.xml | 67 + .../ActivitySeine-service-error-validation.xml | 281 + ...ine-service-observedSystem-error-validation.xml | 63 + ...e-service-observedSystem-warning-validation.xml | 50 + .../ActivitySeine-service-warning-validation.xml | 104 + .../FloatingObject-service-error-validation.xml | 98 + ...rvice-objectSchoolEstimate-error-validation.xml | 50 + ...-transmittingBuoyOperation-error-validation.xml | 54 + .../FloatingObject-service-warning-validation.xml | 55 + ...arUseFeaturesSeine-service-error-validation.xml | 53 + .../NonTargetCatch-service-error-validation.xml | 150 + .../NonTargetCatch-service-warning-validation.xml | 91 + .../NonTargetLength-service-error-validation.xml | 129 + .../NonTargetLength-service-warning-validation.xml | 62 + .../NonTargetSample-service-error-validation.xml | 49 + ...ectObservedSpecies-service-error-validation.xml | 77 + ...jectSchoolEstimate-service-error-validation.xml | 55 + ...ctSchoolEstimate-service-warning-validation.xml | 40 + .../seine/Route-service-error-validation.xml | 111 + .../seine/Route-service-warning-validation.xml | 111 + .../SchoolEstimate-service-error-validation.xml | 76 + .../seine/SetSeine-service-error-validation.xml | 209 + ...ine-service-nonTargetCatch-error-validation.xml | 42 + ...ine-service-schoolEstimate-error-validation.xml | 65 + ...tSeine-service-targetCatch-error-validation.xml | 41 + ...ne-service-targetDiscarded-error-validation.xml | 41 + .../seine/SetSeine-service-warning-validation.xml | 51 + ...tCatch-service-targetCatch-error-validation.xml | 91 + ...atch-service-targetCatch-warning-validation.xml | 40 + ...ch-service-targetDiscarded-error-validation.xml | 107 + ...-service-targetDiscarded-warning-validation.xml | 40 + .../TargetLength-service-error-validation.xml | 134 + .../TargetLength-service-warning-validation.xml | 56 + .../TargetSample-service-error-validation.xml | 49 + .../TransmittingBuoy-service-error-validation.xml | 75 + ...TransmittingBuoy-service-warning-validation.xml | 38 + .../seine/TripSeine-service-error-validation.xml | 206 + ...-service-gearUseFeatures-warning-validation.xml | 39 + .../seine/TripSeine-service-warning-validation.xml | 89 + .../i18n/services-validation_en_GB.properties | 0 .../i18n/services-validation_es_ES.properties | 0 .../i18n/services-validation_fr_FR.properties | 0 services-validation/src/main/resources/xwork.xml | 28 + .../validation/BeanValidatorDetectorTest.java | 292 + .../ActivitySeineSpeedValidatorTest.java | 121 + .../seine/Route-testSpeed-error-validation.xml | 39 + .../src/test/resources/log4j.properties | 33 + .../src/test/resources/validators.xml | 66 + .../LICENSE.txt | 0 .../README.md | 0 services-validators/pom.xml | 85 + .../src/license/THIRD-PARTY.properties | 0 .../validators/AbstractSpeciesFieldValidator.java | 294 + .../ActivityFinDeVeilleExistsValidator.java | 185 + .../validators/ActivitySimpleSpeedValidator.java | 182 + .../validators/ActivitySpeedValidator.java | 220 + .../validators/CollectionUniqueKeyValidator2.java | 50 + .../ObserveCollectionUniqueKeyValidator.java | 275 + .../validators/QuadrantFieldValidator.java | 75 + .../SetLonglineUniqueHomeIdValidator.java | 98 + .../SetLonglineUniqueNumberValidator.java | 98 + .../validators/SpeciesLengthFieldValidator.java | 49 + .../validators/SpeciesWeightFieldValidator.java | 49 + services/pom.xml | 61 +- .../src/main/filters/observe-reports.properties | 2 +- .../observe/services/ObserveDataReferenceSets.java | 324 + .../ird/observe/services/ObserveFormRequests.java | 538 + .../services/ObserveReferentialReferenceSets.java | 330 + .../fr/ird/observe/services/ObserveService.java | 4 +- .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveServiceFactorySupport.java | 4 +- .../services/ObserveServiceInitializer.java | 4 +- .../observe/services/ObserveServicesProvider.java | 12 +- .../services/binder/ReferenceBinderEngine.java | 44 + .../binder/ReferenceBinderEngineSupplier.java | 70 + .../observe/services/dto/AbstractObserveDto.java | 56 + .../java/fr/ird/observe/services/dto/IdDto.java | 65 + .../java/fr/ird/observe/services/dto/IdHelper.java | 166 + .../services/dto/ObserveBlobsContainer.java | 59 + .../observe/services/dto/ObserveDbUserHelper.java | 44 + .../fr/ird/observe/services/dto/ObserveDto.java | 29 + .../dto/ObserveSpeciesListConfiguration.java | 171 + .../fr/ird/observe/services/dto/WithComment.java | 49 + .../services/dto/constants/ObserveDbRole.java | 36 + .../services/dto/constants/ObserveModelType.java | 34 + .../services/dto/constants/ReferentialLocale.java | 131 + .../fr/ird/observe/services/dto/form/Form.java | 96 + .../services/dto/form/FormRequestDefinition.java | 119 + .../dto/form/FormRequestKeyDefinition.java | 100 + .../services/dto/longline/ActivityLonglineDto.java | 70 + .../dto/longline/ActivityLonglineHelper.java | 48 + .../dto/longline/BasketWithSectionIdDto.java | 30 + .../dto/longline/BranchlineWithBasketIdDto.java | 31 + .../GearUseFeaturesMeasurementLonglineDto.java | 33 + .../dto/longline/LonglineCompositionDto.java | 43 + .../dto/longline/LonglinePositionAwareDto.java | 53 + .../dto/longline/LonglinePositionSetDto.java | 99 + .../services/dto/longline/SectionTemplate.java | 182 + .../services/dto/longline/SectionWithTemplate.java | 171 + .../dto/longline/SectionWithTemplateHelper.java | 60 + .../longline/SetLonglineGlobalCompositionDto.java | 109 + .../services/dto/longline/TripLonglineHelper.java | 50 + .../dto/presets/RemoteDataSourceConfiguration.java | 99 + .../dto/presets/ServerDataSourceConfiguration.java | 99 + .../services/dto/reference/AbstractReference.java | 189 + .../services/dto/reference/DataReference.java | 79 + .../services/dto/reference/DataReferenceList.java | 51 + .../services/dto/reference/DataReferenceSet.java | 51 + .../dto/reference/ReferenceCollectionSupport.java | 74 + .../services/dto/reference/ReferenceMap.java | 38 + .../dto/reference/ReferenceSetDefinition.java | 117 + .../reference/ReferenceValueNotFoundException.java | 52 + .../dto/reference/ReferentialReference.java | 94 + .../dto/reference/ReferentialReferenceSet.java | 67 + .../dto/reference/ReferentialReferences.java | 60 + .../referential/GearCaracteristicTypeHelper.java | 93 + .../dto/referential/I18nReferentialDto.java | 31 + .../dto/referential/I18nReferentialHelper.java | 63 + .../dto/referential/LengthLengthParameterDto.java | 90 + .../dto/referential/LengthWeightParameterDto.java | 90 + .../services/dto/referential/PersonHelper.java | 74 + .../services/dto/referential/ProgramDto.java | 40 + .../services/dto/referential/ProgramHelper.java | 75 + .../services/dto/referential/ReferentialDto.java | 50 + .../dto/referential/ReferentialHelper.java | 141 + .../dto/referential/ReferentialMultimap.java | 185 + .../dto/referential/SizeMeasureTypeHelper.java | 64 + .../services/dto/referential/SpeciesListDto.java | 38 + .../services/dto/referential/VesselHelper.java | 62 + .../longline/VesselActivityLonglineHelper.java | 44 + .../seine/VesselActivitySeineHelper.java | 72 + .../referential/seine/WeightCategoryHelper.java | 69 + .../observe/services/dto/result/SaveResultDto.java | 36 + .../services/dto/result/SaveResultHelper.java | 36 + .../dto/result/TripChildSaveResultHelper.java | 34 + .../services/dto/seine/ActivitySeineDto.java | 64 + .../services/dto/seine/ActivitySeineHelper.java | 32 + .../services/dto/seine/ActivitySeineStubDto.java | 36 + .../dto/seine/DiscardedTargetCatchDto.java | 32 + .../dto/seine/DiscardedTargetSampleDto.java | 32 + .../seine/FloatingObjectTransmittingBuoyDto.java | 82 + .../seine/GearUseFeaturesMeasurementSeineDto.java | 33 + .../services/dto/seine/KeptTargetCatchDto.java | 32 + .../services/dto/seine/KeptTargetSampleDto.java | 32 + .../ird/observe/services/dto/seine/RouteDto.java | 82 + .../observe/services/dto/seine/SetSeineDto.java | 99 + .../services/dto/seine/TargetCatchHelper.java | 56 + .../services/dto/seine/TargetLengthDto.java | 40 + .../services/dto/seine/TargetLengthHelper.java | 35 + .../observe/services/dto/seine/TripSeineDto.java | 52 + .../services/dto/seine/TripSeineHelper.java | 49 + .../source/DataSourceCreateConfigurationDto.java | 150 + ...urceCreateWithNoReferentialImportException.java | 43 + ...ibleDataSourceCreateConfigurationException.java | 44 + .../services/gson/ArrayListMultimapAdapter.java | 38 + .../fr/ird/observe/services/gson/BlobAdapter.java | 78 + .../fr/ird/observe/services/gson/ClassAdapter.java | 80 + .../fr/ird/observe/services/gson/DateAdapter.java | 116 + .../fr/ird/observe/services/gson/FormAdapter.java | 60 + .../services/gson/ImmutableListAdapter.java | 60 + .../observe/services/gson/ImmutableMapAdapter.java | 54 + .../services/gson/ImmutableMultimapAdapter.java | 75 + .../observe/services/gson/ImmutableSetAdapter.java | 60 + .../ird/observe/services/gson/IntegerAdapter.java | 58 + .../services/gson/MultimapAdapterSupport.java | 69 + .../gson/ObserveBlobsContainerAdapter.java | 64 + .../services/gson/ObserveDtoGsonSupplier.java | 154 + .../services/gson/ReferentialMultimapAdapter.java | 84 + .../services/gson/ReportVariableAdapter.java | 82 + .../observe/services/gson/SetMultimapAdapter.java | 39 + .../ird/observe/services/gson/VersionAdapter.java | 54 + .../gson/reference/AbstractReferenceAdapter.java | 128 + .../gson/reference/DataReferenceAdapter.java | 49 + .../gson/reference/DataReferenceListAdapter.java | 64 + .../gson/reference/DataReferenceSetAdapter.java | 64 + .../ReferenceCollectionSupportAdapter.java | 84 + .../reference/ReferentialReferenceAdapter.java | 100 + .../reference/ReferentialReferenceSetAdapter.java | 75 + .../gson/reference/UnknownReferenceAdapter.java | 69 + .../observe/services/http/ObserveHttpError.java | 2 +- .../security/AdminApiKeyNotFoundException.java | 6 +- .../AuthenticationTokenNotFoundException.java | 6 +- .../BadObserveWebUserPasswordException.java | 4 +- .../security/InvalidAdminKeyApiException.java | 4 +- .../InvalidAuthenticationTokenException.java | 4 +- .../ObserveWebSecurityExceptionSupport.java | 4 +- .../SecurityRequestContextNotFoundException.java | 6 +- .../services/security/UnauthorizedException.java | 46 + .../security/UnknownObserveWebUserException.java | 4 +- .../UnknownObserveWebUserForDatabaseException.java | 4 +- .../security/UserLoginNotFoundException.java | 6 +- .../security/UserPasswordNotFoundException.java | 6 +- .../services/service/BabModelVersionException.java | 2 +- .../service/ConcurrentModificationException.java | 2 +- .../service/DataFileNotFoundException.java | 4 +- .../services/service/DataNotFoundException.java | 4 +- .../services/service/DataSourceService.java | 10 +- .../DatabaseConnexionNotAuthorizedException.java | 5 +- .../DatabaseDestroyNotAuthorizedException.java | 5 +- .../service/DatabaseNotFoundException.java | 6 +- .../services/service/LastUpdateDateService.java | 2 +- .../ird/observe/services/service/PingService.java | 4 +- .../ConsolidateActivitySeineDataResult.java | 8 +- .../consolidate/ConsolidateDataService.java | 4 +- .../ConsolidateTripSeineDataRequest.java | 4 +- .../ConsolidateTripSeineDataResult.java | 6 +- .../service/actions/report/DataMatrix.java | 259 + .../services/service/actions/report/Report.java | 200 + .../service/actions/report/ReportBuilder.java | 15 +- .../service/actions/report/ReportOperation.java | 43 + .../service/actions/report/ReportRequest.java | 187 + .../service/actions/report/ReportService.java | 4 +- .../service/actions/report/ReportVariable.java | 92 + .../diff/ReferentialDataSourceState.java | 4 +- .../diff/ReferentialDataSourceStates.java | 4 +- .../diff/ReferentialSynchronizeDiff.java | 4 +- .../diff/ReferentialSynchronizeDiffService.java | 6 +- .../diff/ReferentialSynchronizeDiffState.java | 4 +- .../diff/ReferentialSynchronizeDiffStateType.java | 4 +- .../diff/ReferentialSynchronizeDiffs.java | 4 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 6 +- ...ionalReferentialSynchronizeCallbackRequest.java | 10 +- ...onalReferentialSynchronizeCallbackRequests.java | 6 +- ...tionalReferentialSynchronizeCallbackResult.java | 5 +- ...ionalReferentialSynchronizeCallbackResults.java | 4 +- ...nidirectionalReferentialSynchronizeContext.java | 4 +- ...UnidirectionalReferentialSynchronizeEngine.java | 10 +- ...ectionalReferentialSynchronizeLocalService.java | 6 +- ...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 | 4 +- .../validate/ValidateResultForDtoHelper.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 6 +- .../service/actions/validate/ValidateService.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 6 +- .../actions/validate/ValidationMessage.java | 10 +- .../service/actions/validate/ValidatorDto.java | 2 +- .../service/actions/validate/ValidatorHelper.java | 2 +- .../validate/ValidatorInitializationException.java | 6 +- .../services/service/data/DeleteTripRequest.java | 4 +- .../services/service/data/DeleteTripResult.java | 4 +- .../services/service/data/ExportTripRequest.java | 4 +- .../services/service/data/ExportTripResult.java | 6 +- .../services/service/data/ImportTripRequest.java | 6 +- .../services/service/data/ImportTripResult.java | 4 +- .../services/service/data/NavigationRequest.java | 2 +- .../services/service/data/NavigationResult.java | 6 +- .../services/service/data/NavigationService.java | 2 +- .../service/data/TripManagementService.java | 4 +- .../longline/ActivityLongLineEncounterService.java | 4 +- .../ActivityLongLineSensorUsedService.java | 4 +- .../data/longline/ActivityLonglineService.java | 8 +- .../service/data/longline/BranchlineService.java | 4 +- .../data/longline/SetLonglineCatchService.java | 4 +- .../SetLonglineDetailCompositionService.java | 4 +- .../SetLonglineGlobalCompositionService.java | 4 +- .../service/data/longline/SetLonglineService.java | 6 +- .../services/service/data/longline/TdrService.java | 4 +- .../data/longline/TripLonglineGearUseService.java | 4 +- .../service/data/longline/TripLonglineService.java | 14 +- .../service/data/seine/ActivitySeineService.java | 8 +- .../service/data/seine/FloatingObjectService.java | 8 +- .../service/data/seine/NonTargetCatchService.java | 4 +- .../service/data/seine/NonTargetSampleService.java | 6 +- .../data/seine/ObjectObservedSpeciesService.java | 4 +- .../data/seine/ObjectSchoolEstimateService.java | 4 +- .../services/service/data/seine/RouteService.java | 8 +- .../service/data/seine/SchoolEstimateService.java | 4 +- .../service/data/seine/SetSeineService.java | 6 +- .../service/data/seine/TargetCatchService.java | 4 +- .../service/data/seine/TargetSampleService.java | 6 +- .../seine/TransmittingBuoyOperationService.java | 4 +- .../data/seine/TripSeineGearUseService.java | 4 +- .../service/data/seine/TripSeineService.java | 16 +- .../referential/MissingReferentialResult.java | 2 +- .../referential/ObserveReferentialCache.java | 14 +- .../service/referential/ReferenceSetsRequest.java | 4 +- .../service/referential/ReferentialService.java | 14 +- .../service/sql/AddSqlScriptProducerRequest.java | 4 +- .../service/sql/AddSqlScriptProducerResult.java | 5 +- .../sql/DeleteSqlScriptProducerRequest.java | 10 +- .../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 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 0 -> 51118 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 0 -> 68055 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 0 -> 60940 bytes services/src/main/xmi/observe-services-dto.ini | 284 + .../service/actions/report/ReportBuilderTest.java | 6 +- .../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 +- test/pom.xml | 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 | 4 +- .../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 +- toolbox-maven-plugin/pom.xml | 2 +- .../maven/plugins/toolbox/CheckApiMojo.java | 4 +- .../plugins/toolbox/GenerateI18nTypesMojo.java | 4 +- .../toolbox/GenerateI18nValidatorFieldsMojo.java | 4 +- .../toolbox/GenerateValidatorMojoSupport.java | 4 +- .../toolbox/GenerateValidatorsDescriptorMojo.java | 7 +- .../toolbox/GenerateWebmotionMappingMojo.java | 6 +- .../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 +- topia-extension/pom.xml | 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 | 5 +- .../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 +- topia-templates-extension/pom.xml | 2 +- .../templates/TopiaMetadataModelGenerator.java | 8 +- 2793 files changed, 68474 insertions(+), 244746 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.