branch develop updated (de0e522 -> aa9a6ec)
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 de0e522 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new b3a6311 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions new 320d3d0 Fix license headers new 297e5af [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions new 09f06f6 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' new 9534a3d [jgitflow-maven-plugin]merging 'master' into 'develop' new aa9a6ec [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 aa9a6ec21e00f4398be0880fb0091847c29e26c6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:55 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9534a3ddcece86e2ffa22873340e13b8789d75d1 Merge: b3a6311 09f06f6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b3a63112e81155e0c7b6fe8dfc2ff9b973f9632d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 09f06f66e36281e9d469d11f046a846d62a4961a Merge: 1e14261 297e5af Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' commit 297e5af9da179f61f3e0927542f975bdf686244d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:12:37 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions commit 320d3d0f1b78ab02f4275fbbe10c2a66280bb5cc Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:12:21 2016 +0200 Fix license headers Summary of changes: .../WorkingDbMigrationCallBackForVersion3_905.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../GearCharacteristicValuesImportModel.java | 21 +++++++++++++++++++++ .../importdb/GearCharacteristicValuesImportRow.java | 21 +++++++++++++++++++++ .../actions/dbeditor/ImportGearCharacteristics.java | 21 +++++++++++++++++++++ 9 files changed, 184 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 320d3d0f1b78ab02f4275fbbe10c2a66280bb5cc Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:12:21 2016 +0200 Fix license headers --- .../WorkingDbMigrationCallBackForVersion3_905.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../GearCharacteristicValuesImportModel.java | 21 +++++++++++++++++++++ .../importdb/GearCharacteristicValuesImportRow.java | 21 +++++++++++++++++++++ .../actions/dbeditor/ImportGearCharacteristics.java | 21 +++++++++++++++++++++ 9 files changed, 184 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_905.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_905.java index a76ca9c..d2dab1f 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_905.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_905.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.version.Version; diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql index c25c534..b36a475 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- =CONCATENER("insert into port (topiaId, topiaVersion, topiaCreateDate, code, name, shortName, lastModification) values ('fr.ifremer.echobase.entities.references.Port#5553610280597#0.9322615025"; E2; "', 0, '2016-04-29 00:00:00.000', '"; A2; "', '"; B2; "', '"; C2; "', '"; D2; " 00:00:00.000');") insert into port (topiaId, topiaVersion, topiaCreateDate, code, name, shortName, lastModification) values ('fr.ifremer.echobase.entities.references.Port#5553610280597#0.93226150250', 0, '2016-04-29 00:00:00.000', 'BSH10', 'Antofagasta', 'Antofagasta', '2007-08-02 00:00:00.000'); insert into port (topiaId, topiaVersion, topiaCreateDate, code, name, shortName, lastModification) values ('fr.ifremer.echobase.entities.references.Port#5553610280597#0.93226150251', 0, '2016-04-29 00:00:00.000', 'BSH100', 'Jakarta', 'Jakarta', '2007-08-02 00:00:00.000'); diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql index 6ffe315..3629169 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- PORT create table port (topiaId varchar(255) not null, topiaVersion bigint not null, code varchar(255) not null, topiaCreateDate timestamp, name varchar(255) not null, shortName varchar(255), lastModification timestamp); diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql index 4e24c39..1f19791 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- Change ports name update voyage v SET startPort = (select p.topiaId from port p where upper(p.name) = upper(v.startPortName) limit 1); update voyage v SET endPort = (select p.topiaId from port p where upper(p.name) = upper(v.endPortName) limit 1); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql index 9143615..0cd3c29 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- PORT create table port (topiaId character varying(255) not null, topiaVersion bigint not null, code character varying(255) not null, topiaCreateDate timestamp, name character varying(255) not null, shortName character varying(255), lastModification timestamp); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql index a3e5e3d..1f3bb23 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- Change ports name update voyage as v SET startPort = p.topiaid FROM ( select pp.topiaId, vv.topiaId as voyageId from port as pp, voyage as vv WHERE upper(pp.name) = upper(vv.startPortName) ) as p WHERE v.startPortName is not null and v.topiaId = p.voyageId; update voyage as v SET endPort = p.topiaid FROM ( select pp.topiaId, vv.topiaId as voyageId from port as pp, voyage as vv WHERE upper(pp.name) = upper(vv.endPortName) ) as p WHERE v.endPortName is not null and v.topiaId = p.voyageId; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java index 37271bb..b105373 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.importdb; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearCharacteristic; import fr.ifremer.echobase.services.service.importdata.csv.EchoBaseImportExportModelSupport; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java index 04356da..e86441e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.importdb; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearCharacteristic; import fr.ifremer.echobase.entities.references.GearCharacteristicValue; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java index b1d1adb..8db86a0 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.dbeditor; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.services.service.importdb.ImportService; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 297e5af9da179f61f3e0927542f975bdf686244d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:12:37 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 57fd5d9..d5f1f34 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 0230637..f9b1607 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 0e5b18f..5cb14fc 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 7473312..060799c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2-SNAPSHOT</version> + <version>4.0-alpha-2</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 09f06f66e36281e9d469d11f046a846d62a4961a Merge: 1e14261 297e5af Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 14 + .../config/EchoBaseConfigurationOption.java | 46 +- .../entities/references/DataMetadataImpl.java | 2 + .../entities/references/{Gears.java => Ports.java} | 12 +- .../echobase/persistence/EchoBaseDbMeta.java | 5 +- .../MigrationCallBackForVersionSupport.java | 15 +- ...WorkingDbMigrationCallBackForVersion3_905.java} | 20 +- .../i18n/echobase-domain_en_GB.properties | 3 + .../i18n/echobase-domain_fr_FR.properties | 3 + .../migration/workingDb/3.905-1-insert-ports.sql | 4916 ++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 115 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 27 + .../workingDb/pg/3.905-0-update-model.sql | 115 + .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 27 + echobase-domain/src/main/xmi/echobase.properties | 27 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90445 -> 98231 bytes echobase-services/pom.xml | 2 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 30 + .../echobase/services/service/DbEditorService.java | 10 +- .../services/service/DecoratorService.java | 12 + .../services/service/UserDbPersistenceService.java | 4 +- .../actions/VoyageAcousticsImportAction.java | 33 +- .../contexts/ImportDataContextSupport.java | 13 +- .../csv/VoyageAcousticImportExportModel.java | 6 +- .../importdata/csv/VoyageAcousticImportRow.java | 43 +- .../VoyageCommonsTransectImportExportModel.java | 4 +- .../csv/VoyageCommonsTransectImportRow.java | 8 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +- .../GearCharacteristicValuesImportModel.java | 60 + .../GearCharacteristicValuesImportRow.java | 68 + .../services/service/importdb/ImportService.java | 76 + .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../importdata/AbstractImportDataServiceIT.java | 20 + .../importdata/VoyageAcousticImportServiceIT.java | 12 +- .../removedata/AbstractRemoveDataServiceTest.java | 11 +- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 6128 -> 6972 bytes .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes .../resources/import-data/common/voyage.csv.gz | Bin 126 -> 117 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 825254 -> 1006673 bytes .../import-data/echobase-catches.h2.db.gz | Bin 755094 -> 936199 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184645 -> 369833 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137582 -> 318432 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601537 -> 785038 bytes .../import-data/echobase-operation.h2.db.gz | Bin 328156 -> 507447 bytes echobase-ui/pom.xml | 3 +- .../echobase/ui/EchoBaseApplicationContext.java | 22 + .../dbeditor/ImportGearCharacteristics.java | 143 + .../src/main/resources/config/struts-dbeditor.xml | 9 + .../src/main/resources/embedded/update-echobase.sh | 54 + .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 + pom.xml | 4 +- src/doc/reunions/reunion_2016-06-16.md | 97 + src/site/en/rst/exportData.rst | 3 + src/site/en/rst/install.rst.vm | 5 + src/site/en/rst/update.rst.vm | 33 +- src/site/rst/exportData.rst | 3 + src/site/rst/install.rst.vm | 20 +- src/site/rst/update.rst.vm | 29 +- 62 files changed, 6084 insertions(+), 130 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b3a63112e81155e0c7b6fe8dfc2ff9b973f9632d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4e85f0c..d5f1f34 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 28473a7..f9b1607 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af02dfb..5cb14fc 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a32d2be..060799c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-2</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9534a3ddcece86e2ffa22873340e13b8789d75d1 Merge: b3a6311 09f06f6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../WorkingDbMigrationCallBackForVersion3_905.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../GearCharacteristicValuesImportModel.java | 21 +++++++++++++++++++++ .../importdb/GearCharacteristicValuesImportRow.java | 21 +++++++++++++++++++++ .../actions/dbeditor/ImportGearCharacteristics.java | 21 +++++++++++++++++++++ 9 files changed, 184 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit aa9a6ec21e00f4398be0880fb0091847c29e26c6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:55 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index d5f1f34..4e85f0c 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f9b1607..28473a7 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 5cb14fc..af02dfb 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 060799c..a32d2be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-2</version> + <version>4.0-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm