January 2015 - Echobase-commits - mailman.cloud.codelutin.com

branch develop updated (4ccdc8e -> 8d5ba41)
by codelutin.com scm Jan. 22, 2015

Jan. 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 4ccdc8e fixes #6510: Revoir la position des layers dans la carto new 8d5ba41 improve pg jdbc url 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 8d5ba414cb02d860ac8ca6ea15903799b9188b73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 12:59:04 2015 +0100 improve pg jdbc url Summary of changes: .../services/service/spatial/GisService.java | 16 ++----- .../services/service/spatial/LizmapRepository.java | 15 ++----- .../services/service/spatial/PgJdbcUrl.java | 43 ++++++++++++++++++ .../service/spatial/LizmapRepositoryTest.java | 6 +-- .../services/service/spatial/PgJdbcUrlTest.java | 52 ++++++++++++++++++++++ 5 files changed, 106 insertions(+), 26 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (515be56 -> 4ccdc8e)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 515be56 fixes #6507: Impossible de voir la page des données spatiales new 4ccdc8e fixes #6510: Revoir la position des layers dans la carto 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 4ccdc8e8adc5f247edc1edb6225d714e74a3957a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 23:21:12 2015 +0100 fixes #6510: Revoir la position des layers dans la carto Summary of changes: .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 421 +++++++++++---------- .../gis/templates/EchoBaseQGisTemplate.qgs | 303 ++++++++------- 2 files changed, 380 insertions(+), 344 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (f0bfb8a -> 515be56)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from f0bfb8a fixes #6053: On peut importer plusieurs fois les mêmes résultats voyage pour un même voyage new 515be56 fixes #6507: Impossible de voir la page des données spatiales 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 515be56c8c243d7038471958fb1104402c331277 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 21:13:12 2015 +0100 fixes #6507: Impossible de voir la page des données spatiales Summary of changes: .../services/service/spatial/LizmapRepository.java | 31 +++++++------- .../service/spatial/LizmapRepositoryTest.java | 47 ++++++++++++++++++++++ 2 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (be369f2 -> f0bfb8a)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from be369f2 fixes #6509 new f0bfb8a fixes #6053: On peut importer plusieurs fois les mêmes résultats voyage pour un même voyage 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 f0bfb8ae4b2c5ea19a072a3f1df699ea6400cf3e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 19:49:25 2015 +0100 fixes #6053: On peut importer plusieurs fois les mêmes résultats voyage pour un même voyage Summary of changes: .../services/service/UserDbPersistenceService.java | 7 ++++ .../ResultsVoyageImportAlreadyExistException.java | 16 ++++++++ .../importdata/ResultsVoyageImportService.java | 48 +++++++++++----------- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + 5 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b81ab5b -> be369f2)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from b81ab5b fixes #6513 new f40ac25 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import new 4a3e6ca ajout du parametre ux11 pour genere les cartes new be369f2 fixes #6509 The 3 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 be369f29fe2ad0ae2da09703a9fb3b1d95e85bf2 Merge: f40ac25 4a3e6ca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:15:35 2015 +0100 fixes #6509 commit f40ac258e4358c2673cc37cee11621123bb45a02 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:12:43 2015 +0100 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import commit 4a3e6ca9a0ae77ecd15c49c165852be0f5912b0a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 14:23:37 2015 +0100 ajout du parametre ux11 pour genere les cartes Summary of changes: echobase-services/src/main/resources/rscript/extractMap.r | 3 ++- .../main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java | 4 ---- .../ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java | 3 --- .../main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java | 4 ---- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 1 - echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 1 - 6 files changed, 2 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (cdde5a7 -> b81ab5b)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from cdde5a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 514f408 utilisation d'une classe helper pour chaque entite new 0a55d61 mis en place filtrage des indicateurs a exporter par voyage new 2a33130 utilisation des nouveau helper d'entities new bee7476 pas de calcul de zone au depart new 6309fb7 amelioration code new 7bd2f31 correction javascript new 41a5a73 fix api new b81ab5b fixes #6513 The 8 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 b81ab5bc6f4d48f48e71e24ff92b777377eaef06 Merge: cdde5a7 41a5a73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:08:23 2015 +0100 fixes #6513 commit 41a5a73b17fcf48791ac6735f5f403481df7e824 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:08:04 2015 +0100 fix api commit 7bd2f31d8698c5dd910ca5da416bc44b11678306 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:05:47 2015 +0100 correction javascript commit 6309fb7481f61a43114a85795385efd8cc0e0252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:04:06 2015 +0100 amelioration code commit bee747698d8a1fd8bd9f906ca926ffa0a5b3bc4f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 18:03:47 2015 +0100 pas de calcul de zone au depart commit 2a331301d0436f43c416a9213a1fd7a0432e0363 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 17:16:17 2015 +0100 utilisation des nouveau helper d'entities commit 0a55d6167f1ba35fea568974370a0c7521da87b5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 17:16:03 2015 +0100 mis en place filtrage des indicateurs a exporter par voyage commit 514f408b63a8ce30bbd4a34d3576d45de7486adc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 21 17:15:25 2015 +0100 utilisation d'une classe helper pour chaque entite Summary of changes: .../fr/ifremer/echobase/EchoBaseFunctions.java | 371 --------------------- .../fr/ifremer/echobase/EchoBasePredicates.java | 190 ----------- .../fr/ifremer/echobase/entities/ImportLogs.java | 26 ++ .../fr/ifremer/echobase/entities/data/Cells.java | 68 ++++ .../echobase/entities/data/DataProcessings.java | 18 + .../ifremer/echobase/entities/data/Echotypes.java | 37 ++ .../ifremer/echobase/entities/data/Operations.java | 47 +++ .../fr/ifremer/echobase/entities/data/Results.java | 18 + .../ifremer/echobase/entities/data/Transects.java | 19 ++ .../ifremer/echobase/entities/data/VoyageImpl.java | 8 +- .../fr/ifremer/echobase/entities/data/Voyages.java | 18 + .../entities/references/AcousticInstruments.java | 26 ++ .../entities/references/AgeCategories.java | 18 + .../entities/references/AreaOfOperations.java | 18 + .../echobase/entities/references/CellMethods.java | 18 + .../echobase/entities/references/CellTypes.java | 80 +++++ .../entities/references/DataMetadatas.java | 18 + .../entities/references/DataQualities.java | 25 ++ .../echobase/entities/references/DataTypes.java | 18 + .../entities/references/DepthStratums.java | 18 + .../entities/references/EchotypeCategories.java | 18 + .../entities/references/GearMetadatas.java | 18 + .../echobase/entities/references/Gears.java | 21 ++ .../echobase/entities/references/Missions.java | 18 + .../entities/references/OperationEvents.java | 18 + .../entities/references/OperationMetadatas.java | 18 + .../entities/references/ReferenceDatumTypes.java | 18 + .../entities/references/ReferenceDatums.java | 18 + .../entities/references/SampleDataTypes.java | 25 ++ .../entities/references/SexCategories.java | 18 + .../entities/references/SizeCategories.java | 27 ++ .../echobase/entities/references/Species2.java | 8 + .../entities/references/SpeciesCategories.java | 29 ++ .../echobase/entities/references/Stratas.java | 18 + .../echobase/entities/references/VesselTypes.java | 18 + .../echobase/entities/references/Vessels.java | 18 + .../echobase/services/service/CoserIndicators.java | 32 ++ .../services/service/UserDbPersistenceService.java | 86 ++++- .../service/importdata/AcousticImportService.java | 13 +- .../service/importdata/CatchesImportService.java | 21 +- .../service/importdata/CommonAllImportService.java | 4 +- .../importdata/CommonTransectImportService.java | 7 +- .../importdata/CommonTransitImportService.java | 4 +- .../service/importdata/OperationImportService.java | 19 +- .../importdata/ResultsEsduCellImportService.java | 25 +- .../ResultsMapFishCellImportService.java | 19 +- .../ResultsMapOtherCellImportService.java | 10 +- .../importdata/ResultsRegionCellImportService.java | 31 +- .../importdata/ResultsVoyageImportService.java | 20 +- .../importdata/AbstractImportDataServiceIT.java | 4 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 4 +- .../echobase/ui/actions/exportCoser/Configure.java | 45 +-- .../GetAvailableIndicatorsForMission.java | 78 +++++ .../main/resources/config/struts-exportCoser.xml | 6 + .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 7 + echobase-ui/src/main/webapp/js/gridHelper.js | 68 +++- 56 files changed, 1186 insertions(+), 684 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

