This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ed0767c fixes #6805: [REFERENTIEL] Incohérences lors de la modification des référentiels temporaires Merge branch 'feature/6805' into develop new d35b1de faire en sorte que les tests continue de fonctionner malgres le reusinage sur les départements new 7d963d7 pouvoir changer le modèle de catérogies depuis le service de persitence new 6f504b4 ajout test pour les parametres + suppression du test de validite des catégories new 8eb2beb reusinage du context + ajout du modèle de catégorisation dans le context + nettoyage a la fin de la validation ou import new c636f00 fixes #6868: [IMPORT GENERIQUE] Ne plus interferer avec le modèle de catégorisation de l'application lors de l'import générique Merge branch 'feature/6868' into develop 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 c636f0097109a77bdf2b04228e005e2627c22518 Merge: ed0767c 8eb2beb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:15:40 2015 +0100 fixes #6868: [IMPORT GENERIQUE] Ne plus interferer avec le modèle de catégorisation de l'application lors de l'import générique Merge branch 'feature/6868' into develop commit 8eb2beb9b45b0f693db06d2cf5b27066a8d05f4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:15:06 2015 +0100 reusinage du context + ajout du modèle de catégorisation dans le context + nettoyage a la fin de la validation ou import commit 6f504b476c71fb8402be3a91dbaa64b22c50f372 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:13:47 2015 +0100 ajout test pour les parametres + suppression du test de validite des catégories commit 7d963d747ed5006c103b8fc31a78369723f6c287 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:13:03 2015 +0100 pouvoir changer le modèle de catérogies depuis le service de persitence commit d35b1de22067b0a072069fd18538210657b07dfb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:12:33 2015 +0100 faire en sorte que les tests continue de fonctionner malgres le reusinage sur les départements Summary of changes: .../tutti/persistence/test/DatabaseResource.java | 11 + .../ifremer/tutti/service/PersistenceService.java | 6 + ...ntext.java => GenericFormatContextSupport.java} | 45 +- .../genericformat/GenericFormatImportContext.java | 478 +-------------------- .../GenericFormatImportEntityParserFactory.java | 4 +- .../genericformat/GenericFormatImportRequest.java | 10 +- .../genericformat/GenericFormatImportService.java | 14 +- .../GenericFormatImportValidationDataContext.java | 4 +- .../GenericFormatImportValidationHelper.java | 8 +- .../genericformat/GenericFormatResultSupport.java | 16 +- .../GenericFormatValidateFileContext.java | 13 +- .../consumer/CsvConsumerForAccidentalCatch.java | 4 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../consumer/CsvConsumerForGearCaracteristic.java | 4 +- .../CsvConsumerForIndividualObservation.java | 4 +- .../consumer/CsvConsumerForMarineLitter.java | 4 +- .../consumer/CsvConsumerForOperation.java | 4 +- .../consumer/CsvConsumerForParameter.java | 4 +- .../consumer/CsvConsumerForSampleCategory.java | 43 +- .../consumer/CsvConsumerForSurvey.java | 4 +- .../genericformat/csv/SampleCategoryRow.java | 4 + .../importactions/ImportActionSupport.java | 6 +- .../importactions/ImportProtocolAction.java | 4 +- .../importactions/ImportReferentialGearAction.java | 4 +- .../ImportReferentialPersonAction.java | 4 +- .../ImportReferentialSpeciesAction.java | 4 +- .../ImportReferentialVesselAction.java | 4 +- ...yAction.java => ImpotSampleCategoryAction.java} | 68 +-- .../importactions/RestoreAfterImportAction.java | 53 +++ .../importactions/RestoreAfterValidateAction.java | 86 ++++ .../ValidateAccidentalCatchAction.java | 4 +- .../importactions/ValidateCatchAction.java | 4 +- .../ValidateGearCaracteristicAction.java | 4 +- .../ValidateIndividualObservationAction.java | 4 +- .../importactions/ValidateMarineLitterAction.java | 4 +- .../importactions/ValidateOperationAction.java | 4 +- .../importactions/ValidateParameterAction.java | 4 +- .../importactions/ValidateSurveyAction.java | 4 +- .../resources/i18n/tutti-service_fr_FR.properties | 6 +- .../ifremer/tutti/service/ServiceDbResource.java | 17 + .../GenericFormatImportServiceValidTest.java | 55 ++- .../{default => parameter}/parameter.csv | 0 42 files changed, 381 insertions(+), 650 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatImportContext.java => GenericFormatContextSupport.java} (94%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/{ValidateSampleCategoryAction.java => ImpotSampleCategoryAction.java} (56%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java copy tutti-service/src/test/resources/genericFormat/{default => parameter}/parameter.csv (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.