This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e0ab45ed89d9763f7bdffaf561993673639244de Merge: 2753759 16be1d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 17:59:22 2016 +0200 On peut de nouveau faire des releases \oo/ Merge branch 'feature/fix_nightly_build' into develop observe-application-swing/pom.xml | 8 - .../src/main/assembly/bin.xml | 8 +- .../fr/ird/observe/ObserveOpenDataManager.java | 22 + .../java/fr/ird/observe/ObserveTextGenerator.java | 22 + .../ObserveSwingApplicationConfig.java | 4 +- .../ObserveSwingApplicationConfigProvider.java | 22 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 22 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 1 - .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 4 - .../observe/ui/actions/AbstractObserveAction.java | 22 + .../actions/shared/MoveTripLonglinesUIAction.java | 22 + .../ui/actions/shared/MoveTripSeinesUIAction.java | 22 + .../java/fr/ird/observe/ui/admin/AdminStep.java | 21 - .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 41 -- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 6 - .../fr/ird/observe/ui/admin/config/ConfigUI.jcss | 6 - .../observe/ui/admin/gps/GPSAbleTableModel.java | 162 ------ .../ui/admin/gps/GPSActivityTableModel.java | 302 ---------- .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 93 ---- .../observe/ui/admin/gps/ImportGPSConfigUI.jcss | 69 --- .../ird/observe/ui/admin/gps/ImportGPSModel.java | 105 ---- .../fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx | 145 ----- .../fr/ird/observe/ui/admin/gps/ImportGPSUI.jcss | 66 --- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 607 --------------------- .../synchronize/ObsoleteReferentialReference.java | 22 + .../validate/ValidationMessageTableModel.java | 22 + .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../ird/observe/ui/storage/StorageUILauncher.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../loadors/AbstractDataReferenceChildLoador.java | 22 + .../MoveActivityLonglineNodeMenuPopulator.java | 22 + .../menu/MoveActivitySeineNodeMenuPopulator.java | 22 + .../ui/tree/menu/MoveNodeMenuPopulator.java | 22 + .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 22 + .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 22 + .../ird/observe/ui/util/DecoratedNodeEntity.java | 22 + .../ui/util/decorator/DataReferenceDecorator.java | 22 + .../decorator/ReferentialReferenceDecorator.java | 22 + ...nlineTableAutotSelectRowAndShowPopupAction.java | 22 + .../main/resources/ftl/connexionTestResult_fr.ftl | 21 + .../ftl/dataSourceConnectionReport_fr.ftl | 21 + .../resources/ftl/dataSourceInformation_fr.ftl | 21 + .../src/main/resources/ftl/dataSourcePolicy_fr.ftl | 21 + .../ftl/dataSourceSelectModeResume_fr.ftl | 21 + .../ftl/storageModelDataSourceConfiguration_fr.ftl | 21 + .../v1/SqlScriptProducerServiceController.java | 22 + .../v1/longline/BranchlineServiceController.java | 22 + .../application/web/injector/DateInjector.java | 22 + .../web/injector/ObserveClassInjector.java | 22 + .../ObserveReferenceSetRequestInjector.java | 22 + .../injector/SqlScriptProducerRequestInjector.java | 22 + .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 22 + .../observe/entities/LastUpdateDateTopiaDao.java | 22 + .../java/fr/ird/observe/entities/TripMapPoint.java | 22 + .../observe/entities/longline/BasketTopiaDao.java | 22 + .../entities/longline/BranchlineTopiaDao.java | 22 + .../observe/entities/longline/SectionTopiaDao.java | 22 + .../observe/entities/referentiel/ProgramImpl.java | 22 + .../observe/entities/seine/NonTargetCatchs.java | 22 + .../observe/entities/seine/NonTargetLenghts.java | 22 + .../ird/observe/entities/seine/TargetCatchs.java | 22 + .../ird/observe/entities/seine/TargetLenghts.java | 22 + .../V4_901_01_add_lastUpdateDate_field-H2.sql | 21 + .../V4_901_01_add_lastUpdateDate_field-PG.sql | 21 + .../V4_902_01_add_lastUpdateDate_table-H2.sql | 21 + .../V4_902_01_add_lastUpdateDate_table-PG.sql | 21 + .../migration/V4_903_01_remove_unit_field-H2.sql | 21 + .../migration/V4_903_01_remove_unit_field-PG.sql | 21 + .../migration/V4_903_02_remove_gender_field-H2.sql | 21 + .../migration/V4_903_02_remove_gender_field-PG.sql | 21 + .../V4_903_03_remove_duplicate_rows-H2.sql | 21 + .../V4_903_03_remove_duplicate_rows-PG.sql | 21 + observe-services-api/pom.xml | 8 + .../services/ObserveSpeciesListConfiguration.java | 22 + .../observe/services/http/ObserveHttpError.java | 22 + .../services/service/BabModelVersionException.java | 22 + .../service/ConcurrentModificationException.java | 22 + .../services/service/ObserveReferentialCache.java | 22 + .../services/service/ReferenceSetsRequest.java | 22 + .../services/service/SqlScriptProducerRequest.java | 22 + .../services/service/SqlScriptProducerService.java | 22 + .../actions/synchro/LocalReferentialStates.java | 22 + .../actions/synchro/RemoteReferentialDiff.java | 22 + ...ionalReferentialSynchronizeCallbackRequest.java | 22 + ...onalReferentialSynchronizeCallbackRequests.java | 22 + ...tionalReferentialSynchronizeCallbackResult.java | 22 + ...ionalReferentialSynchronizeCallbackResults.java | 22 + ...nidirectionalReferentialSynchronizeContext.java | 22 + ...UnidirectionalReferentialSynchronizeEngine.java | 24 +- ...ectionalReferentialSynchronizeLocalService.java | 22 + ...ctionalReferentialSynchronizeRemoteService.java | 22 + ...nidirectionalReferentialSynchronizeRequest.java | 22 + ...UnidirectionalReferentialSynchronizeResult.java | 22 + .../actions/validate/ValidateResultForDtos.java | 22 + .../actions/validate/ValidateServiceUtils.java | 22 + .../service/actions/validate/ValidatorDto.java | 22 + .../service/actions/validate/ValidatorDtos.java | 22 + .../service/longline/BranchlineService.java | 22 + .../fr/ird/observe/services/util/I18nEnumUtil.java | 22 + .../src/license/THIRD-PARTY.properties | 19 - ...bserveDataSourceConfigurationAndConnection.java | 22 + .../ObserveDataSourceInformation.java | 22 + .../configuration/ObserveDataSourceType.java | 22 + .../src/license/THIRD-PARTY.properties | 23 - .../src/license/THIRD-PARTY.properties | 20 - .../observe/services/dto/AbstractReference.java | 22 + .../fr/ird/observe/services/dto/DataReference.java | 22 + .../fr/ird/observe/services/dto/ImportDataDto.java | 22 + .../observe/services/dto/ObserveDbUserDtos.java | 22 + .../services/dto/UnauthorizedException.java | 22 + .../services/dto/constants/ObserveDbRole.java | 22 + .../ird/observe/services/dto/gson/BlobAdapter.java | 22 + .../ird/observe/services/dto/gson/FormAdapter.java | 22 + .../observe/services/dto/gson/VersionAdapter.java | 22 + .../gson/reference/DataReferenceSetAdapter.java | 22 + .../reference/ReferentialReferenceSetAdapter.java | 22 + .../services/dto/longline/ActivityLonglineDto.java | 22 + .../observe/services/dto/longline/BasketDto.java | 22 + .../services/dto/longline/BranchlineDto.java | 22 + .../GearUseFeaturesMeasurementLonglineDto.java | 22 + .../dto/longline/LonglinePositionSetDto.java | 22 + .../longline/SetLonglineGlobalCompositionDto.java | 22 + .../dto/reference/DataReferenceSetDefinitions.java | 22 + .../dto/reference/ReferenceBinderEngine.java | 22 + .../reference/ReferenceBinderEngineSupplier.java | 22 + .../dto/reference/ReferenceSetDefinition.java | 22 + .../ReferentialReferenceSetDefinitions.java | 22 + .../request/ReferenceSetRequestDefinition.java | 22 + .../request/ReferenceSetRequestDefinitions.java | 22 + .../request/ReferenceSetRequestKeyDefinition.java | 22 + .../dto/referential/GearCaracteristicTypeDtos.java | 22 + .../dto/referential/I18nReferentialDto.java | 22 + .../dto/referential/I18nReferentialDtos.java | 22 + .../services/dto/referential/PersonDtos.java | 22 + .../services/dto/referential/ProgramDto.java | 22 + .../services/dto/referential/ProgramDtos.java | 22 + .../services/dto/referential/ReferentialDto.java | 22 + .../services/dto/referential/ReferentialDtos.java | 22 + .../dto/referential/ReferentialReference.java | 22 + .../dto/referential/ReferentialReferences.java | 22 + .../services/dto/referential/SpeciesListDto.java | 22 + .../services/dto/referential/VesselDtos.java | 22 + .../longline/VesselActivityLonglineDtos.java | 22 + .../referential/seine/VesselActivitySeineDtos.java | 22 + .../dto/referential/seine/WeightCategoryDtos.java | 22 + .../observe/services/dto/result/SaveResultDto.java | 22 + .../services/dto/result/SaveResultDtos.java | 22 + .../dto/result/TripChildSaveResultDtos.java | 22 + .../services/dto/seine/ActivitySeineDto.java | 22 + .../services/dto/seine/ActivitySeineStubDto.java | 22 + .../seine/FloatingObjectTransmittingBuoyDto.java | 22 + .../seine/GearUseFeaturesMeasurementSeineDto.java | 22 + .../ird/observe/services/dto/seine/RouteDto.java | 22 + .../observe/services/dto/seine/SetSeineDto.java | 22 + .../services/dto/seine/TargetCatchDtos.java | 22 + .../services/dto/seine/TargetLengthDto.java | 22 + .../observe/services/dto/seine/TripSeineDto.java | 22 + .../observe/services/ObserveHttpErrorAdapter.java | 22 + .../services/ObserveServiceRestErrorException.java | 22 + .../service/ReferenceValuesSetServiceRestTest.java | 22 + .../service/ReferentialServiceRestTest.java | 22 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 22 + .../observe/services/ObserveSecurityHelper.java | 22 + .../ird/observe/services/binder/BinderEngine.java | 22 + .../services/binder/BinderEngineInitializer.java | 22 + .../ird/observe/services/binder/BinderSupport.java | 22 + .../binder/ReferenceBinderEngineSupplierTopia.java | 22 + .../binder/data/ActivityLonglineBinder.java | 22 + .../data/ActivityLonglineEncouterDtoBinder.java | 22 + .../data/ActivityLonglineSensorUsedDtoBinder.java | 22 + .../binder/data/ActivityLonglineStubDtoBinder.java | 22 + .../services/binder/data/ActivitySeineBinder.java | 22 + .../data/ActivitySeineObservedSystemDtoBinder.java | 22 + .../binder/data/ActivitySeineStubDtoBinder.java | 22 + .../binder/data/BaitsCompositionBinder.java | 22 + .../observe/services/binder/data/BasketBinder.java | 22 + .../services/binder/data/BranchlineBinder.java | 22 + .../binder/data/BranchlinesCompositionBinder.java | 22 + .../services/binder/data/CatchLonglineBinder.java | 22 + .../services/binder/data/DataBinderSupport.java | 22 + .../services/binder/data/EncounterBinder.java | 22 + .../services/binder/data/FloatingObjectBinder.java | 22 + .../FloatingObjectObservedSpeciesDtoBinder.java | 22 + .../FloatingObjectSchoolEstimateDtoBinder.java | 22 + .../FloatingObjectTransmittingBuoyDtoBinder.java | 22 + .../binder/data/FloatlinesCompositionBinder.java | 22 + .../binder/data/GearUseFeaturesLonglineBinder.java | 22 + .../GearUseFeaturesMeasurementLonglineBinder.java | 22 + .../GearUseFeaturesMeasurementSeineBinder.java | 22 + .../binder/data/GearUseFeaturesSeineBinder.java | 22 + .../binder/data/HooksCompositionBinder.java | 22 + .../services/binder/data/NonTargetCatchBinder.java | 22 + .../binder/data/NonTargetLengthBinder.java | 22 + .../binder/data/NonTargetSampleBinder.java | 22 + .../binder/data/ObjectObservedSpeciesBinder.java | 22 + .../binder/data/ObjectSchoolEstimateBinder.java | 22 + .../observe/services/binder/data/RouteBinder.java | 22 + .../services/binder/data/RouteStubDtoBinder.java | 22 + .../services/binder/data/SchoolEstimateBinder.java | 22 + .../services/binder/data/SectionBinder.java | 22 + .../services/binder/data/SensorUsedBinder.java | 22 + .../services/binder/data/SetLonglineBinder.java | 22 + .../binder/data/SetLonglineCatchDtoBinder.java | 22 + .../SetLonglineDetailCompositionDtoBinder.java | 22 + .../SetLonglineGlobalCompositionDtoBinder.java | 22 + .../binder/data/SetLonglineStubDtoBinder.java | 22 + .../binder/data/SetLonglineTdrDtoBinder.java | 22 + .../services/binder/data/SetSeineBinder.java | 22 + .../data/SetSeineNonTargetCatchDtoBinder.java | 22 + .../data/SetSeineSchoolEstimateDtoBinder.java | 22 + .../binder/data/SetSeineTargetCatchDtoBinder.java | 22 + .../services/binder/data/SizeMeasureBinder.java | 22 + .../services/binder/data/TargetCatchBinder.java | 22 + .../services/binder/data/TargetLengthBinder.java | 22 + .../services/binder/data/TargetSampleBinder.java | 22 + .../observe/services/binder/data/TdrBinder.java | 22 + .../binder/data/TransmittingBuoyBinder.java | 22 + .../binder/data/TripLonglineActivityDtoBinder.java | 22 + .../services/binder/data/TripLonglineBinder.java | 22 + .../binder/data/TripLonglineGearUseDtoBinder.java | 22 + .../services/binder/data/TripSeineBinder.java | 22 + .../binder/data/TripSeineGearUseDtoBinder.java | 22 + .../services/binder/data/WeightMeasureBinder.java | 22 + .../referential/BaitHaulingStatusBinder.java | 22 + .../referential/BaitSettingStatusBinder.java | 22 + .../binder/referential/BaitTypeBinder.java | 22 + .../referential/CatchFateLonglineBinder.java | 22 + .../services/binder/referential/CountryBinder.java | 22 + .../binder/referential/DetectionModeBinder.java | 22 + .../binder/referential/EncounterTypeBinder.java | 22 + .../services/binder/referential/FpaZoneBinder.java | 22 + .../services/binder/referential/GearBinder.java | 22 + .../referential/GearCaracteristicBinder.java | 22 + .../referential/GearCaracteristicTypeBinder.java | 22 + .../services/binder/referential/HarbourBinder.java | 22 + .../binder/referential/HealthnessBinder.java | 22 + .../binder/referential/HookPositionBinder.java | 22 + .../binder/referential/HookSizeBinder.java | 22 + .../binder/referential/HookTypeBinder.java | 22 + .../referential/ItemHorizontalPositionBinder.java | 22 + .../referential/ItemVerticalPositionBinder.java | 22 + .../referential/LengthWeightParameterBinder.java | 22 + .../binder/referential/LightsticksColorBinder.java | 22 + .../binder/referential/LightsticksTypeBinder.java | 22 + .../binder/referential/LineTypeBinder.java | 22 + .../binder/referential/MaturityStatusBinder.java | 22 + .../binder/referential/MitigationTypeBinder.java | 22 + .../binder/referential/ObjectFateBinder.java | 22 + .../binder/referential/ObjectOperationBinder.java | 22 + .../binder/referential/ObjectTypeBinder.java | 22 + .../binder/referential/ObservedSystemBinder.java | 22 + .../services/binder/referential/OceanBinder.java | 22 + .../binder/referential/OrganismBinder.java | 22 + .../services/binder/referential/PersonBinder.java | 22 + .../services/binder/referential/ProgramBinder.java | 22 + .../binder/referential/ReasonForDiscardBinder.java | 22 + .../referential/ReasonForNoFishingBinder.java | 22 + .../binder/referential/ReasonForNullSetBinder.java | 22 + .../referential/ReferentialBinderSupport.java | 22 + .../binder/referential/SensorBrandBinder.java | 22 + .../binder/referential/SensorDataFormatBinder.java | 22 + .../binder/referential/SensorTypeBinder.java | 22 + .../binder/referential/SettingShapeBinder.java | 22 + .../services/binder/referential/SexBinder.java | 22 + .../binder/referential/SizeMeasureTypeBinder.java | 22 + .../services/binder/referential/SpeciesBinder.java | 22 + .../binder/referential/SpeciesFateBinder.java | 22 + .../binder/referential/SpeciesGroupBinder.java | 22 + .../binder/referential/SpeciesListBinder.java | 22 + .../binder/referential/SpeciesStatusBinder.java | 22 + .../binder/referential/StomacFullnessBinder.java | 22 + .../referential/SurroundingActivityBinder.java | 22 + .../TransmittingBuoyOperationBinder.java | 22 + .../referential/TransmittingBuoyTypeBinder.java | 22 + .../binder/referential/TripTypeBinder.java | 22 + .../referential/VesselActivityLonglineBinder.java | 22 + .../referential/VesselActivitySeineBinder.java | 22 + .../services/binder/referential/VesselBinder.java | 22 + .../referential/VesselSizeCategoryBinder.java | 22 + .../binder/referential/VesselTypeBinder.java | 22 + .../binder/referential/WeightCategoryBinder.java | 22 + .../referential/WeightMeasureTypeBinder.java | 22 + .../services/binder/referential/WindBinder.java | 22 + .../services/entity/BasketEntitiesExtractor.java | 22 + .../entity/BranchlineEntitiesExtractor.java | 22 + .../observe/services/entity/EntitiesExtractor.java | 22 + .../services/entity/EntitiesSetFactory.java | 22 + .../services/entity/SectionEntitiesExtractor.java | 22 + .../entity/SpeciesListEntitiesExtractor.java | 22 + .../entity/SpeciesListOceanEntitiesExtractor.java | 22 + .../observe/services/entity/TripMapDtoFactory.java | 22 + .../service/SqlScriptProducerServiceTopia.java | 22 + .../synchro/DeleteSqlStatementGenerator.java | 22 + .../synchro/InsertSqlStatementGenerator.java | 24 +- .../synchro/ReplaceSqlStatementGenerator.java | 22 + ...nalReferentialSynchronizeLocalServiceTopia.java | 22 + ...alReferentialSynchronizeRemoteServiceTopia.java | 22 + .../synchro/UpdateSqlStatementGenerator.java | 24 +- .../GenerateValidatorDescriptorsFileTool.java | 22 + .../service/longline/BranchlineServiceTopia.java | 22 + .../longline/LonglinePositionSetDtoHelper.java | 22 + .../service/seine/TargetCatchServiceTopia.java | 22 + .../service/actions/validate/validators.json | 21 + .../replication/ReplicateReferentialsTest.java | 22 + .../entities/replication/ReplicateTestSupport.java | 22 + .../replication/ReplicateTripLonglineTest.java | 22 + .../replication/ReplicateTripSeineTest.java | 22 + .../ObserveDataSourceConnectionTopiaTaiste.java | 22 + .../services/binder/BinderEngineMetadataTest.java | 22 + .../observe/services/binder/BinderEngineTest.java | 22 + .../services/binder/ReferenceBinderEngineTest.java | 22 + .../services/service/AbstractServiceTopiaTest.java | 22 + .../services/service/MigrateTestsDatabases.java | 22 + .../fr/ird/observe/services/service/RigthTest.java | 22 + .../service/SqlScriptProducerServiceTopiaTest.java | 22 + .../UnidirectionalSynchronizeReferentialTest.java | 22 + .../java/fr/ird/observe/test/DatabaseName.java | 22 + .../java/fr/ird/observe/test/ObserveFixtures.java | 22 + .../test/spi/CopyDatabaseConfiguration.java | 22 + .../test/spi/CopyDatabaseConfigurations.java | 22 + .../ird/observe/test/spi/DatabaseClassifier.java | 22 + .../test/spi/DatabaseNameConfiguration.java | 22 + .../test/spi/DatabaseNameConfigurations.java | 22 + .../test/spi/DatabaseVersionConfiguration.java | 22 + .../test/spi/DatabaseVersionConfigurations.java | 22 + .../src/main/resources/observetest.properties | 21 + .../support/TopiaMetadataModelSupportImpl.java | 8 +- .../persistence/metadata/TopiaMetadataEntity.java | 8 +- .../persistence/metadata/TopiaMetadataModel.java | 8 +- .../metadata/TopiaMetadataModelVisitor.java | 8 +- .../support/TopiaMetadataModelSupport.java | 8 +- .../topia/service/sql/batch/SqlRequests.java | 8 +- .../service/sql/batch/TopiaSqlBatchService.java | 8 +- .../batch/TopiaSqlBatchServiceConfiguration.java | 8 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 8 +- .../sql/batch/actions/AbstractSchemaAction.java | 8 +- .../sql/batch/actions/AbstractSchemaRequest.java | 8 +- .../sql/batch/actions/AbstractSqlAction.java | 8 +- .../sql/batch/actions/AbstractSqlRequest.java | 8 +- .../sql/batch/actions/AbstractTablesAction.java | 8 +- .../sql/batch/actions/AbstractTablesRequest.java | 8 +- .../sql/batch/actions/CreateSchemaAction.java | 8 +- .../sql/batch/actions/CreateSchemaRequest.java | 8 +- .../sql/batch/actions/DeleteTablesAction.java | 8 +- .../sql/batch/actions/DeleteTablesRequest.java | 8 +- .../sql/batch/actions/DropSchemaAction.java | 8 +- .../sql/batch/actions/DropSchemaRequest.java | 8 +- .../sql/batch/actions/ReplicateTablesAction.java | 8 +- .../sql/batch/actions/ReplicateTablesRequest.java | 8 +- .../batch/actions/TopiaSqlTableSelectArgument.java | 8 +- .../sql/batch/actions/UpdateTablesAction.java | 8 +- .../sql/batch/actions/UpdateTablesRequest.java | 8 +- .../service/sql/batch/tables/TopiaSqlTable.java | 8 +- .../service/sql/batch/tables/TopiaSqlTables.java | 10 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 8 +- .../templates/TopiaMetadataModelGenerator.java | 10 +- pom.xml | 10 - 358 files changed, 6769 insertions(+), 1843 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.