- Tutti-commits - mailman.cloud.codelutin.com

[tutti] branch develop updated (02fb1cb -> 8d6645d)
by codelutin.com scm 15 Sep '14

15 Sep '14

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 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs new 49c3cff clean code new 8d6645d fix developer ids + use codelutinpom stable and jaxx snapshot The 2 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 8d6645dea46a2437d3dc132468cbb9049c1a0dfe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 15 11:06:11 2014 +0200 fix developer ids + use codelutinpom stable and jaxx snapshot commit 49c3cff1c298fc0e09ea4ffd870722ebf9c3d07a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 13 08:53:11 2014 +0200 clean code Summary of changes: pom.xml | 8 ++-- .../service/util/BatchPersistenceHelper.java | 44 ---------------------- .../persistence/service/util/BatchTreeHelper.java | 38 ------------------- 3 files changed, 4 insertions(+), 86 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[tutti] branch develop updated (7f31831 -> 02fb1cb)
by codelutin.com scm 13 Sep '14

13 Sep '14

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 7f31831 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon new 77f7b60 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs new 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs The 2 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 02fb1cb22d193447a394a18869654b205e58d9b1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 13 08:51:24 2014 +0200 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs commit 77f7b609268eaabbc392cc5e7ef516a8946debb2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 13 08:40:31 2014 +0200 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 101 +-------------------- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++ .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../i18n/tutti-persistence_en_GB.properties | 48 +--------- .../i18n/tutti-persistence_fr_FR.properties | 48 +--------- .../swing/content/config/TuttiConfigUIHandler.java | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 8 files changed, 27 insertions(+), 197 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[tutti] branch develop updated (4c4dde9 -> 7f31831)
by codelutin.com scm 12 Sep '14

12 Sep '14

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 4c4dde9 updates libraries new 7f31831 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon The 1 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 7f31831a98f5819e0845fc6129d8168a28f71e29 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 23:48:36 2014 +0200 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon Summary of changes: pom.xml | 5 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../tutti/persistence/test/DatabaseResource.java | 58 ++-------------------- ...ervice.technical.sanity.task.DatabaseSanityTask | 2 - ...ro.specific.ReferentialSynchroSpecificTableTask | 2 - .../src/main/filtered-resources/tutti.config | 1 + 6 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (fe0fa0d -> 4c4dde9)
by codelutin.com scm 12 Sep '14

12 Sep '14

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 fe0fa0d change the test data directory new 4c4dde9 updates libraries The 1 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 4c4dde9292519dff7ff3d70663543db5734fd07c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 12:29:12 2014 +0200 updates libraries Summary of changes: pom.xml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (e17cba0 -> fe0fa0d)
by codelutin.com scm 12 Sep '14

12 Sep '14

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 e17cba0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 17c4da0 fix gitignore new fe0fa0d change the test data directory The 2 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 fe0fa0dea7da9e5373219bd0d8b58ed681b26ce6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 12:27:02 2014 +0200 change the test data directory commit 17c4da0f88127fa779db1b7fb1c5e5194ddd2d1a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 12:24:00 2014 +0200 fix gitignore Summary of changes: .gitignore | 3 +- .../tutti/persistence/test/DatabaseResource.java | 86 +++++++++++----------- 2 files changed, 43 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[tutti] branch develop updated (2c0d6d8 -> e17cba0)
by codelutin.com scm 12 Sep '14

12 Sep '14

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 2c0d6d8 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version new db29ac1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions new ac55e81 fix release headers new b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions new e6e7c4e Merge branch 'release/3.7.3' new ebe5ef0 Merge branch 'master' into develop new e17cba0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 e17cba0ba4c49af6c2e1e30d997cffcfd274679f Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:45:58 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ebe5ef0bf2e256da64c7795ad529271a70b80fe5 Merge: db29ac1 e6e7c4e Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:45:57 2014 +0200 Merge branch 'master' into develop commit db29ac168619bac12084ea9bb1265a2c9b9da9ae Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:45:57 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e6e7c4e9bc54cdcd0275e57fc0444cbcb725ef17 Merge: 121d594 b69873e Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:45:54 2014 +0200 Merge branch 'release/3.7.3' commit b69873ec8e192380ed0cf414d4d830e36f1254b1 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:42:12 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions commit ac55e81a318bcd288eb8cfa5795fb6bbd0d27218 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:41:45 2014 +0200 fix release headers Summary of changes: .../main/java/fr/ifremer/tutti/util/DateTimes.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

[tutti] branch release/3.7.3 deleted (was b69873e)
by codelutin.com scm 12 Sep '14

12 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git was b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] annotated tag tutti-3.7.3 created (now 2c8a38c)
by codelutin.com scm 12 Sep '14

