This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3800f292fed0f97dbd270cf1c80ae39e66434f77 Merge: e9095b6 8cf674f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 08:45:01 2016 +0200 Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop .../echobase/entities/ImportFileIdTopiaDao.java | 2 +- .../echobase/entities/ImportFileTopiaDao.java | 15 +++- .../echobase/entities/ImportLogTopiaDao.java | 6 +- .../entities/data/GearMetadataValueImpl.java | 18 ++++ .../entities/data/OperationMetadataValueImpl.java | 19 +++++ .../java/fr/ifremer/echobase/io/InputFile.java | 20 +++++ .../echobase/persistence/EchoBaseDbMeta.java | 5 ++ .../WorkingDbMigrationCallBackForVersion3_903.java | 33 ++++++++ .../workingDb/h2/3.903-0-add-naturalIds.sql | 2 + .../workingDb/pg/3.903-0-add-naturalIds.sql | 2 + echobase-domain/src/main/xmi/echobase.properties | 10 ++- echobase-domain/src/main/xmi/echobase.zargo | Bin 90458 -> 90445 bytes .../services/service/UserDbPersistenceService.java | 93 +++++++++++++++++++++ .../DuplicatedEchotypeAssociationException.java | 20 +++++ ...java => DuplicatedElementaryCellException.java} | 12 +-- ...ption.java => DuplicatedEsduCellException.java} | 12 +-- ...a => DuplicatedGearMetadataValueException.java} | 22 +++-- ...eption.java => DuplicatedMapCellException.java} | 12 +-- ...tion.java => DuplicatedOperationException.java} | 14 ++-- ...DuplicatedOperationMetadataValueException.java} | 15 ++-- ...ion.java => DuplicatedRegionCellException.java} | 12 +-- ...plicatedResultsVoyageLengthAgeKeyException.java | 20 +++++ ...catedResultsVoyageLengthWeightKeyException.java | 20 +++++ .../importdata/DuplicatedSampleException.java | 4 +- ...tion.java => DuplicatedSubSampleException.java} | 19 +++-- ...ption.java => DuplicatedTransectException.java} | 14 ++-- ...eption.java => DuplicatedTransitException.java} | 15 ++-- ...ception.java => DuplicatedVoyageException.java} | 14 ++-- .../importdata/MismatchVoyageException.java | 21 +++++ .../actions/ImportDataActionSupport.java | 8 +- .../actions/VoyageAcousticsImportAction.java | 18 +++- .../VoyageCatchesSubSampleImportAction.java | 12 +++ .../VoyageCatchesTotalSampleImportAction.java | 2 +- .../actions/VoyageCommonsTransectImportAction.java | 6 ++ .../actions/VoyageCommonsTransitImportAction.java | 8 +- .../actions/VoyageCommonsVoyageImportAction.java | 13 ++- .../VoyageOperationsGearMetadataImportAction.java | 24 ++++++ .../VoyageOperationsOperationImportAction.java | 6 ++ ...ageOperationsOperationMetadataImportAction.java | 13 ++- .../VoyageResultsMapFishCellImportAction.java | 15 +++- .../VoyageResultsMapOtherCellImportAction.java | 15 +++- .../actions/VoyageResultsRegionImportAction.java | 21 ++++- .../VoyageResultsVoyageEchotypeImportAction.java | 19 +++-- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 31 +++++++ ...geResultsVoyageLengthWeightKeyImportAction.java | 38 ++++++++- .../service/removedata/RemoveDataService.java | 6 +- .../strategy/AbstractRemoveDataStrategy.java | 15 ++-- .../strategy/OperationRemoveDataStrategy.java | 25 +++++- .../i18n/echobase-services_en_GB.properties | 17 +++- .../i18n/echobase-services_fr_FR.properties | 15 ++++ .../removedata/AbstractRemoveDataServiceTest.java | 6 ++ .../actions/importData/ConfigureCommonImport.java | 2 +- .../jsp/importData/importDataActionResult.jsp | 2 +- .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- 57 files changed, 672 insertions(+), 144 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.