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 69fac2b62057e0be1f2e3a79582e2a9ad0bbe952 Merge: 8d70e7d 31acffd Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 17 18:49:18 2016 +0100 Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 47 +- .../persistence/TuttiPersistenceNoDbImpl.java | 40 + .../tutti/persistence/dao/TaxonNameDaoTutti.java | 14 + .../persistence/dao/TaxonNameDaoTuttiImpl.java | 85 ++ .../service/ProgramPersistenceService.java | 1 + .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../referential/GearPersistenceService.java | 15 +- .../referential/GearPersistenceServiceImpl.java | 42 +- .../referential/LocationPersistenceService.java | 10 +- .../LocationPersistenceServiceImpl.java | 129 +- .../referential/PersonPersistenceService.java | 14 +- .../referential/PersonPersistenceServiceImpl.java | 32 +- .../ReferentialPersistenceServiceSupport.java | 24 +- .../referential/SpeciesPersistenceService.java | 13 +- .../referential/SpeciesPersistenceServiceImpl.java | 41 +- .../referential/VesselPersistenceService.java | 13 +- .../referential/VesselPersistenceServiceImpl.java | 134 +- .../tutti/persistence/test/DatabaseResource.java | 11 - .../resources/applicationContext-service-tutti.xml | 32 +- .../src/main/resources/queries-failsafe.hbm.xml | 187 ++- .../ifremer/tutti/service/PersistenceService.java | 40 + .../service/TuttiValidationDataContextSupport.java | 8 +- .../service/csv/CaracteristicParserFormatter.java | 5 + .../service/csv/EntityParserFormatterSupport.java | 15 +- .../FishingOperationLocationParserFormatter.java | 5 + .../csv/FishingOperationStrataParserFormatter.java | 5 + .../FishingOperationSubStrataParserFormatter.java | 5 + .../tutti/service/csv/GearParserFormatter.java | 5 + .../tutti/service/csv/HarbourParserFormatter.java | 5 + .../tutti/service/csv/PersonParserFormatter.java | 5 + .../tutti/service/csv/ProgramParserFormatter.java | 5 + .../tutti/service/csv/SpeciesParserFormatter.java | 5 + .../tutti/service/csv/VesselParserFormatter.java | 5 + .../GenericFormatImportConfiguration.java | 10 + .../GenericFormatImportEntityParserFactory.java | 17 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../ifremer/tutti/service/ServiceDbResource.java | 20 +- .../service/bigfin/BigfinImportService2Test.java | 1 - .../GenericFormatImportServiceTest.java | 3 +- .../GenericFormatImportServiceValidTest.java | 40 +- .../test/resources/genericFormat/catch/catch.csv | 866 ++++++------ .../test/resources/genericFormat/default/catch.csv | 866 ++++++------ .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/marineLitter/marineLitter.csv | 8 +- .../genericFormat/operation/operation.csv | 6 +- .../referentials/temporarySpecies.csv | 18 +- .../test/resources/genericFormat/survey/survey.csv | 4 +- .../genericFormat/withObsoletes/catch.csv | 16 + .../{empty => withObsoletes}/operation.csv | 3 +- .../withObsoletes/protocol.tuttiProtocol | 197 +++ .../genericFormat/withObsoletes/sampleCategory.csv | 9 + .../genericFormat/withObsoletes/survey.csv | 2 + .../genericFormat/withObsoletes/temporaryGears.csv | 1 + .../withObsoletes/temporaryPersons.csv | 1 + .../withObsoletes/temporarySpecies.csv | 11 + .../withObsoletes/temporaryVessels.csv | 1 + .../filtered-resources/tutti-help-fr.properties | 5 +- .../actions/AbstractChangeScreenAction.java | 44 + .../actions/OpenGenericFormatImportScreen.java | 2 +- .../genericformat/GenericFormatImportUI.jaxx | 5 + .../genericformat/GenericFormatImportUI.jcss | 7 + .../GenericFormatImportUIHandler.java | 14 +- .../genericformat/GenericFormatImportUIModel.java | 16 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 70 files changed, 2148 insertions(+), 2992 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.