October 2016 - Echobase-commits - mailman.cloud.codelutin.com

branch develop updated (afab4f6 -> 85315cc)
by codelutin.com scm Oct. 25, 2016

Oct. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from afab4f6 Export biotic export for atlantos new 85315cc Handle vocabulary in xml 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 85315cc6e7032a866886bf2f431f34e9f9407b75 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Oct 25 15:49:50 2016 +0200 Handle vocabulary in xml Summary of changes: .../migration/workingDb/h2/3.911-0-atlantos.sql | 32 +++++- .../migration/workingDb/pg/3.911-0-atlantos.sql | 30 +++++ .../service/atlantos/ExportAtlantosService.java | 36 ++++-- .../service/atlantos/xml/VocabularyExport.java | 123 +++++++++++++++------ .../service/atlantos/xml/XmlAccousticExport.java | 51 ++++----- .../service/atlantos/xml/XmlBioticExport.java | 36 +++--- .../services/service/atlantos/xml/XmlWriter.java | 11 +- 7 files changed, 228 insertions(+), 91 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 (6b64d24 -> afab4f6)
by codelutin.com scm Oct. 24, 2016

Oct. 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 6b64d24 #8173 Add vocabulary table new afab4f6 Export biotic export for atlantos 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 afab4f6fb127dace9cb0b97c892d185a12c23a5d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Oct 24 18:05:16 2016 +0200 Export biotic export for atlantos Summary of changes: .../migration/workingDb/h2/3.911-0-atlantos.sql | 3 +- .../migration/workingDb/pg/3.911-0-atlantos.sql | 1 + echobase-domain/src/main/xmi/echobase.zargo | Bin 100253 -> 100339 bytes .../service/atlantos/xml/VocabularyExport.java | 39 ++- .../service/atlantos/xml/XmlAccousticExport.java | 4 +- .../service/atlantos/xml/XmlBioticExport.java | 306 ++++++++++++++------- .../services/service/atlantos/xml/XmlWriter.java | 2 + 7 files changed, 243 insertions(+), 112 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 (c584b14 -> 6b64d24)
by codelutin.com scm Oct. 20, 2016

Oct. 20, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c584b14 #8669 Fix conversion for the pagination new 6b64d24 #8173 Add vocabulary table 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 6b64d24a5b8b50493db1957aac6d90b6e789b292 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Oct 20 18:29:51 2016 +0200 #8173 Add vocabulary table Summary of changes: .../echobase/persistence/EchoBaseDbMeta.java | 4 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100263 -> 100253 bytes .../services/service/UserDbPersistenceService.java | 22 +- .../service/atlantos/ExportAtlantosService.java | 245 +------------------- .../service/atlantos/model/BiologyExportModel.java | 66 ------ .../atlantos/model/CalibrationExportModel.java | 83 ------- .../service/atlantos/model/CatchExportModel.java | 66 ------ .../service/atlantos/model/CruiseExportModel.java | 56 ----- .../atlantos/model/DataAcquisitionExportModel.java | 74 ------ .../service/atlantos/model/DataExportModel.java | 126 ----------- .../atlantos/model/DataProcessingExportModel.java | 92 -------- .../service/atlantos/model/HaulExportModel.java | 87 ------- .../atlantos/model/InstrumentExportModel.java | 89 -------- .../service/atlantos/row/BiologyExportRow.java | 141 ------------ .../service/atlantos/row/CalibrationExportRow.java | 84 ------- .../service/atlantos/row/CatchExportRow.java | 144 ------------ .../service/atlantos/row/CruiseExportRow.java | 85 ------- .../atlantos/row/DataAcquisitionExportRow.java | 79 ------- .../service/atlantos/row/DataExportRow.java | 223 ------------------ .../atlantos/row/DataProcessingExportRow.java | 139 ------------ .../service/atlantos/row/HaulExportRow.java | 251 --------------------- .../service/atlantos/row/InstrumentExportRow.java | 134 ----------- .../service/atlantos/xml/VocabularyExport.java | 61 +++++ .../service/atlantos/xml/XmlAccousticExport.java | 61 ++--- .../service/atlantos/xml/XmlBioticExport.java | 5 +- .../atlantos/ExportAtlantosServiceTest.java | 33 --- 26 files changed, 105 insertions(+), 2345 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CalibrationExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CruiseExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataAcquisitionExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataProcessingExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/InstrumentExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/BiologyExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CalibrationExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CruiseExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataAcquisitionExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/HaulExportRow.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.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 (20110c7 -> c584b14)
by codelutin.com scm Oct. 20, 2016

