This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from bf0a1c4 optimize dependencies new 853fe15 No more create validation context on service validation new 1f8ea21 Use lambda \o/ new e538764 Update libraries to none snapshot + up codelutinpom to 10.2 new a733157 Improve code new b3c4333 fix test build new c36671c Introduction nouveau module pour les migrations new 01d87d9 Meilleur découpage de la migration new e4c7528 Revue du code relatif au gps et suppression du code en double (entités vs service model) The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e4c75280980321b0a9e7981cc4fe7bf9f95ac828 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 17:15:45 2016 +0200 Revue du code relatif au gps et suppression du code en double (entités vs service model) commit 01d87d9d4d71cf4ae7fd052dbe2d52ad71cae029 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 16:39:23 2016 +0200 Meilleur découpage de la migration commit c36671cd436724e2ab007ae34613c97a45a13658 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 15:33:26 2016 +0200 Introduction nouveau module pour les migrations commit b3c43334618e8226ab22502d9560f734d80db396 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 14:23:23 2016 +0200 fix test build commit a7331576566ba504f99692cba31deae4f1f44743 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:52:13 2016 +0200 Improve code commit e538764c98a8998b645cd2897820579d72e8b165 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:51:51 2016 +0200 Update libraries to none snapshot + up codelutinpom to 10.2 commit 1f8ea21506c2895fbc618b28f3846ccdc2043542 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 10:31:33 2016 +0200 Use lambda \o/ commit 853fe15975d3dfdc8934305abbf8e724097ca2e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 10:31:17 2016 +0200 No more create validation context on service validation Summary of changes: .../swing/decoration/DecoratorService.java | 6 +- .../AbstractSpeciesFieldDtoValidator.java | 4 +- .../ActivitySimpleSpeedDtoValidator.java | 9 +- .../validators/ActivitySpeedDtoValidator.java | 9 +- .../validation/BeanValidatorDetectorTest.java | 2 +- .../main/java/fr/ird/observe/ObserveAdminCLI.java | 2 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 12 +- .../fr/ird/observe/ObserveResourceManager.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 6 +- .../observe/ObserveSwingApplicationContext.java | 9 +- .../ObserveSwingApplicationConfig.java | 4 +- .../ObserveSwingApplicationConfigOption.java | 11 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 4 +- .../observe/entities/tripMap/TripMapPointType.java | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 44 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 16 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 4 +- .../fr/ird/observe/ui/actions/ShowAboutAction.java | 13 +- .../ird/observe/ui/actions/ShowConfigAction.java | 8 +- .../observe/ui/actions/StopH2WebServerAction.java | 1 - .../observe/ui/actions/StopServerModeAction.java | 1 - .../ui/actions/shared/CancelCreateUIAction.java | 26 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 128 +++-- .../ui/actions/shared/CloseOpenUIAction.java | 146 +++--- .../ui/actions/shared/DeleteDataUIAction.java | 33 +- .../ui/actions/shared/DeleteReferenceUIAction.java | 29 +- .../observe/ui/actions/shared/GoDownUIAction.java | 22 +- .../observe/ui/actions/shared/GoUpUIAction.java | 20 +- .../shared/MoveActivityLonglinesUIAction.java | 62 ++- .../actions/shared/MoveActivitySeinesUIAction.java | 60 ++- .../ui/actions/shared/MoveRoutesUIAction.java | 62 ++- .../ui/actions/shared/MoveTripsUIAction.java | 56 +-- .../observe/ui/actions/shared/ReOpenUIAction.java | 58 +-- .../ui/actions/shared/ResetEditUIAction.java | 23 +- .../ui/actions/shared/SaveEditUIAction.java | 23 +- .../fr/ird/observe/ui/admin/AdminActionWorker.java | 2 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 7 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 246 ++++----- .../ui/admin/consolidate/ConsolidateUIHandler.java | 37 +- .../ui/admin/export/TripToExportTableModel.java | 2 +- .../ird/observe/ui/admin/report/ReportModel.java | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 130 ++--- .../observe/ui/admin/save/SaveLocalUIHandler.java | 2 +- .../validate/ValidateEntityListCellRenderer.java | 7 +- .../ui/admin/validate/ValidateUIHandler.java | 102 ++-- .../validate/ValidationMessageTableModel.java | 5 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 27 +- .../observe/ui/content/ContentUIInitializer.java | 15 +- .../ird/observe/ui/content/ObserveContentUI.java | 7 +- .../content/impl/longline/BranchlineUIHandler.java | 23 +- .../LonglineDetailCompositionUIHandler.java | 264 ++++------ .../LonglineDetailCompositionUIInitializer.java | 4 +- ...onglineDetailCompositionUIValidationHelper.java | 18 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 53 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- .../seine/ActivitySeineObservedSystemUIModel.java | 2 - ...ngObjectTransmittingBuoyOperationUIHandler.java | 15 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 38 +- .../ui/content/list/ContentListUIHandler.java | 17 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 8 +- .../impl/longline/ActivityLonglineUIModel.java | 13 +- .../open/impl/longline/TripLonglineUIHandler.java | 50 +- .../open/impl/seine/ActivitySeineUIHandler.java | 26 +- .../open/impl/seine/ActivitySeineUIModel.java | 29 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 6 +- .../open/impl/seine/TripSeineUIHandler.java | 50 +- .../ui/content/ref/ContentReferenceUIHandler.java | 50 +- .../ui/content/ref/UniqueKeyTableModel.java | 6 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 17 +- .../ref/impl/LengthWeightParameterUIHandler.java | 17 +- .../ui/content/ref/impl/ProgramUIHandler.java | 17 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 17 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 17 +- .../ui/content/ref/impl/VesselUIHandler.java | 17 +- .../observe/ui/content/table/ContentTableMeta.java | 23 +- .../ui/content/table/ContentTableModel.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 29 +- .../content/table/ContentTableUIInitializer.java | 99 ++-- .../ui/content/table/ContentTableUIModel.java | 11 +- .../impl/longline/BaitsCompositionUIHandler.java | 14 +- .../impl/longline/BaitsCompositionUIModel.java | 2 + .../longline/BranchlinesCompositionUIHandler.java | 13 +- .../longline/BranchlinesCompositionUIModel.java | 2 + .../impl/longline/CatchAcquisitionModeEnum.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 11 +- .../impl/longline/CatchLonglineTableModel.java | 5 + .../impl/longline/CatchLonglineUIHandler.java | 120 ++--- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../table/impl/longline/EncounterUIModel.java | 2 + .../longline/FloatlinesCompositionUIHandler.java | 14 +- .../longline/FloatlinesCompositionUIModel.java | 1 + .../GearUseFeaturesLonglineTableModel.java | 7 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 65 +-- .../impl/longline/HooksCompositionUIHandler.java | 13 +- .../impl/longline/HooksCompositionUIModel.java | 1 + .../impl/longline/LonglinePositionHelper.java | 23 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIModel.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 40 +- .../ui/content/table/impl/longline/TdrUIModel.java | 1 + .../seine/GearUseFeatureMeasurementCellEditor.java | 4 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 7 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 65 +-- .../impl/seine/ModeSaisieEchantillonEnum.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 57 +-- .../table/impl/seine/NonTargetCatchUIModel.java | 1 + .../table/impl/seine/NonTargetSampleUIHandler.java | 29 +- .../table/impl/seine/NonTargetSampleUIModel.java | 1 + .../impl/seine/ObjectObservedSpeciesUIHandler.java | 3 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 1 + .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 1 + .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIModel.java | 1 + .../table/impl/seine/TargetCatchUIHandler.java | 20 +- .../table/impl/seine/TargetCatchUIModel.java | 1 + .../impl/seine/TargetDiscardCatchUIHandler.java | 44 +- .../impl/seine/TargetDiscardCatchUIModel.java | 1 + .../table/impl/seine/TargetSampleUIHandler.java | 29 +- .../table/impl/seine/TargetSampleUIModel.java | 1 + .../ird/observe/ui/storage/ObstunaAdminAction.java | 8 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 4 +- .../ui/storage/StorageBackupUILauncher.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 99 ++-- .../ird/observe/ui/storage/StorageUILauncher.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 114 ++--- .../ui/storage/tabs/DataSelectionModel.java | 17 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 12 +- .../ui/storage/tabs/StorageTabUIHandler.java | 92 ++-- .../ui/tree/DataSelectionTreeCellRenderer.java | 9 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 4 +- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../ui/tree/loadors/RootNodeChildLoador.java | 3 - .../ObserveSwingValidatorMessageTableModel.java | 4 +- .../ui/util/table/AbstractSelectTableAction.java | 3 +- .../fr/ird/observe/ui/util/table/EditableList.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 30 +- .../table/ObserveBooleanTableCellRenderer.java | 13 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 9 +- .../util/tripMap/ObserverMapPanLegendDrawer.java | 24 +- .../ui/util/tripMap/TripMapContentBuilder.java | 12 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 2 +- .../validation/ValidationMessageDetector.java | 560 --------------------- ...glineDetailCompositionValidatorServiceTest.java | 2 +- .../application/web/ObserveWebMotionRender.java | 2 +- .../ObserveWebApplicationConfigurationOption.java | 9 +- .../web/configuration/db/ObserveWebDatabase.java | 3 +- .../web/configuration/db/ObserveWebDatabases.java | 3 +- .../db/impl/ObserveWebDatabaseBean.java | 11 +- .../db/impl/ObserveWebDatabaseImmutable.java | 21 +- .../db/impl/ObserveWebDatabasesBean.java | 11 +- .../db/impl/ObserveWebDatabasesImmutable.java | 21 +- .../web/configuration/user/ObserveWebUser.java | 3 +- .../web/configuration/user/ObserveWebUsers.java | 3 +- .../configuration/user/ObserveWebUsersHelper.java | 4 +- .../user/impl/ObserveWebUserBean.java | 11 +- .../user/impl/ObserveWebUserImmutable.java | 21 +- .../user/impl/ObserveWebUsersBean.java | 11 +- .../user/impl/ObserveWebUsersImmutable.java | 21 +- .../controller/v1/DataSourceServiceController.java | 2 +- .../web/converter/ObserveDtoConverter.java | 2 +- .../application/web/injector/DateInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 2 +- .../web/request/ObserveWebRequestContext.java | 12 +- .../ObserveWebSecurityApplicationContext.java | 2 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 11 +- .../db/ObserveWebDatabasesHelperTest.java | 4 +- .../user/ObserveWebUsersHelperTest.java | 2 +- .../fr/ird/observe/ObserveApplicationContext.java | 2 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 2 +- .../java/fr/ird/observe/db/impl/PGDataSource.java | 2 +- .../fr/ird/observe/db/impl/PGDataSourceConfig.java | 2 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 50 +- .../src/license/THIRD-PARTY.properties | 0 .../migration/AbstractDataSourceMigration.java | 57 +++ .../AbstractObserveMigrationCallBack.java | 47 +- .../entities/migration/H2DataSourceMigration.java | 283 +++++++++++ ...ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveMigrationConfigurationProviderImpl.java | 121 +++++ .../entities/migration/PGDataSourceMigration.java | 369 ++++++++++++++ .../DataSourceMigrationForVersion_3_1.java | 3 +- .../DataSourceMigrationForVersion_3_10.java | 3 +- .../DataSourceMigrationForVersion_3_11.java | 3 +- .../DataSourceMigrationForVersion_3_12.java | 3 +- .../DataSourceMigrationForVersion_3_14.java | 3 +- .../DataSourceMigrationForVersion_3_15.java | 3 +- .../DataSourceMigrationForVersion_3_16.java | 41 +- .../DataSourceMigrationForVersion_3_5.java | 5 +- .../DataSourceMigrationForVersion_3_7.java | 3 +- .../DataSourceMigrationForVersion_3_8.java | 3 +- .../DataSourceMigrationForVersion_3_9.java | 3 +- .../DataSourceMigrationForVersion_4_0.java | 3 +- .../DataSourceMigrationForVersion_4_0_1.java | 71 ++- .../DataSourceMigrationForVersion_4_0_2.java | 3 +- .../DataSourceMigrationForVersion_4_0_4.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 41 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 27 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 3 +- .../DataSourceMigrationForVersion_4_900.java | 3 +- .../DataSourceMigrationForVersion_4_901.java | 3 +- .../DataSourceMigrationForVersion_4_902.java | 3 +- .../DataSourceMigrationForVersion_4_903.java | 3 +- .../DataSourceMigrationForVersion_4_904.java | 3 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../main/java/fr/ird/type/CoordinateHelper.java | 0 ...migration.ObserveMigrationConfigurationProvider | 1 + .../src/main/resources/db/3.5/constrainsts.csv | 0 .../resources/db/3.5/traduction_attributes.csv | 0 .../main/resources/db/3.5/traduction_tables.csv | 0 .../main/resources/db/3.5/traduction_tables2.csv | 0 .../db/migration/V3_10_01_remove-person-H2.sql | 0 .../db/migration/V3_10_01_remove-person-PG.sql | 0 .../db/migration/V3_10_02_add-missing-fk-H2.sql | 0 .../db/migration/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../migration/V3_10_05_normalize-sections-H2.sql | 0 .../migration/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../db/migration/V3_11_03_add-fpaZones-H2.sql | 0 .../db/migration/V3_11_03_add-fpaZones-PG.sql | 0 .../migration/V3_11_04_add-activity-ersId-H2.sql | 0 .../migration/V3_11_04_add-activity-ersId-PG.sql | 0 .../migration/V3_11_05_add-person-country-H2.sql | 0 .../migration/V3_11_05_add-person-country-PG.sql | 0 .../db/migration/V3_11_06_add-harbours-H2.sql | 0 .../db/migration/V3_11_06_add-harbours-PG.sql | 0 .../db/migration/V3_12_01_add-missing-boat-H2.sql | 0 .../db/migration/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../migration/V3_16_01_add-gear-referential-H2.sql | 0 .../migration/V3_16_01_add-gear-referential-PG.sql | 0 .../db/migration/V3_16_02_add-gear-data-H2.sql | 0 .../db/migration/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../db/migration/V3_5_01_migration-H2.sql | 0 .../db/migration/V3_5_01_migration-PG.sql | 0 .../migration/V3_5_02_add-longline-schema-H2.sql | 0 .../migration/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../db/migration/V3_7_01_rename-seine-model-H2.sql | 0 .../db/migration/V3_7_01_rename-seine-model-PG.sql | 0 .../migration/V3_7_02_remove-trip-organism-H2.sql | 0 .../migration/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../migration/V3_7_06_normalize-setlongline-H2.sql | 0 .../migration/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../db/migration/V3_7_08_normalize-tdr-H2.sql | 0 .../db/migration/V3_7_08_normalize-tdr-PG.sql | 0 .../db/migration/V3_7_09_add-species-list-H2.sql | 0 .../db/migration/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../db/migration/V3_8_01_fix-person-H2.sql | 0 .../db/migration/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../migration/V3_8_03_normalize-sensorused-H2.sql | 0 .../migration/V3_8_03_normalize-sensorused-PG.sql | 0 .../db/migration/V3_8_04_normalize-tdr-H2.sql | 0 .../db/migration/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../resources/db/migration/V4_0_01_empty-H2.sql | 0 .../resources/db/migration/V4_0_01_empty-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../migration/V4_900_01_remove_open_field-H2.sql | 0 .../migration/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../migration/V4_903_01_remove_unit_field-H2.sql | 0 .../migration/V4_903_01_remove_unit_field-PG.sql | 0 .../migration/V4_903_02_remove_gender_field-H2.sql | 0 .../migration/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...rveMigrationCallBackForVersionResolverTest.java | 6 +- .../src/test/resources/log4j.properties | 0 observe-entities/pom.xml | 9 - .../observe/ObserveTopiaApplicationContext.java | 13 +- .../observe/ObserveTopiaConfigurationFactory.java | 75 ++- .../java/fr/ird/observe/entities/Entities.java | 16 +- .../constants/TripMapPointTypePersist.java | 2 +- .../NonTargetCatchComputedValueSourcePersist.java | 2 +- .../entities/constants/seine/OwnershipPersist.java | 2 +- .../constants/seine/SchoolTypePersist.java | 2 +- .../TypeTransmittingBuoyOperationPersist.java | 2 +- .../observe/entities}/gps/CoordinateHelper.java | 2 +- .../java/fr/ird/observe/entities/gps/GPSPoint.java | 120 ----- .../fr/ird/observe/entities/gps/GPSPointImpl.java | 79 --- .../ird/observe/entities/gps/GPSPointInterval.java | 155 ------ .../observe/entities/gps/GPSPointIntervalImpl.java | 84 ---- .../java/fr/ird/observe/entities/gps/GPSRoute.java | 276 ---------- .../fr/ird/observe/entities/gps/GPSRouteImpl.java | 144 ------ .../fr/ird/observe/entities/gps/GpsPoints.java | 177 ------- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../entities/longline/ActivityLonglines.java | 15 +- .../observe/entities/longline/SetLonglineImpl.java | 2 +- .../entities/longline/TripLonglineTopiaDao.java | 4 +- .../migration/AbstractDataSourceMigration.java | 138 ----- .../entities/migration/H2DataSourceMigration.java | 309 ------------ .../ObserveMigrationConfigurationProvider.java | 40 ++ .../entities/migration/ObserveMigrationEngine.java | 13 +- .../entities/migration/PGDataSourceMigration.java | 394 --------------- .../observe/entities/referentiel/HarbourImpl.java | 2 +- .../referentiel/ObserveReferentialEntities.java | 20 +- .../ird/observe/entities/referentiel/Persons.java | 21 +- .../ird/observe/entities/referentiel/Programs.java | 9 +- .../ird/observe/entities/referentiel/Species2.java | 16 +- .../observe/entities/seine/ActivitySeineImpl.java | 5 +- .../ird/observe/entities/seine/ActivitySeines.java | 17 +- .../observe/entities/seine/NonTargetCatchImpl.java | 2 +- .../observe/entities/seine/NonTargetCatchs.java | 7 +- .../observe/entities/seine/NonTargetLenghts.java | 7 +- .../ird/observe/entities/seine/RouteTopiaDao.java | 40 +- .../java/fr/ird/observe/entities/seine/Routes.java | 15 +- .../fr/ird/observe/entities/seine/SetSeines.java | 9 +- .../ird/observe/entities/seine/TargetCatchs.java | 18 +- .../ird/observe/entities/seine/TargetLenghts.java | 10 +- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- .../ObserveTopiaApplicationContextTest.java | 109 ---- .../validation => }/RelationRegexTest.java | 2 +- .../services/ObserveServiceInitializer.java | 6 +- .../service/actions/report/ReportBuilder.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 8 +- .../actions/validate/ValidateResultForDtos.java | 30 +- .../actions/validate/ValidationMessage.java | 6 +- .../service/actions/validate/ValidatorDtos.java | 15 +- .../ObserveDataSourceConfigurationRest.java | 4 +- .../observe/services/dto/AbstractReference.java | 26 +- .../fr/ird/observe/services/dto/DataReference.java | 28 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 26 +- .../observe/services/dto/ObserveDbUserDtos.java | 2 +- .../services/dto/actions/report/Report.java | 8 +- .../dto/actions/report/ReportOperation.java | 2 +- .../dto/actions/report/ReportVariable.java | 6 +- .../services/dto/constants/ObserveDbRole.java | 2 +- .../services/dto/constants/ReferenceStatus.java | 2 +- .../services/dto/constants/TripMapPointType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 2 +- .../services/dto/constants/seine/SchoolType.java | 2 +- .../seine/TypeTransmittingBuoyOperation.java | 4 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 8 +- .../services/dto/longline/SectionWithTemplate.java | 4 - .../dto/longline/SectionWithTemplates.java | 11 +- .../services/dto/referential/PersonDtos.java | 30 +- .../services/dto/referential/ReferentialDtos.java | 2 +- .../dto/referential/ReferentialReferences.java | 21 +- .../util/{gps/GpsPoints.java => GPSPoint.java} | 137 +++-- .../main/java/fr/ird/observe/util/gps/GPSAble.java | 59 --- .../fr/ird/observe/util/gps/GPSFileReader.java | 356 ------------- .../java/fr/ird/observe/util/gps/GPSPoint.java | 118 ----- .../java/fr/ird/observe/util/gps/GPSPointImpl.java | 76 --- .../fr/ird/observe/util/gps/GPSPointInterval.java | 155 ------ .../ird/observe/util/gps/GPSPointIntervalImpl.java | 86 ---- .../java/fr/ird/observe/util/gps/GPSRoute.java | 276 ---------- .../java/fr/ird/observe/util/gps/GPSRouteImpl.java | 144 ------ .../java/fr/ird/observe/util/gps/GPSService.java | 115 ----- .../services/http/ObserveRequestBuilder.java | 2 +- .../ird/observe/services/http/ObserveResponse.java | 6 +- .../services/http/ObserveResponseBuilder.java | 4 +- .../services/service/AbstractServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 4 +- .../report/AbstractReportServiceRestTest.java | 5 - .../report/ReportAccessoryCatchRestTest.java | 2 +- .../actions/validate/ValidateServiceRestTest.java | 251 +++++---- observe-services-topia-validation/pom.xml | 5 + .../validators/AbstractSpeciesFieldValidator.java | 4 +- .../validators/ActivitySimpleSpeedValidator.java | 9 +- .../validators/ActivitySpeedValidator.java | 9 +- ...erve-services-topia-validation_en_GB.properties | 2 +- ...erve-services-topia-validation_es_ES.properties | 2 +- ...erve-services-topia-validation_fr_FR.properties | 2 +- .../validation/BeanValidatorDetectorTest.java | 2 +- observe-services-topia/pom.xml | 6 + .../observe/services/ObserveSecurityHelper.java | 11 +- .../ird/observe/services/ObserveServiceTopia.java | 4 +- .../ObserveTopiaApplicationContextFactory.java | 4 +- .../ird/observe/services/binder/BinderEngine.java | 12 +- .../ird/observe/services/binder/BinderSupport.java | 104 +--- .../observe/services/entity/EntitiesExtractor.java | 12 +- .../services/entity/EntitiesSetFactory.java | 12 +- .../entity/SpeciesListEntitiesExtractor.java | 2 +- .../entity/SpeciesListOceanEntitiesExtractor.java | 7 +- .../observe/services/entity/TripMapDtoFactory.java | 21 +- .../services/service/DataSourceServiceTopia.java | 15 +- .../services/service/ReferentialServiceTopia.java | 4 +- .../service/SqlScriptProducerServiceTopia.java | 4 +- .../ConsolidateActivitySeineDataResultBuilder.java | 12 +- .../consolidate/ConsolidateDataServiceTopia.java | 4 +- .../service/actions/report/ReportServiceTopia.java | 4 +- ...alReferentialSynchronizeRemoteServiceTopia.java | 5 +- .../validate/ValidationMessageDetector.java | 9 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 10 +- .../referentiel/LengthWeightParemetersTest.java | 2 +- .../ird/observe/services/DataSourceResource.java | 4 +- .../services/binder/BinderEngineMetadataTest.java | 2 +- .../observe/services/binder/BinderEngineTest.java | 9 +- .../service/DataSourceServiceTopiaTest.java | 9 +- .../services/service/MigrateTestsDatabases.java | 2 +- .../fr/ird/observe/services/service/RigthTest.java | 6 +- .../report/AbstractReportServiceTopiaTest.java | 5 - .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 2 +- .../actions/report/ReportAccessoryCatchTest.java | 2 +- .../report/ReportActivityWithCommentTest.java | 2 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 2 +- .../report/ReportTargetCatchByAssociationTest.java | 2 +- .../ReportTargetDiscardedByAssociationTest.java | 2 +- .../actions/validate/ValidateServiceTopiaTest.java | 229 +++++---- .../java/fr/ird/observe/test/ObserveFixtures.java | 3 + .../sql/batch/actions/AbstractSqlAction.java | 26 +- .../sql/batch/actions/AbstractTablesAction.java | 2 +- .../sql/batch/actions/DeleteTablesAction.java | 6 +- .../sql/batch/actions/ReplicateTablesAction.java | 2 +- .../sql/batch/actions/UpdateTablesAction.java | 2 +- .../service/sql/batch/tables/TopiaSqlTables.java | 2 +- pom.xml | 7 +- 490 files changed, 3297 insertions(+), 7301 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java copy {observe-topia-templates-extension => observe-entities-migration}/LICENSE.txt (100%) copy {observe-topia-templates-extension => observe-entities-migration}/README.md (100%) copy {observe-topia-extension => observe-entities-migration}/pom.xml (69%) copy {observe-topia-templates-extension => observe-entities-migration}/src/license/THIRD-PARTY.properties (100%) create mode 100644 observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java (65%) create mode 100644 observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java (99%) create mode 100644 observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java create mode 100644 observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java (95%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java (82%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java (97%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java (93%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java (78%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java (73%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java (93%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java (93%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java (92%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java (91%) rename {observe-entities => observe-entities-migration}/src/main/java/fr/ird/type/CoordinateHelper.java (100%) create mode 100644 observe-entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider rename {observe-entities => observe-entities-migration}/src/main/resources/db/3.5/constrainsts.csv (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/3.5/traduction_attributes.csv (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/3.5/traduction_tables.csv (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/3.5/traduction_tables2.csv (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_01_migration-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_01_migration-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_01_empty-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_01_empty-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql (100%) rename {observe-entities => observe-entities-migration}/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql (100%) rename {observe-entities => observe-entities-migration}/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java (89%) copy {observe-services-topia-validation => observe-entities-migration}/src/test/resources/log4j.properties (100%) rename {observe-services-model/src/main/java/fr/ird/observe/util => observe-entities/src/main/java/fr/ird/observe/entities}/gps/CoordinateHelper.java (97%) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java delete mode 100644 observe-entities/src/test/java/fr/ird/observe/ObserveTopiaApplicationContextTest.java rename observe-entities/src/test/java/fr/ird/observe/{business/validation => }/RelationRegexTest.java (98%) rename observe-services-model/src/main/java/fr/ird/observe/util/{gps/GpsPoints.java => GPSPoint.java} (60%) delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSAble.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPoint.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointImpl.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointInterval.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointIntervalImpl.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRoute.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRouteImpl.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSService.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.