This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git omits 2d5093f Merge branch 'release/3.6' omits f75075e add license headers omits d1f04a9 [jgitflow-maven-plugin]updating poms for branch'release/3.6' with non-snapshot versions omits b9e54a8 [jgitflow-maven-plugin]updating poms for branch '3.6' with snapshot versions omits 7c08015 amelioration doc de release omits 2dd7f2a amelioration doc de release omits 78e6342 fix Léo email omits 3bb3cb4 improve .gitignore omits 9e4538c use last jre available 1.7u65 omits d84af15 refs #5474 use codelutinpom 1.1 omits 2b97140 refs #5474 make jar executable + update some docs omits ed4c8d6 Merge branch 'feature/5474' into develop fixes #5474 omits 0ffad8a refs #5474 using none central dependencies (fix profile activation) omits 7979070 refs #5474 update site configuration omits 2250baa refs #5474 using none central dependencies omits 9926871 refs #5474 update site configuration omits 032ae88 refs #5474 fix test + migrates to codelutinpom omits e8678d1 Merge branch 'feature/5335' into develop fixes #5335 [REFERENTIELS] Remplacement des référentiels temporaires omits 923287d refs #5335 add refresh button on editCruise and editProgram + finish feature omits d47ad33 refs #5335 add validation of cruise omits fc13712 refs #5335 use new validators in ui validate action + fix i18n omits 618e58b refs #5335 add validators files + use an edit validation context anywhere omits 98ff5b4 refs #5335 implements services + fix uis omits 63b38ee refs #5335 prepare all ui omits 8df9a66 migrate to git omits d17449b fixes #5173 omits 4a86eb5 fixes #5172: [TECH] Configurer la source des mises à jours de l'application en adéquation avec le type de version omits 2d6d688 [maven-release-plugin] prepare for next development iteration This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (32d5576) \ O -- O -- O (2d5093f) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .gitignore | 14 - README.txt | 26 +- pom.xml | 122 +++---- src/site/rst/dbversions.rst | 10 +- src/site/site_fr.xml | 41 ++- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 20 - .../persistence/TuttiPersistenceNoDbImpl.java | 20 - .../service/AbstractPersistenceService.java | 15 +- .../service/ReferentialPersistenceService.java | 49 +-- .../service/ReferentialPersistenceServiceImpl.java | 133 +------ .../src/main/resources/queries-failsafe.hbm.xml | 192 ---------- tutti-service/pom.xml | 4 +- .../ifremer/tutti/service/PersistenceService.java | 35 -- .../ifremer/tutti/service/ValidationService.java | 78 +--- .../catches/ValidateCruiseOperationsService.java | 91 +---- .../service/catches/WeightComputingService.java | 4 +- .../TemporaryReferentialFieldValidator.java | 104 ------ ...on.xml => AccidentalBatch-error-validation.xml} | 2 +- .../AccidentalBatch-validate-fatal-validation.xml | 38 -- ...ation.xml => BenthosBatch-error-validation.xml} | 0 .../BenthosBatch-validate-fatal-validation.xml | 38 -- ...-validation.xml => Cruise-error-validation.xml} | 0 .../data/Cruise-validate-error-validation.xml | 128 ------- .../data/Cruise-validate-fatal-validation.xml | 56 --- .../FishingOperation-validate-fatal-validation.xml | 25 -- ...ndividualObservationBatch-error-validation.xml} | 8 +- ...lObservationBatch-validate-fatal-validation.xml | 38 -- ....xml => MarineLitterBatch-error-validation.xml} | 0 ...validation.xml => Program-error-validation.xml} | 0 ...ation.xml => SpeciesBatch-error-validation.xml} | 0 .../SpeciesBatch-validate-fatal-validation.xml | 38 -- .../resources/i18n/tutti-service_en_GB.properties | 22 -- .../resources/i18n/tutti-service_fr_FR.properties | 23 +- tutti-service/src/main/resources/validators.xml | 2 - .../tutti/service/BeanValidatorDetectorTest.java | 40 +- .../tutti/service/PersistenceServiceTest.java | 404 --------------------- .../tutti/service/ValidationServiceTest.java | 7 +- tutti-ui-swing/pom.xml | 9 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 3 +- .../filtered-resources/tutti-help-fr.properties | 25 +- .../src/main/filtered-resources/tutti.config | 3 +- .../AbstractOpenReplaceTemporaryUIAction.java | 168 --------- .../action/AbstractReplaceTemporaryUIAction.java | 120 ------ .../tutti/ui/swing/action/AbstractTuttiAction.java | 2 - .../tutti/ui/swing/action/EditCruiseAction.java | 2 - ....java => EditCruiseFishingOperationAction.java} | 13 +- .../action/EditCruiseInValidationUIAction.java | 137 ------- .../ui/swing/action/EditSelectedCruiseAction.java | 2 - .../tutti/ui/swing/action/NewCruiseAction.java | 2 - .../tutti/ui/swing/action/NewProgramAction.java | 2 - .../action/OpenReplaceTemporaryGearUIAction.java | 73 ---- .../action/OpenReplaceTemporaryPersonUIAction.java | 73 ---- .../OpenReplaceTemporarySpeciesUIAction.java | 72 ---- .../action/OpenReplaceTemporaryVesselUIAction.java | 73 ---- .../swing/action/ReplaceTemporaryGearAction.java | 62 ---- .../swing/action/ReplaceTemporaryPersonAction.java | 62 ---- .../action/ReplaceTemporarySpeciesAction.java | 63 ---- .../swing/action/ReplaceTemporaryVesselAction.java | 63 ---- .../tutti/ui/swing/action/ResetCruiseAction.java | 64 ---- .../tutti/ui/swing/action/ResetProgramAction.java | 64 ---- .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 10 - .../ui/swing/content/cruise/EditCruiseUI.jaxx | 3 +- .../swing/content/cruise/EditCruiseUIHandler.java | 35 -- .../ui/swing/content/cruise/EditCruiseUIModel.java | 19 - .../ui/swing/content/cruise/ValidateCruiseUI.css | 4 - .../ui/swing/content/cruise/ValidateCruiseUI.jaxx | 9 +- .../content/cruise/ValidateCruiseUIHandler.java | 204 ++++++----- .../content/cruise/ValidateCruiseUIModel.java | 100 ++--- .../swing/content/cruise/tree/CruiseTreeNode.java | 98 ----- .../swing/content/cruise/tree/MessageTreeNode.java | 57 --- .../content/cruise/tree/OperationTreeNode.java | 97 ----- .../cruise/tree/ValidationTreeCellRenderer.java | 88 ----- .../accidental/AccidentalBatchUIHandler.java | 3 +- .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchUIHandler.java | 3 +- .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../ui/swing/content/program/EditProgramUI.css | 10 - .../ui/swing/content/program/EditProgramUI.jaxx | 3 +- .../content/program/EditProgramUIHandler.java | 15 +- .../referential/ManageTemporaryReferentialUI.css | 32 -- .../referential/ManageTemporaryReferentialUI.jaxx | 4 - .../replace/AbstractReplaceTemporaryUI.css | 77 ---- .../replace/AbstractReplaceTemporaryUI.jaxx | 90 ----- .../replace/AbstractReplaceTemporaryUIModel.java | 104 ------ .../referential/replace/ReplaceTemporaryGearUI.css | 31 -- .../replace/ReplaceTemporaryGearUI.jaxx | 38 -- .../replace/ReplaceTemporaryGearUIHandler.java | 85 ----- .../replace/ReplaceTemporaryGearUIModel.java | 39 -- .../replace/ReplaceTemporaryPersonUI.css | 31 -- .../replace/ReplaceTemporaryPersonUI.jaxx | 38 -- .../replace/ReplaceTemporaryPersonUIHandler.java | 85 ----- .../replace/ReplaceTemporaryPersonUIModel.java | 39 -- .../replace/ReplaceTemporarySpeciesUI.css | 31 -- .../replace/ReplaceTemporarySpeciesUI.jaxx | 38 -- .../replace/ReplaceTemporarySpeciesUIHandler.java | 85 ----- .../replace/ReplaceTemporarySpeciesUIModel.java | 39 -- .../replace/ReplaceTemporaryVesselUI.css | 31 -- .../replace/ReplaceTemporaryVesselUI.jaxx | 38 -- .../replace/ReplaceTemporaryVesselUIHandler.java | 85 ----- .../replace/ReplaceTemporaryVesselUIModel.java | 39 -- ...ml => EditCruiseUIModel-warning-validation.xml} | 0 ...actReplaceTemporaryUIModel-error-validation.xml | 45 --- .../resources/i18n/tutti-ui-swing_en_GB.properties | 87 ----- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 46 --- .../icons/action-observed_fishing_trip.png | Bin 3348 -> 0 bytes .../src/main/resources/icons/action-replace.png | Bin 512 -> 0 bytes .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 110 files changed, 329 insertions(+), 4683 deletions(-) delete mode 100644 .gitignore delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/validator/TemporaryReferentialFieldValidator.java rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{AccidentalBatch-edit-error-validation.xml => AccidentalBatch-error-validation.xml} (93%) delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-validate-fatal-validation.xml rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{BenthosBatch-edit-error-validation.xml => BenthosBatch-error-validation.xml} (100%) delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-validate-fatal-validation.xml rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{Cruise-edit-error-validation.xml => Cruise-error-validation.xml} (100%) delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-validate-error-validation.xml delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-validate-fatal-validation.xml rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{IndividualObservationBatch-edit-error-validation.xml => IndividualObservationBatch-error-validation.xml} (83%) delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-validate-fatal-validation.xml rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{MarineLitterBatch-edit-error-validation.xml => MarineLitterBatch-error-validation.xml} (100%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{Program-edit-error-validation.xml => Program-error-validation.xml} (100%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{SpeciesBatch-edit-error-validation.xml => SpeciesBatch-error-validation.xml} (100%) delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-validate-fatal-validation.xml delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{EditFishingOperationInValidationUIAction.java => EditCruiseFishingOperationAction.java} (96%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ResetCruiseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ResetProgramAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/CruiseTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/MessageTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/OperationTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/ValidationTreeCellRenderer.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.css delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.css delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.css delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.css delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIModel.java rename tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/{EditCruiseUIModel-edit-warning-validation.xml => EditCruiseUIModel-warning-validation.xml} (100%) delete mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUIModel-error-validation.xml delete mode 100644 tutti-ui-swing/src/main/resources/icons/action-observed_fishing_trip.png delete mode 100644 tutti-ui-swing/src/main/resources/icons/action-replace.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.