This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d5d5d5536ec3a5ba35f9e90c321a997add449af7 Merge: 72efaab 1f07a4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 09:19:39 2016 +0100 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop .../src/license/THIRD-PARTY.properties | 63 +- .../java/fr/ird/observe/ObserveActionExecutor.java | 2 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 4 +- .../observe/ObserveSwingApplicationContext.java | 6 +- .../ObserveSwingApplicationConfig.java | 2 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 5 + .../ird/observe/db/constants/DataContextType.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/table/ContentTableModel.java | 12 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 6 +- .../ird/observe/ui/storage/StorageUIHandler.java | 21 +- .../ird/observe/ui/storage/StorageUILauncher.java | 4 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 7 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 6 +- .../fr/ird/observe/ui/util/FloatConverter.java | 2 +- .../fr/ird/observe/ui/util/SpringUtilities.java | 8 +- .../ird/observe/validation/ValidationService.java | 2 +- .../dto/AbstractEspeceFieldDtoValidator.java | 8 +- .../dto/ActivityFinDeVeilleExistsDtoValidator.java | 12 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 6 +- .../validator/dto/ActivitySpeedDtoValidator.java | 6 +- .../web/ObserveWebApplicationListener.java | 2 +- .../web/controller/ObserveWebMotionController.java | 2 +- .../DataSourceDumpProducerServiceController.java | 29 - .../entities/AbstractEspeceFieldValidator.java | 8 +- .../ActivityFinDeVeilleExistsValidator.java | 12 +- .../entities/ActivitySimpleSpeedValidator.java | 6 +- .../validator/entities/ActivitySpeedValidator.java | 6 +- observe-entities/pom.xml | 5 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 44 +- .../observe/ObserveTopiaApplicationContext.java | 351 +++++++++-- .../observe/ObserveTopiaConfigurationFactory.java | 24 +- .../observe/ObserveTopiaPersistenceContext.java | 83 ++- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/Entities.java | 37 +- .../observe/entities/LastUpdateDateTopiaDao.java | 9 + .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../fr/ird/observe/entities/gps/GPSRouteImpl.java | 8 +- .../fr/ird/observe/entities/gps/GpsPoints.java | 12 +- .../migration/AbstractDataSourceMigration.java | 13 +- .../DataSourceMigrationForVersion_3_1.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../DataSourceMigrationForVersion_5_0_1.java | 8 +- ...va => DataSourceMigrationForVersion_5_0_2.java} | 12 +- ...va => DataSourceMigrationForVersion_5_0_3.java} | 14 +- .../referentiel/I18nReferenceEntities.java | 4 +- .../referentiel/LengthWeightParameters.java | 8 +- ...tities.java => ObserveReferentialEntities.java} | 26 +- ...Impl.java => ObserveReferentialEntityImpl.java} | 2 +- .../ird/observe/entities/referentiel/Programs.java | 2 +- .../ird/observe/entities/seine/ActivitySeines.java | 4 +- .../observe/entities/seine/NonTargetCatchImpl.java | 2 +- .../db/{5.0 => 5.0-1}/remove_open_field-H2.sql | 10 +- .../db/{5.0 => 5.0-1}/remove_open_field-PG.sql | 10 +- .../db/5.0-2/add_lastUpdateDate_field-H2.sql | 676 +++++++++++++++++++++ .../db/5.0-2/add_lastUpdateDate_field-PG.sql | 676 +++++++++++++++++++++ .../db/5.0-3/add_lastUpdateDate_table-H2.sql | 106 ++++ .../db/5.0-3/add_lastUpdateDate_table-PG.sql | 106 ++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 - .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 - .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ----- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 ----- .../src/main/xmi/observe-common.properties | 1 + observe-entities/src/main/xmi/observe-common.zargo | Bin 37617 -> 37603 bytes .../src/main/xmi/observe-longline.zargo | Bin 96937 -> 93586 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85015 -> 84567 bytes .../ObserveTopiaApplicationContextTest.java | 20 +- .../service/ConcurrentModificationException.java | 31 +- .../service/DataSourceDumpProducerService.java | 41 -- .../services/service/DataSourceService.java | 4 +- .../services/service/SqlScriptProducerRequest.java | 74 +++ .../services/service/SqlScriptProducerService.java | 19 + observe-services-configuration-api/pom.xml | 5 - observe-services-configuration-rest/pom.xml | 26 - ...bserveDataSourceConfigurationRestConstants.java | 4 +- .../src/test/resources/log4j.properties | 32 - observe-services-configuration-topia/pom.xml | 48 -- .../src/test/resources/log4j.properties | 32 - .../observe/services/dto/AbstractReference.java | 12 + .../fr/ird/observe/services/dto/DataReference.java | 3 +- .../observe/services/dto/FollowedUpdateDto.java | 14 - .../java/fr/ird/observe/services/dto/IdDto.java | 5 +- .../services/dto/constants/ReferentialLocale.java | 4 +- .../services/dto/referential/ReferentialDto.java | 12 +- .../services/dto/referential/ReferentialDtos.java | 6 +- .../observe/services/dto/result/SaveResultDto.java | 5 +- .../services/dto/result/SaveResultDtos.java | 4 +- .../dto/result/TripChildSaveResultDtos.java | 12 + .../fr/ird/observe/util/gps/GPSFileReader.java | 10 +- .../java/fr/ird/observe/util/gps/GPSRouteImpl.java | 8 +- .../java/fr/ird/observe/util/gps/GPSService.java | 12 +- .../java/fr/ird/observe/util/gps/GpsPoints.java | 12 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 43178 -> 42022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 64908 -> 63930 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60150 -> 59464 bytes .../report/AbstractReportServiceRestTest.java | 4 +- observe-services-topia/pom.xml | 13 +- .../observe/services/ReplicationServiceImpl.java | 4 +- .../referential/ReferentialServiceImpl.java | 8 +- .../ird/observe/services/ObserveServiceTopia.java | 448 +++++--------- .../ObserveTopiaApplicationContextFactory.java | 3 - .../ird/observe/services/binder/BinderEngine.java | 54 +- .../services/binder/BinderEngineInitializer.java | 32 +- .../ird/observe/services/binder/BinderSupport.java | 14 +- .../binder/data/ActivityLonglineBinder.java | 9 +- .../data/ActivityLonglineEncouterDtoBinder.java | 8 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 8 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 4 +- .../services/binder/data/ActivitySeineBinder.java | 9 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 8 +- .../binder/data/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/BaitsCompositionBinder.java | 4 +- .../observe/services/binder/data/BasketBinder.java | 4 +- .../services/binder/data/BranchlineBinder.java | 6 +- .../binder/data/BranchlinesCompositionBinder.java | 4 +- .../services/binder/data/CatchLonglineBinder.java | 6 +- .../services/binder/data/DataBinderSupport.java | 38 +- .../services/binder/data/EncounterBinder.java | 5 +- .../services/binder/data/FloatingObjectBinder.java | 6 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 6 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 6 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 6 +- .../binder/data/FloatlinesCompositionBinder.java | 4 +- .../binder/data/GearUseFeaturesLonglineBinder.java | 6 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 +- .../GearUseFeaturesMeasurementSeineBinder.java | 4 +- .../binder/data/GearUseFeaturesSeineBinder.java | 6 +- .../binder/data/HooksCompositionBinder.java | 4 +- .../services/binder/data/NonTargetCatchBinder.java | 6 +- .../binder/data/NonTargetLengthBinder.java | 4 +- .../binder/data/NonTargetSampleBinder.java | 6 +- .../binder/data/ObjectObservedSpeciesBinder.java | 6 +- .../binder/data/ObjectSchoolEstimateBinder.java | 4 +- .../observe/services/binder/data/RouteBinder.java | 12 +- .../services/binder/data/RouteStubDtoBinder.java | 4 +- .../services/binder/data/SchoolEstimateBinder.java | 4 +- .../services/binder/data/SectionBinder.java | 4 +- .../services/binder/data/SensorUsedBinder.java | 4 +- .../services/binder/data/SetLonglineBinder.java | 12 +- .../binder/data/SetLonglineCatchDtoBinder.java | 6 +- .../SetLonglineDetailCompositionDtoBinder.java | 6 +- .../SetLonglineGlobalCompositionDtoBinder.java | 8 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../binder/data/SetLonglineTdrDtoBinder.java | 6 +- .../services/binder/data/SetSeineBinder.java | 12 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 4 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 8 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 6 +- .../services/binder/data/SizeMeasureBinder.java | 4 +- .../services/binder/data/TargetCatchBinder.java | 6 +- .../services/binder/data/TargetLengthBinder.java | 4 +- .../services/binder/data/TargetSampleBinder.java | 6 +- .../observe/services/binder/data/TdrBinder.java | 4 +- .../binder/data/TransmittingBuoyBinder.java | 4 +- .../binder/data/TripLonglineActivityDtoBinder.java | 4 +- .../services/binder/data/TripLonglineBinder.java | 8 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 6 +- .../services/binder/data/TripSeineBinder.java | 8 +- .../binder/data/TripSeineGearUseDtoBinder.java | 6 +- .../services/binder/data/WeightMeasureBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 22 +- .../observe/services/entity/EntitiesExtractor.java | 4 +- .../services/entity/EntitiesSetFactory.java | 32 +- .../entity/SpeciesListEntitiesExtractor.java | 4 +- .../DataSourceDumpProducerServiceTopia.java | 150 ----- .../services/service/DataSourceServiceTopia.java | 98 ++- .../services/service/ReferentialServiceTopia.java | 48 +- .../service/SqlScriptProducerServiceTopia.java | 145 +++++ .../service/actions/report/ReportServiceTopia.java | 18 +- .../GenerateValidatorDescriptorsFileTool.java | 19 +- .../actions/validate/ValidateServiceTopia.java | 23 +- .../ActivityLongLineEncouterServiceTopia.java | 9 +- .../ActivityLongLineSensorUsedServiceTopia.java | 9 +- .../longline/ActivityLonglineServiceTopia.java | 13 +- .../service/longline/BranchlineServiceTopia.java | 9 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +- .../SetLonglineDetailCompositionServiceTopia.java | 7 +- .../SetLonglineGlobalCompositionServiceTopia.java | 9 +- .../service/longline/SetLonglineServiceTopia.java | 7 +- .../services/service/longline/TdrServiceTopia.java | 9 +- .../longline/TripLonglineGearUseServiceTopia.java | 7 +- .../service/longline/TripLonglineServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 9 +- .../service/seine/ActivitySeineServiceTopia.java | 11 +- .../service/seine/FloatingObjectServiceTopia.java | 8 +- .../service/seine/NonTargetCatchServiceTopia.java | 6 +- .../service/seine/NonTargetSampleServiceTopia.java | 6 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 9 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 9 +- .../services/service/seine/RouteServiceTopia.java | 15 +- .../service/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../service/seine/TargetSampleServiceTopia.java | 6 +- .../TransmittingBuoyOperationServiceTopia.java | 9 +- .../seine/TripSeineGearUseServiceTopia.java | 13 +- .../service/seine/TripSeineServiceTopia.java | 9 +- .../referentiel/LengthWeightParemetersTest.java | 20 +- .../replication/ReplicateReferentialsTest.java | 32 + .../entities/replication/ReplicateTestSupport.java | 108 ++++ .../replication/ReplicateTripLonglineTest.java | 65 ++ .../replication/ReplicateTripSeineTest.java | 62 ++ .../services/ApplicationContextResource.java | 217 ++++--- .../ird/observe/services/DataSourceResource.java | 203 ++++--- .../services/ObserveServiceContextTopiaTaiste.java | 2 +- .../services/binder/BinderEngineMetadataTest.java | 49 +- .../observe/services/binder/BinderEngineTest.java | 29 +- .../services/service/AbstractServiceTopiaTest.java | 155 +---- .../DataSourceDumpProducerServiceTopiaTest.java | 85 --- .../service/DataSourceServiceTopiaTest.java | 43 +- .../services/service/MigrateTestsDatabases.java | 94 +++ .../service/ReferentialServiceTopiaTest.java | 37 +- .../service/SqlScriptProducerServiceTopiaTest.java | 81 +++ .../ConsolidateDataServiceTopiaTest.java | 23 +- .../report/AbstractReportServiceTopiaTest.java | 28 +- .../report/ReportSetByAssociation2Test.java | 50 -- .../actions/validate/ValidateServiceTopiaTest.java | 26 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 35 +- .../service/seine/RouteServiceTopiaTest.java | 27 +- .../seine/TargetSampleServiceTopiaTest.java | 22 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 37 +- .../service/seine/TripSeineServiceTopiaTest.java | 104 ++-- .../src/test/resources/log4j.properties | 2 + observe-test-data/pom.xml | 28 +- .../java/fr/ird/observe/test/DatabaseName.java | 13 + .../java/fr/ird/observe/test/ObserveFixtures.java | 311 ++++++++++ .../main/java/fr/ird/observe/test/TestHelper.java | 61 +- .../test/spi/CopyDatabaseConfiguration.java | 17 + .../test/spi/DatabaseNameConfiguration.java | 21 + .../test/spi/DatabaseVersionConfiguration.java | 19 + .../resources/db/5.0-3/dataForTestLongline.sql.gz | Bin 0 -> 1579146 bytes .../resources/db/5.0-3/dataForTestSeine.sql.gz | Bin 0 -> 439122 bytes .../src/main/resources/db/5.0-3/empty.sql.gz | Bin 0 -> 7858 bytes .../src/main/resources/db/5.0-3/referentiel.sql.gz | Bin 0 -> 162896 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 438481 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 142316 bytes pom.xml | 11 +- 254 files changed, 4523 insertions(+), 2665 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.