Oct. 20, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 20110c7 Add missing for atlantos export new c584b14 #8669 Fix conversion for the pagination 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 c584b147b78ed4ebc2c2df2e959ad1fdb036ce68 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Oct 20 17:59:13 2016 +0200 #8669 Fix conversion for the pagination Summary of changes: .../src/main/java/fr/ifremer/echobase/services/service/UserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (cdf5d7a -> 20110c7)
by codelutin.com scm Oct. 20, 2016

Oct. 20, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from cdf5d7a Complete acoustic xml export new 20110c7 Add missing for atlantos export 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 20110c76d6368d74206a9b119c0f42b112972133 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Oct 20 17:03:18 2016 +0200 Add missing for atlantos export Summary of changes: .../echobase/entities/references/MissionImpl.java | 12 +++++++++ ...WorkingDbMigrationCallBackForVersion3_911.java} | 9 +++---- .../workingDb/h2/3.905-0-update-model.sql | 4 --- .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 3 --- .../3.911-0-atlantos.sql} | 6 ++++- .../workingDb/pg/3.905-0-update-model.sql | 4 --- .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 3 --- ...importLog-entityId.sql => 3.911-0-atlantos.sql} | 6 ++++- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 99798 -> 100263 bytes .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../actions/ImportAcousticsActionSupport.java | 8 ++++-- .../ImportAcousticsConfiguration.java | 30 +++++++++++++++++++++ .../resources/echobase-importDb-referentiel.zip | Bin 50514 -> 50551 bytes .../resources/i18n/echobase-ui_en_GB.properties | 4 +++ .../resources/i18n/echobase-ui_fr_FR.properties | 4 +++ .../jsp/importData/configureAcousticImport.jsp | 12 +++++++++ .../importData/configureMooringAcousticImport.jsp | 12 +++++++++ .../WEB-INF/jsp/importData/createMission.jsp | 3 +++ 19 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_911.java} (88%) copy echobase-domain/src/main/resources/migration/workingDb/{pg/3.907-0-update-importLog-entityId.sql => h2/3.911-0-atlantos.sql} (67%) copy echobase-domain/src/main/resources/migration/workingDb/pg/{3.907-0-update-importLog-entityId.sql => 3.911-0-atlantos.sql} (64%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (eddc84e -> cdf5d7a)
by codelutin.com scm Oct. 17, 2016

Oct. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from eddc84e ref #8173, add export biotic new cdf5d7a Complete acoustic xml export 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 cdf5d7ab93d56c88dae5e4583d368356d82de20c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Oct 17 17:45:18 2016 +0200 Complete acoustic xml export Summary of changes: .../service/atlantos/xml/XmlAccousticExport.java | 206 ++++++++++++++++----- .../atlantos/ExportAtlantosServiceTest.java | 2 +- 2 files changed, 158 insertions(+), 50 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 (828df0a -> eddc84e)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 828df0a ref #8173, begin export to xml instead of csv new eddc84e ref #8173, add export biotic 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 eddc84e050b997a4294e11f8be4858da5a341deb Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Oct 4 16:31:29 2016 +0200 ref #8173, add export biotic Summary of changes: .../service/atlantos/ExportAtlantosService.java | 16 +- .../service/atlantos/xml/XmlAccousticExport.java | 88 ++++++- .../service/atlantos/xml/XmlBioticExport.java | 252 +++++++++++++++++++++ .../atlantos/ExportAtlantosServiceTest.java | 1 - 4 files changed, 351 insertions(+), 6 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.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 (a7f7032 -> 828df0a)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from a7f7032 ref #8173, plug export with concatenation new 828df0a ref #8173, begin export to xml instead of csv 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 828df0a90abc2e3717dfbe5f4d918e2f61c5af7f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Oct 4 11:49:15 2016 +0200 ref #8173, begin export to xml instead of csv Summary of changes: .../echobase/services/csv/EchoBaseCsvUtil.java | 2 + .../service/atlantos/ExportAtlantosService.java | 35 +++ .../atlantos/row/DataProcessingExportRow.java | 1 - .../service/atlantos/xml/XmlAccousticExport.java | 249 +++++++++++++++++++++ .../services/service/atlantos/xml/XmlWriter.java | 91 ++++++++ .../atlantos/ExportAtlantosServiceTest.java | 15 +- 6 files changed, 389 insertions(+), 4 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlWriter.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 (526aa06 -> a7f7032)
by codelutin.com scm Oct. 3, 2016

Oct. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 526aa06 ref #8173, create all data structures new a7f7032 ref #8173, plug export with concatenation 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 a7f703218b166e29b749f5f64ea46d08d0180fcc Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Oct 3 16:58:35 2016 +0200 ref #8173, plug export with concatenation Summary of changes: .../service/atlantos/ExportAtlantosService.java | 197 ++++++++++++++++++++- .../service/atlantos/model/BiologyExportModel.java | 3 +- .../service/atlantos/model/CatchExportModel.java | 3 +- .../service/atlantos/model/DataExportModel.java | 12 +- .../service/atlantos/model/HaulExportModel.java | 3 +- .../service/atlantos/row/CatchExportRow.java | 2 +- .../service/atlantos/row/DataExportRow.java | 2 +- .../atlantos/row/DataProcessingExportRow.java | 16 +- .../service/atlantos/row/InstrumentExportRow.java | 12 +- .../echobase/services/ImportDataFixtures.java | 11 ++ .../atlantos/ExportAtlantosServiceTest.java | 22 ++- .../import-data/echobase-atlantos.h2.db.gz | Bin 0 -> 1238097 bytes 12 files changed, 251 insertions(+), 32 deletions(-) create mode 100644 echobase-services/src/test/resources/import-data/echobase-atlantos.h2.db.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7478779 -> 526aa06)
by codelutin.com scm Oct. 3, 2016

Oct. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 7478779 ref #8173, continue export models new 5699c79 ref #8173, continue export models new 526aa06 ref #8173, create all data structures 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 526aa06499cbef20f8e9bb1c8fca69fcb99fd885 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Oct 3 15:23:30 2016 +0200 ref #8173, create all data structures commit 5699c79f251b6ac03034a9f127b9b556a08ba0fe Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Sep 30 17:56:23 2016 +0200 ref #8173, continue export models Summary of changes: .../echobase/services/csv/EchoBaseCsvUtil.java | 1 - .../service/atlantos/model/BiologyExportModel.java | 65 ++++++ .../service/atlantos/model/CatchExportModel.java | 65 ++++++ .../service/atlantos/model/DataExportModel.java | 126 +++++++++++ .../atlantos/model/DataProcessingExportModel.java | 92 ++++++++ .../service/atlantos/model/HaulExportModel.java | 86 +++++++ .../service/atlantos/row/BiologyExportRow.java | 141 ++++++++++++ .../service/atlantos/row/CatchExportRow.java | 144 ++++++++++++ .../atlantos/row/DataAcquisitionExportRow.java | 2 - .../service/atlantos/row/DataExportRow.java | 223 ++++++++++++++++++ .../atlantos/row/DataProcessingExportRow.java | 140 ++++++++++++ .../service/atlantos/row/HaulExportRow.java | 251 +++++++++++++++++++++ .../service/atlantos/row/InstrumentExportRow.java | 1 - 13 files changed, 1333 insertions(+), 4 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataProcessingExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/BiologyExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/HaulExportRow.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2