[Observe-commits] branch develop updated (cf6cc38 -> 8c0dfe5)

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 cf6cc38 refs #8429 amélioration focus managers new 9f5bcb9 [iso] correction template new 7482d41 [persistence] correction scripts migration v6 new 924210a On passe en version 6.0 + simplification du nommage des scripts de migration new 7735bd1 [tests] on fige les bases en 6.0 new 8c0dfe5 [persistence] correction des optimisations de recherche + fix toutes les bases de test The 5 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 8c0dfe50a9eaf46b39b36dab99a9175e181c7cbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 13:40:52 2016 +0100 [persistence] correction des optimisations de recherche + fix toutes les bases de test commit 7735bd18f5a5743cd13117073c4834e4f5e63cfa Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 10:04:06 2016 +0100 [tests] on fige les bases en 6.0 commit 924210adf5061f366f5425654331db427b1c1d22 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 09:39:02 2016 +0100 On passe en version 6.0 + simplification du nommage des scripts de migration commit 7482d4183d6c461ac4c9e475fe313cfe3cd53d90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 09:14:44 2016 +0100 [persistence] correction scripts migration v6 commit 9f5bcb99b71563658f211012391fd1afda2cb0e0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 09:14:19 2016 +0100 [iso] correction template Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../swing/ui/storage/StorageUIModel.java | 14 ++++--- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- .../DataSourceMigrationForVersion_5_0.java | 18 ++++----- ...java => DataSourceMigrationForVersion_6_0.java} | 42 ++++++-------------- ...en_field-H2.sql => 01_remove_open_field-H2.sql} | 0 ...en_field-PG.sql => 01_remove_open_field-PG.sql} | 0 ...d-H2.sql => 02_add_lastUpdateDate_field-H2.sql} | 0 ...d-PG.sql => 02_add_lastUpdateDate_field-PG.sql} | 0 ...e-H2.sql => 03_add_lastUpdateDate_table-H2.sql} | 0 ...e-PG.sql => 03_add_lastUpdateDate_table-PG.sql} | 0 ...it_field-PG.sql => 04_remove_unit_field-H2.sql} | 0 ...it_field-H2.sql => 04_remove_unit_field-PG.sql} | 0 ..._field-PG.sql => 05_remove_gender_field-H2.sql} | 0 ..._field-H2.sql => 05_remove_gender_field-PG.sql} | 0 ...rows-H2.sql => 06_remove_duplicate_rows-H2.sql} | 0 ...rows-PG.sql => 06_remove_duplicate_rows-PG.sql} | 0 ...rop_not_null_constraint_gearUseFeatures-H2.sql} | 0 ...rop_not_null_constraint_gearUseFeatures-PG.sql} | 0 ..._not_null_constraint_hauling_identifier-H2.sql} | 0 ..._not_null_constraint_hauling_identifier-PG.sql} | 0 ....sql => 09_add_non_target_length_sex_fk-H2.sql} | 0 ....sql => 09_add_non_target_length_sex_fk-PG.sql} | 0 ...V5_1_19_ano_8554_brancheline_add_section-H2.sql | 24 ------------ ...V5_1_19_ano_8554_brancheline_add_section-PG.sql | 24 ------------ .../01_evol_8374_delete_sonarUsed-H2.sql} | 0 .../01_evol_8374_delete_sonarUsed-PG.sql} | 0 .../02_evol_7886_catch_add_set_idx-H2.sql} | 0 .../02_evol_7886_catch_add_set_idx-PG.sql} | 0 .../03_evol_6997_delete_supportVesselName-H2.sql} | 0 .../03_evol_6997_delete_supportVesselName-PG.sql} | 0 ...anchlineComposition_add_tracelineLength-H2.sql} | 0 ...anchlineComposition_add_tracelineLength-PG.sql} | 0 .../05_evol_6999_nonTargetCatch_add_well-H2.sql} | 0 .../05_evol_6999_nonTargetCatch_add_well-PG.sql} | 0 .../06_evol_8375_setSeine_add_booleans-H2.sql} | 0 .../06_evol_8375_setSeine_add_booleans-PG.sql} | 0 .../07_evol_8389_rename_source_columns-H2.sql} | 0 .../07_evol_8389_rename_source_columns-PG.sql} | 0 .../08_1_evol_8390_measure_type-H2.sql} | 0 .../08_1_evol_8390_measure_type-PG.sql} | 0 .../08_evol_8390_measure_type-H2.sql} | 0 .../08_evol_8390_measure_type-PG.sql} | 0 .../09_evol_7877_targetLength_add_sex-H2.sql} | 0 .../09_evol_7877_targetLength_add_sex-PG.sql} | 0 ...0_evol_8391_species_add_sizeMeasureType-H2.sql} | 0 ...0_evol_8391_species_add_sizeMeasureType-PG.sql} | 0 .../11_evol_8571_length_add_tagNumber-H2.sql} | 0 .../11_evol_8571_length_add_tagNumber-PG.sql} | 0 .../12_evol_8475_vessel_add_fields-H2.sql} | 0 .../12_evol_8475_vessel_add_fields-PG.sql} | 0 .../13_evol_7901_add_armateur_table-H2.sql} | 0 .../13_evol_7901_add_armateur_table-PG.sql} | 0 ...l_8196_lengthWeightParameter_add_source-H2.sql} | 0 ...l_8196_lengthWeightParameter_add_source-PG.sql} | 0 ...ol_8578_nonTargetLength_add_speciesFate-H2.sql} | 0 ...ol_8578_nonTargetLength_add_speciesFate-PG.sql} | 0 .../16_evol_8377_speciesFate_add_discard-H2.sql} | 0 .../16_evol_8377_speciesFate_add_discard-PG.sql} | 0 ...l_8376_vesselActivitySeine_add_allowFad-H2.sql} | 0 ...l_8376_vesselActivitySeine_add_allowFad-PG.sql} | 0 .../18_evol_8404_lengthLengthParameter-H2.sql} | 0 .../18_evol_8404_lengthLengthParameter-PG.sql} | 2 +- .../19_ano_8554_brancheline_add_section-H2.sql} | 9 ++--- .../19_ano_8554_brancheline_add_section-PG.sql} | 9 ++--- ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 1 + ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 1 + entities/pom.xml | 2 +- .../observe/ObserveTopiaApplicationContext.java | 43 ++++++++++++++------- .../AbstractObserveMigrationCallBack.java | 6 ++- entities/src/main/xmi/observe-longline.zargo | Bin 95950 -> 95951 bytes entities/src/main/xmi/observe.ini | 2 +- pom.xml | 4 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto-gson/pom.xml | 2 +- services-dto-reference/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-binder/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../data/longline/BranchlineServiceTopia.java | 5 +-- .../SetLonglineDetailCompositionServiceTopia.java | 6 +-- .../topia/entity/LengthWeightParemetersTest.java | 16 ++++---- services/pom.xml | 2 +- test/pom.xml | 2 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- .../resources/db/5.0/dataForTestLongline.sql.gz | Bin 1622126 -> 1579264 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 451053 -> 448129 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441245 -> 439131 bytes test/src/main/resources/db/5.0/referentiel.sql.gz | Bin 140210 -> 179173 bytes .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 1593547 -> 0 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 451463 -> 0 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 6302 -> 0 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 6293 -> 0 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 182328 -> 0 bytes .../resources/db/6.0/dataForTestLongline.sql.gz | Bin 0 -> 1636168 bytes .../main/resources/db/6.0/dataForTestSeine.sql.gz | Bin 0 -> 455791 bytes test/src/main/resources/db/6.0/empty_h2.sql.gz | Bin 0 -> 6310 bytes test/src/main/resources/db/6.0/empty_pg.sql.gz | Bin 0 -> 6302 bytes test/src/main/resources/db/6.0/referentiel.sql.gz | Bin 0 -> 183215 bytes test/src/main/resources/observetest.properties | 4 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 115 files changed, 118 insertions(+), 166 deletions(-) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{DataSourceMigrationForVersion_5_1.java => DataSourceMigrationForVersion_6_0.java} (93%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_900_01_remove_open_field-H2.sql => 01_remove_open_field-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_900_01_remove_open_field-PG.sql => 01_remove_open_field-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_901_01_add_lastUpdateDate_field-H2.sql => 02_add_lastUpdateDate_field-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_901_01_add_lastUpdateDate_field-PG.sql => 02_add_lastUpdateDate_field-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_902_01_add_lastUpdateDate_table-H2.sql => 03_add_lastUpdateDate_table-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_902_01_add_lastUpdateDate_table-PG.sql => 03_add_lastUpdateDate_table-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_01_remove_unit_field-PG.sql => 04_remove_unit_field-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_01_remove_unit_field-H2.sql => 04_remove_unit_field-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_02_remove_gender_field-PG.sql => 05_remove_gender_field-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_02_remove_gender_field-H2.sql => 05_remove_gender_field-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_03_remove_duplicate_rows-H2.sql => 06_remove_duplicate_rows-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_903_03_remove_duplicate_rows-PG.sql => 06_remove_duplicate_rows-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql => 07_drop_not_null_constraint_gearUseFeatures-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql => 07_drop_not_null_constraint_gearUseFeatures-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql => 08_drop_not_null_constraint_hauling_identifier-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql => 08_drop_not_null_constraint_hauling_identifier-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_906_01_add_non_target_length_sex_fk-H2.sql => 09_add_non_target_length_sex_fk-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/5.0/{V4_906_01_add_non_target_length_sex_fk-PG.sql => 09_add_non_target_length_sex_fk-PG.sql} (100%) delete mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-H2.sql delete mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-PG.sql rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_01_evol_8374_delete_sonarUsed-PG.sql => 6.0/01_evol_8374_delete_sonarUsed-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_01_evol_8374_delete_sonarUsed-H2.sql => 6.0/01_evol_8374_delete_sonarUsed-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_02_evol_7886_catch_add_set_idx-PG.sql => 6.0/02_evol_7886_catch_add_set_idx-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_02_evol_7886_catch_add_set_idx-H2.sql => 6.0/02_evol_7886_catch_add_set_idx-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_03_evol_6997_delete_supportVesselName-H2.sql => 6.0/03_evol_6997_delete_supportVesselName-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql => 6.0/03_evol_6997_delete_supportVesselName-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql => 6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql => 6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql => 6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql => 6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql => 6.0/06_evol_8375_setSeine_add_booleans-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql => 6.0/06_evol_8375_setSeine_add_booleans-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_07_evol_8389_rename_source_columns-H2.sql => 6.0/07_evol_8389_rename_source_columns-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql => 6.0/07_evol_8389_rename_source_columns-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_08_1_evol_8390_measure_type-H2.sql => 6.0/08_1_evol_8390_measure_type-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_08_1_evol_8390_measure_type-PG.sql => 6.0/08_1_evol_8390_measure_type-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_08_evol_8390_measure_type-H2.sql => 6.0/08_evol_8390_measure_type-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_08_evol_8390_measure_type-PG.sql => 6.0/08_evol_8390_measure_type-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_09_evol_7877_targetLength_add_sex-H2.sql => 6.0/09_evol_7877_targetLength_add_sex-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_09_evol_7877_targetLength_add_sex-PG.sql => 6.0/09_evol_7877_targetLength_add_sex-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql => 6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql => 6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_11_evol_8571_length_add_tagNumber-H2.sql => 6.0/11_evol_8571_length_add_tagNumber-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_11_evol_8571_length_add_tagNumber-PG.sql => 6.0/11_evol_8571_length_add_tagNumber-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_12_evol_8475_vessel_add_fields-H2.sql => 6.0/12_evol_8475_vessel_add_fields-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_12_evol_8475_vessel_add_fields-PG.sql => 6.0/12_evol_8475_vessel_add_fields-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql => 6.0/13_evol_7901_add_armateur_table-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql => 6.0/13_evol_7901_add_armateur_table-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql => 6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql => 6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql => 6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql => 6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql => 6.0/16_evol_8377_speciesFate_add_discard-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql => 6.0/16_evol_8377_speciesFate_add_discard-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql => 6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql => 6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql => 6.0/18_evol_8404_lengthLengthParameter-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql => 6.0/18_evol_8404_lengthLengthParameter-PG.sql} (97%) copy entities-migration/src/main/resources/db/migration/{old/3.7/V3_7_04_normalize-triplongline-PG.sql => 6.0/19_ano_8554_brancheline_add_section-H2.sql} (62%) copy entities-migration/src/main/resources/db/migration/{old/3.7/V3_7_04_normalize-triplongline-PG.sql => 6.0/19_ano_8554_brancheline_add_section-PG.sql} (62%) create mode 100644 entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql delete mode 100644 test/src/main/resources/db/5.1/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/5.1/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/5.1/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/5.1/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/5.1/referentiel.sql.gz create mode 100644 test/src/main/resources/db/6.0/dataForTestLongline.sql.gz create mode 100644 test/src/main/resources/db/6.0/dataForTestSeine.sql.gz create mode 100644 test/src/main/resources/db/6.0/empty_h2.sql.gz create mode 100644 test/src/main/resources/db/6.0/empty_pg.sql.gz create mode 100644 test/src/main/resources/db/6.0/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.