This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 0285289910217c42df27de383c34cd091f9058e0 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 14:03:59 2016 +0200 Add echotype on mooring --- .../WorkingDbMigrationCallBackForVersion3_909.java | 33 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 +++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 +++++++++++++ .../migration/workingDb/3.908-0-drop-indexes.sql | 20 +++++++++++++ .../workingDb/3.909-0-mooring-echotype.sql | 22 ++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 21 +++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 21 +++++++++++++ .../h2/3.907-0-update-importLog-entityId.sql | 20 +++++++++++++ .../workingDb/pg/3.905-0-update-model.sql | 21 +++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 21 +++++++++++++ .../pg/3.907-0-update-importLog-entityId.sql | 21 +++++++++++++ echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 99350 -> 99818 bytes src/site/en/resources/model/Transverse.png | Bin 7038 -> 9110 bytes src/site/en/resources/model/dataAcoustic.png | Bin 28647 -> 34954 bytes src/site/en/resources/model/dataCatches.png | Bin 22230 -> 22223 bytes src/site/en/resources/model/dataCategory.png | Bin 9109 -> 9122 bytes src/site/en/resources/model/dataCommon.png | Bin 29204 -> 35480 bytes src/site/en/resources/model/dataEchotype.png | Bin 6838 -> 6860 bytes src/site/en/resources/model/dataLengthAgeKey.png | Bin 6799 -> 6754 bytes .../en/resources/model/dataLengthWeightKey.png | Bin 6655 -> 5566 bytes src/site/en/resources/model/dataMooring.png | Bin 0 -> 11778 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/en/resources/model/referenceAll.png | Bin 65060 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/en/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes .../en/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes .../en/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes .../en/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/en/resources/model/referenceGear.png | Bin 12643 -> 12676 bytes src/site/en/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/en/resources/model/referenceOperation.png | Bin 5851 -> 5858 bytes src/site/en/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/en/resources/model/referenceProtocole.png | Bin 6551 -> 6576 bytes .../en/resources/model/referenceReferenceDatum.png | Bin 3127 -> 3134 bytes src/site/en/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/en/resources/model/referenceSpecies.png | Bin 14230 -> 14498 bytes src/site/en/resources/model/referenceStrata.png | Bin 7890 -> 7903 bytes .../en/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/en/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/en/rst/model.rst | 4 +++ src/site/resources/model/Transverse.png | Bin 5934 -> 9110 bytes src/site/resources/model/dataAcoustic.png | Bin 30243 -> 34954 bytes src/site/resources/model/dataCatches.png | Bin 22259 -> 22223 bytes src/site/resources/model/dataCategory.png | Bin 9107 -> 9122 bytes src/site/resources/model/dataCommon.png | Bin 29256 -> 35480 bytes src/site/resources/model/dataEchotype.png | Bin 6836 -> 6860 bytes src/site/resources/model/dataLengthAgeKey.png | Bin 6800 -> 6754 bytes src/site/resources/model/dataLengthWeightKey.png | Bin 6658 -> 5566 bytes src/site/resources/model/dataMooring.png | Bin 0 -> 11778 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/resources/model/referenceAll.png | Bin 65068 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes src/site/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes src/site/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes src/site/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/resources/model/referenceGear.png | Bin 12657 -> 12676 bytes src/site/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/resources/model/referenceOperation.png | Bin 5848 -> 5858 bytes src/site/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/resources/model/referenceProtocole.png | Bin 6561 -> 6576 bytes .../resources/model/referenceReferenceDatum.png | Bin 3124 -> 3134 bytes src/site/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/resources/model/referenceSpecies.png | Bin 14271 -> 14498 bytes src/site/resources/model/referenceStrata.png | Bin 7889 -> 7903 bytes src/site/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/rst/model.rst | 4 +++ 69 files changed, 249 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_909.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_909.java new file mode 100644 index 0000000..24b28e5 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_909.java @@ -0,0 +1,33 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.List; + +/** + * Created on 26/04/16. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class WorkingDbMigrationCallBackForVersion3_909 extends WorkingDbMigrationCallBackForVersionSupport { + + @Override + public Version getVersion() { + return Versions.valueOf("3.909"); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + // update the model structure + addScript("3.909-0-mooring-echotype.sql", queries); + } + +} 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/3.906-0-add-indexes.sql b/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql index e2ba3ad..89536bf 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql @@ -1 +1,21 @@ +--- +-- #%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% +--- CREATE INDEX IDX_CELL_NAME ON CELL (NAME); diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.908-0-drop-indexes.sql b/echobase-domain/src/main/resources/migration/workingDb/3.908-0-drop-indexes.sql index 3a704d6..2ab95e7 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/3.908-0-drop-indexes.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/3.908-0-drop-indexes.sql @@ -1 +1,21 @@ +--- +-- #%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% +--- DROP INDEX IF EXISTS uk_importfileid; diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.909-0-mooring-echotype.sql b/echobase-domain/src/main/resources/migration/workingDb/3.909-0-mooring-echotype.sql new file mode 100644 index 0000000..59f4ca9 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/3.909-0-mooring-echotype.sql @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +ALTER TABLE ECHOTYPE ADD mooring VARCHAR(255); +ALTER TABLE ECHOTYPE ADD CONSTRAINT FK_ECHOTYPE_MOORING FOREIGN KEY (mooring) references MOORING; 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..f212245 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,24 @@ +--- +-- #%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..e7ac51f 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,24 @@ +--- +-- #%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/h2/3.907-0-update-importLog-entityId.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.907-0-update-importLog-entityId.sql index 65f7962..33e707a 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.907-0-update-importLog-entityId.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.907-0-update-importLog-entityId.sql @@ -1 +1,21 @@ +--- +-- #%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% +--- alter table importlog alter column voyageId rename to entityId; 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..295c3c3 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,24 @@ +--- +-- #%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..cb3b35c 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,24 @@ +--- +-- #%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-domain/src/main/resources/migration/workingDb/pg/3.907-0-update-importLog-entityId.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.907-0-update-importLog-entityId.sql index a2cdb5d..b8a85bb 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.907-0-update-importLog-entityId.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.907-0-update-importLog-entityId.sql @@ -1 +1,22 @@ +--- +-- #%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% +--- + alter table importlog rename column voyageId to entityId; diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index 63ffcbc..843a83d 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -23,7 +23,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true -model.tagValue.version=3.908 +model.tagValue.version=3.909 model.tagValue.generatePropertyChangeSupport=false model.tagValue.generateBooleanGetMethods=false model.tagValue.indexForeignKeys=true diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index b7abef0..e8cbf36 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/src/site/en/resources/model/Transverse.png b/src/site/en/resources/model/Transverse.png index f0a701c..e55d12a 100644 Binary files a/src/site/en/resources/model/Transverse.png and b/src/site/en/resources/model/Transverse.png differ diff --git a/src/site/en/resources/model/dataAcoustic.png b/src/site/en/resources/model/dataAcoustic.png index 0bf5f2d..6e63f5b 100644 Binary files a/src/site/en/resources/model/dataAcoustic.png and b/src/site/en/resources/model/dataAcoustic.png differ diff --git a/src/site/en/resources/model/dataCatches.png b/src/site/en/resources/model/dataCatches.png index 703ce8b..1cc5bc3 100644 Binary files a/src/site/en/resources/model/dataCatches.png and b/src/site/en/resources/model/dataCatches.png differ diff --git a/src/site/en/resources/model/dataCategory.png b/src/site/en/resources/model/dataCategory.png index 8d39e7f..3cca050 100644 Binary files a/src/site/en/resources/model/dataCategory.png and b/src/site/en/resources/model/dataCategory.png differ diff --git a/src/site/en/resources/model/dataCommon.png b/src/site/en/resources/model/dataCommon.png index af22a25..027b511 100644 Binary files a/src/site/en/resources/model/dataCommon.png and b/src/site/en/resources/model/dataCommon.png differ diff --git a/src/site/en/resources/model/dataEchotype.png b/src/site/en/resources/model/dataEchotype.png index a1ab31b..ad2eb5d 100644 Binary files a/src/site/en/resources/model/dataEchotype.png and b/src/site/en/resources/model/dataEchotype.png differ diff --git a/src/site/en/resources/model/dataLengthAgeKey.png b/src/site/en/resources/model/dataLengthAgeKey.png index 82956e0..a578e9b 100644 Binary files a/src/site/en/resources/model/dataLengthAgeKey.png and b/src/site/en/resources/model/dataLengthAgeKey.png differ diff --git a/src/site/en/resources/model/dataLengthWeightKey.png b/src/site/en/resources/model/dataLengthWeightKey.png index d91b9ff..a854245 100644 Binary files a/src/site/en/resources/model/dataLengthWeightKey.png and b/src/site/en/resources/model/dataLengthWeightKey.png differ diff --git a/src/site/en/resources/model/dataMooring.png b/src/site/en/resources/model/dataMooring.png new file mode 100644 index 0000000..7610920 Binary files /dev/null and b/src/site/en/resources/model/dataMooring.png differ diff --git a/src/site/en/resources/model/referenceAcousticInstrument.png b/src/site/en/resources/model/referenceAcousticInstrument.png index e11075d..9180473 100644 Binary files a/src/site/en/resources/model/referenceAcousticInstrument.png and b/src/site/en/resources/model/referenceAcousticInstrument.png differ diff --git a/src/site/en/resources/model/referenceAll.png b/src/site/en/resources/model/referenceAll.png index f9ee879..e42ec18 100644 Binary files a/src/site/en/resources/model/referenceAll.png and b/src/site/en/resources/model/referenceAll.png differ diff --git a/src/site/en/resources/model/referenceAreaOfOperation.png b/src/site/en/resources/model/referenceAreaOfOperation.png index bc51411..dc8ae94 100644 Binary files a/src/site/en/resources/model/referenceAreaOfOperation.png and b/src/site/en/resources/model/referenceAreaOfOperation.png differ diff --git a/src/site/en/resources/model/referenceCellType.png b/src/site/en/resources/model/referenceCellType.png index f50e3e1..68b6d54 100644 Binary files a/src/site/en/resources/model/referenceCellType.png and b/src/site/en/resources/model/referenceCellType.png differ diff --git a/src/site/en/resources/model/referenceDataMetadata.png b/src/site/en/resources/model/referenceDataMetadata.png index e2c5744..a65092f 100644 Binary files a/src/site/en/resources/model/referenceDataMetadata.png and b/src/site/en/resources/model/referenceDataMetadata.png differ diff --git a/src/site/en/resources/model/referenceDataQuality.png b/src/site/en/resources/model/referenceDataQuality.png index 82684d2..1ddda16 100644 Binary files a/src/site/en/resources/model/referenceDataQuality.png and b/src/site/en/resources/model/referenceDataQuality.png differ diff --git a/src/site/en/resources/model/referenceDepthStratum.png b/src/site/en/resources/model/referenceDepthStratum.png index b8927de..774aee7 100644 Binary files a/src/site/en/resources/model/referenceDepthStratum.png and b/src/site/en/resources/model/referenceDepthStratum.png differ diff --git a/src/site/en/resources/model/referenceGear.png b/src/site/en/resources/model/referenceGear.png index f00c19d..b5afcf0 100644 Binary files a/src/site/en/resources/model/referenceGear.png and b/src/site/en/resources/model/referenceGear.png differ diff --git a/src/site/en/resources/model/referenceMission.png b/src/site/en/resources/model/referenceMission.png index 5323104..a1bdcd3 100644 Binary files a/src/site/en/resources/model/referenceMission.png and b/src/site/en/resources/model/referenceMission.png differ diff --git a/src/site/en/resources/model/referenceOperation.png b/src/site/en/resources/model/referenceOperation.png index 7a3a785..55e42df 100644 Binary files a/src/site/en/resources/model/referenceOperation.png and b/src/site/en/resources/model/referenceOperation.png differ diff --git a/src/site/en/resources/model/referencePort.png b/src/site/en/resources/model/referencePort.png new file mode 100644 index 0000000..f350beb Binary files /dev/null and b/src/site/en/resources/model/referencePort.png differ diff --git a/src/site/en/resources/model/referenceProtocole.png b/src/site/en/resources/model/referenceProtocole.png index 4f177ee..4588127 100644 Binary files a/src/site/en/resources/model/referenceProtocole.png and b/src/site/en/resources/model/referenceProtocole.png differ diff --git a/src/site/en/resources/model/referenceReferenceDatum.png b/src/site/en/resources/model/referenceReferenceDatum.png index d72128e..b8ff01d 100644 Binary files a/src/site/en/resources/model/referenceReferenceDatum.png and b/src/site/en/resources/model/referenceReferenceDatum.png differ diff --git a/src/site/en/resources/model/referenceSample.png b/src/site/en/resources/model/referenceSample.png index c8af382..2282f68 100644 Binary files a/src/site/en/resources/model/referenceSample.png and b/src/site/en/resources/model/referenceSample.png differ diff --git a/src/site/en/resources/model/referenceSpecies.png b/src/site/en/resources/model/referenceSpecies.png index a6e8bd2..8a71191 100644 Binary files a/src/site/en/resources/model/referenceSpecies.png and b/src/site/en/resources/model/referenceSpecies.png differ diff --git a/src/site/en/resources/model/referenceStrata.png b/src/site/en/resources/model/referenceStrata.png index feec6d4..55f45a5 100644 Binary files a/src/site/en/resources/model/referenceStrata.png and b/src/site/en/resources/model/referenceStrata.png differ diff --git a/src/site/en/resources/model/referenceTSParameter.png b/src/site/en/resources/model/referenceTSParameter.png index 0838f9f..ee0c39d 100644 Binary files a/src/site/en/resources/model/referenceTSParameter.png and b/src/site/en/resources/model/referenceTSParameter.png differ diff --git a/src/site/en/resources/model/referenceVessel.png b/src/site/en/resources/model/referenceVessel.png index e1ffe72..c098e0b 100644 Binary files a/src/site/en/resources/model/referenceVessel.png and b/src/site/en/resources/model/referenceVessel.png differ diff --git a/src/site/en/rst/model.rst b/src/site/en/rst/model.rst index 4f9a308..ec83a73 100644 --- a/src/site/en/rst/model.rst +++ b/src/site/en/rst/model.rst @@ -58,6 +58,7 @@ Modèle du référentiel - `Référentiel ReferenceDatum`_ - `Référentiel TSParameter`_ - `Référentiel Vessel`_ +- `Référentiel Port`_ Modèle thématique ================= @@ -66,6 +67,7 @@ Partie commune ~~~~~~~~~~~~~~ - `Partie commune des données thématiques`_ +- `Partie commune des données bouées`_ Sous modèle acoustique @@ -91,7 +93,9 @@ Sous modèle pêcherie .. _Référentiel ReferenceDatum: model/referenceReferenceDatum.png .. _Référentiel TSParameter: model/referenceTSParameter.png .. _Référentiel Vessel: model/referenceVessel.png +.. _Référentiel Port: model/referencePort.png .. _Partie commune des données thématiques: model/dataCommon.png +.. _Partie commune des données bouées: model/dataMooring.png .. _Sous modèle acoustique: model/dataAcoustic.png .. _Sous modèle pêcherie: model/dataCatches.png diff --git a/src/site/resources/model/Transverse.png b/src/site/resources/model/Transverse.png index 3d690ae..e55d12a 100644 Binary files a/src/site/resources/model/Transverse.png and b/src/site/resources/model/Transverse.png differ diff --git a/src/site/resources/model/dataAcoustic.png b/src/site/resources/model/dataAcoustic.png index c8b38b1..6e63f5b 100644 Binary files a/src/site/resources/model/dataAcoustic.png and b/src/site/resources/model/dataAcoustic.png differ diff --git a/src/site/resources/model/dataCatches.png b/src/site/resources/model/dataCatches.png index c7bb87f..1cc5bc3 100644 Binary files a/src/site/resources/model/dataCatches.png and b/src/site/resources/model/dataCatches.png differ diff --git a/src/site/resources/model/dataCategory.png b/src/site/resources/model/dataCategory.png index 6199ad4..3cca050 100644 Binary files a/src/site/resources/model/dataCategory.png and b/src/site/resources/model/dataCategory.png differ diff --git a/src/site/resources/model/dataCommon.png b/src/site/resources/model/dataCommon.png index 24174e4..027b511 100644 Binary files a/src/site/resources/model/dataCommon.png and b/src/site/resources/model/dataCommon.png differ diff --git a/src/site/resources/model/dataEchotype.png b/src/site/resources/model/dataEchotype.png index 2182897..ad2eb5d 100644 Binary files a/src/site/resources/model/dataEchotype.png and b/src/site/resources/model/dataEchotype.png differ diff --git a/src/site/resources/model/dataLengthAgeKey.png b/src/site/resources/model/dataLengthAgeKey.png index a17643d..a578e9b 100644 Binary files a/src/site/resources/model/dataLengthAgeKey.png and b/src/site/resources/model/dataLengthAgeKey.png differ diff --git a/src/site/resources/model/dataLengthWeightKey.png b/src/site/resources/model/dataLengthWeightKey.png index aec92f3..a854245 100644 Binary files a/src/site/resources/model/dataLengthWeightKey.png and b/src/site/resources/model/dataLengthWeightKey.png differ diff --git a/src/site/resources/model/dataMooring.png b/src/site/resources/model/dataMooring.png new file mode 100644 index 0000000..7610920 Binary files /dev/null and b/src/site/resources/model/dataMooring.png differ diff --git a/src/site/resources/model/referenceAcousticInstrument.png b/src/site/resources/model/referenceAcousticInstrument.png index e11075d..9180473 100644 Binary files a/src/site/resources/model/referenceAcousticInstrument.png and b/src/site/resources/model/referenceAcousticInstrument.png differ diff --git a/src/site/resources/model/referenceAll.png b/src/site/resources/model/referenceAll.png index 161b3e5..e42ec18 100644 Binary files a/src/site/resources/model/referenceAll.png and b/src/site/resources/model/referenceAll.png differ diff --git a/src/site/resources/model/referenceAreaOfOperation.png b/src/site/resources/model/referenceAreaOfOperation.png index bc51411..dc8ae94 100644 Binary files a/src/site/resources/model/referenceAreaOfOperation.png and b/src/site/resources/model/referenceAreaOfOperation.png differ diff --git a/src/site/resources/model/referenceCellType.png b/src/site/resources/model/referenceCellType.png index f50e3e1..68b6d54 100644 Binary files a/src/site/resources/model/referenceCellType.png and b/src/site/resources/model/referenceCellType.png differ diff --git a/src/site/resources/model/referenceDataMetadata.png b/src/site/resources/model/referenceDataMetadata.png index 3f4cf54..a65092f 100644 Binary files a/src/site/resources/model/referenceDataMetadata.png and b/src/site/resources/model/referenceDataMetadata.png differ diff --git a/src/site/resources/model/referenceDataQuality.png b/src/site/resources/model/referenceDataQuality.png index 82684d2..1ddda16 100644 Binary files a/src/site/resources/model/referenceDataQuality.png and b/src/site/resources/model/referenceDataQuality.png differ diff --git a/src/site/resources/model/referenceDepthStratum.png b/src/site/resources/model/referenceDepthStratum.png index b8927de..774aee7 100644 Binary files a/src/site/resources/model/referenceDepthStratum.png and b/src/site/resources/model/referenceDepthStratum.png differ diff --git a/src/site/resources/model/referenceGear.png b/src/site/resources/model/referenceGear.png index 44af6df..b5afcf0 100644 Binary files a/src/site/resources/model/referenceGear.png and b/src/site/resources/model/referenceGear.png differ diff --git a/src/site/resources/model/referenceMission.png b/src/site/resources/model/referenceMission.png index 5323104..a1bdcd3 100644 Binary files a/src/site/resources/model/referenceMission.png and b/src/site/resources/model/referenceMission.png differ diff --git a/src/site/resources/model/referenceOperation.png b/src/site/resources/model/referenceOperation.png index 5f97014..55e42df 100644 Binary files a/src/site/resources/model/referenceOperation.png and b/src/site/resources/model/referenceOperation.png differ diff --git a/src/site/resources/model/referencePort.png b/src/site/resources/model/referencePort.png new file mode 100644 index 0000000..f350beb Binary files /dev/null and b/src/site/resources/model/referencePort.png differ diff --git a/src/site/resources/model/referenceProtocole.png b/src/site/resources/model/referenceProtocole.png index 1eef11e..4588127 100644 Binary files a/src/site/resources/model/referenceProtocole.png and b/src/site/resources/model/referenceProtocole.png differ diff --git a/src/site/resources/model/referenceReferenceDatum.png b/src/site/resources/model/referenceReferenceDatum.png index 66c94f0..b8ff01d 100644 Binary files a/src/site/resources/model/referenceReferenceDatum.png and b/src/site/resources/model/referenceReferenceDatum.png differ diff --git a/src/site/resources/model/referenceSample.png b/src/site/resources/model/referenceSample.png index c8af382..2282f68 100644 Binary files a/src/site/resources/model/referenceSample.png and b/src/site/resources/model/referenceSample.png differ diff --git a/src/site/resources/model/referenceSpecies.png b/src/site/resources/model/referenceSpecies.png index 5fec46d..8a71191 100644 Binary files a/src/site/resources/model/referenceSpecies.png and b/src/site/resources/model/referenceSpecies.png differ diff --git a/src/site/resources/model/referenceStrata.png b/src/site/resources/model/referenceStrata.png index 8d5e27b..55f45a5 100644 Binary files a/src/site/resources/model/referenceStrata.png and b/src/site/resources/model/referenceStrata.png differ diff --git a/src/site/resources/model/referenceTSParameter.png b/src/site/resources/model/referenceTSParameter.png index 0838f9f..ee0c39d 100644 Binary files a/src/site/resources/model/referenceTSParameter.png and b/src/site/resources/model/referenceTSParameter.png differ diff --git a/src/site/resources/model/referenceVessel.png b/src/site/resources/model/referenceVessel.png index 02d192f..c098e0b 100644 Binary files a/src/site/resources/model/referenceVessel.png and b/src/site/resources/model/referenceVessel.png differ diff --git a/src/site/rst/model.rst b/src/site/rst/model.rst index 6a91f34..46e3084 100644 --- a/src/site/rst/model.rst +++ b/src/site/rst/model.rst @@ -49,6 +49,7 @@ Modèle du référentiel - `Référentiel ReferenceDatum`_ - `Référentiel TSParameter`_ - `Référentiel Vessel`_ +- `Référentiel Port`_ Modèle thématique ================= @@ -57,6 +58,7 @@ Partie commune ~~~~~~~~~~~~~~ - `Partie commune des données thématiques`_ +- `Partie commune des données bouées`_ Sous modèle acoustique @@ -83,7 +85,9 @@ Sous modèle pêcherie .. _Référentiel ReferenceDatum: model/referenceReferenceDatum.png .. _Référentiel TSParameter: model/referenceTSParameter.png .. _Référentiel Vessel: model/referenceVessel.png +.. _Référentiel Port: model/referencePort.png .. _Partie commune des données thématiques: model/dataCommon.png +.. _Partie commune des données bouées: model/dataMooring.png .. _Sous modèle acoustique: model/dataAcoustic.png .. _Sous modèle pêcherie: model/dataCatches.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.