12 Sep '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git at 2c8a38c (tag) tagging e6e7c4e9bc54cdcd0275e57fc0444cbcb725ef17 (commit) replaces tutti-3.7.2 tagged by Maven Release on Fri Sep 12 08:45:55 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.7.3 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] branch release/3.7.3 updated (e66b6c8 -> b69873e)
by codelutin.com scm 12 Sep '14

12 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git from e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions adds ac55e81 fix release headers adds b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 24 ++++++++++++++++++++++ tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] branch master updated (121d594 -> e6e7c4e)
by codelutin.com scm 12 Sep '14

12 Sep '14

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 from 121d594 Merge branch 'release/3.7.2' adds 837e161 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds edc4144 Merge branch 'master' into develop adds 2f7ebe2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 941e73e fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début adds 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger adds 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 adds d1cdb0f fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié adds 1837edc this should not have been commited adds 1712338 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 489d26b refs #5139 adds 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration adds a09a9e3 updates jaxx, nuiton-utils and nuiton-config adds 6627017 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds 2c0d6d8 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions adds ac55e81 fix release headers adds b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions adds e6e7c4e Merge branch 'release/3.7.3' No new revisions were added by this update. Summary of changes: README.txt | 10 - pom.xml | 36 +- src/site/rst/update.rst.vm | 47 +- src/update/tutti-application-dev.properties | 66 --- src/update/tutti-application.properties | 4 - tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../core/dao/referential/pmfm/MatrixId2.java | 195 ------- .../core/dao/referential/pmfm/ObjectTypeCode2.java | 274 --------- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 621 +++++---------------- .../dao/referential/pmfm/QualitativeValueId2.java | 246 -------- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 6 +- .../tutti/persistence/entities/TuttiEntities.java | 3 +- .../entities/protocol/TuttiProtocols.java | 19 +- .../AccidentalBatchPersistenceServiceImpl.java | 7 +- .../service/AttachmentPersistenceService.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 8 +- .../service/CruisePersistenceServiceImpl.java | 17 +- .../FishingOperationPersistenceServiceImpl.java | 77 ++- ...dualObservationBatchPersistenceServiceImpl.java | 4 +- .../service/ReferentialPersistenceServiceImpl.java | 43 +- .../service/util/BatchPersistenceHelper.java | 26 +- .../persistence/service/util/BatchTreeHelper.java | 36 +- .../service/util/MeasurementPersistenceHelper.java | 8 +- .../service/util/SamplePersistenceHelper.java | 4 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 70 +++ .../resources/tutti-db-enumerations.properties | 13 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56716 -> 56700 bytes .../AttachmentPersistenceServiceWriteTest.java | 12 +- .../BenthosBatchPersistenceServiceReadTest.java | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 20 +- .../SpeciesBatchPersistenceServiceReadTest.java | 4 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 20 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../service/catches/WeightComputingService.java | 5 +- ...rvice.java => WeightComputingService.java.orig} | 11 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../service/export/generic/CatchExportModel.java | 41 +- .../service/export/generic/OperationExportRow.java | 4 +- .../service/psionimport/PsionImportService.java | 42 +- .../pupitri/PupitriImportExportService.java | 10 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 17 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 42 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 3 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 + .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../ui/swing/action/NewFishingOperationAction.java | 1 + .../category/EditSampleCategoryModelUIModel.java | 4 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 6 +- .../operation/EditFishingOperationUIHandler.java | 8 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../accidental/AccidentalBatchRowModel.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 16 +- .../frequency/BenthosFrequencyCellComponent.java | 1 + .../benthos/frequency/BenthosFrequencyUI.css | 14 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 46 +- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../catches/species/SpeciesBatchRowModel.java | 16 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../species/frequency/SpeciesFrequencyUI.css | 14 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 +- .../frequency/SpeciesFrequencyUIHandler.java | 26 +- .../species/frequency/SpeciesFrequencyUIModel.java | 46 +- .../util/attachment/AttachmentModelAware.java | 4 +- .../swing/util/editor/TuttiLocationTableCell.java | 4 +- .../ui/swing/util/editor/VesselTableCell.java | 4 +- .../BenthosFrequencyUIModel-error-validation.xml | 11 + ...BenthosFrequencyUIModel-warning-validation.xml} | 9 +- .../SpeciesFrequencyUIModel-error-validation.xml | 11 + ...SpeciesFrequencyUIModel-warning-validation.xml} | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 83 files changed, 772 insertions(+), 1689 deletions(-) delete mode 100644 src/update/tutti-application-dev.properties delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/catches/{WeightComputingService.java => WeightComputingService.java.orig} (98%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/benthos/frequency/BenthosFrequencyUIModel-warning-validation.xml} (84%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/species/frequency/SpeciesFrequencyUIModel-warning-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0