annotated tag echobase-2.8 created (now a723129)
by codelutin.com scm Jan. 20, 2015

Jan. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-2.8 in repository echobase. See http://git.codelutin.com/echobase.git at a723129 (tag) tagging 0e157a368ac3a607ad5ece901bc5a9ae0721f716 (commit) replaces echobase-2.7.2 tagged by Maven Release on Tue Jan 20 17:37:58 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.8 ----------------------------------------------------------------------- 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

branch release/2.8 deleted (was f36d7f4)
by codelutin.com scm Jan. 20, 2015

Jan. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/2.8 in repository echobase. See http://git.codelutin.com/echobase.git was f36d7f4 [jgitflow-maven-plugin]updating poms for branch'release/2.8' 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

branch develop updated (2933074 -> cdde5a7)
by codelutin.com scm Jan. 20, 2015

Jan. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 2933074 [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development new 8cf050e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1dd83b9 add license headers new f36d7f4 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions new 0e157a3 Merge branch 'release/2.8' new 415e650 Merge branch 'master' into develop new cdde5a7 [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 cdde5a7d42c93076adb637ada98f5da429bbd5a3 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:38:02 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 415e650f36d28361d2a6506f693acd142e06b749 Merge: 8cf050e 0e157a3 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:38:01 2015 +0000 Merge branch 'master' into develop commit 8cf050e7ece313d62e15b7f03cb39d5835e734f8 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:38:00 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 0e157a368ac3a607ad5ece901bc5a9ae0721f716 Merge: 57e5d46 f36d7f4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:37:58 2015 +0000 Merge branch 'release/2.8' commit f36d7f4e786dadaf549922476e76ef3f19ff29bf Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:35:48 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions commit 1dd83b9ae0c0e818ab18795b2f2e49f941504229 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 20 17:35:40 2015 +0000 add license headers Summary of changes: .../exportCoser/GenerateCoserMapException.java | 21 +++++++++++++++++++++ .../services/service/spatial/LizmapRepository.java | 21 +++++++++++++++++++++ .../echobase/ui/actions/spatial/ShowVoyageMap.java | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/2.8 updated (72ab470 -> f36d7f4)
by codelutin.com scm Jan. 20, 2015

Jan. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/2.8 in repository echobase. See http://git.codelutin.com/echobase.git from 72ab470 use mavenpom 1.8.1 adds 1dd83b9 add license headers adds f36d7f4 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../exportCoser/GenerateCoserMapException.java | 21 +++++++++++++++++++++ .../services/service/spatial/LizmapRepository.java | 21 +++++++++++++++++++++ echobase-ui/pom.xml | 2 +- .../echobase/ui/actions/spatial/ShowVoyageMap.java | 21 +++++++++++++++++++++ pom.xml | 2 +- 7 files changed, 67 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0