branch develop updated (cfa7b2a -> 04a0621)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from cfa7b2a Ajoute une dépendance vers guava dans topia template extension pour corriger le build new ee0e6e6 Change log levels new 2678091 Block actions if not on correct tab new 04a0621 Use eugene 3.0-alpha-6 and use new compact format 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 04a0621d81aa7b6cb24203ba39ae90ed0b5e73c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:06:23 2016 +0200 Use eugene 3.0-alpha-6 and use new compact format commit 26780910819a640c64ed4317f7452cb6cd545b75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 14:39:40 2016 +0200 Block actions if not on correct tab commit ee0e6e63fa3ed4b4a745de787666b392f832a947 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 14:05:41 2016 +0200 Change log levels Summary of changes: .../swing/ui/storage/tabs/StorageTabUIHandler.java | 39 ++-- entities/pom.xml | 140 ++++-------- entities/src/main/xmi/observe-common.properties | 87 -------- entities/src/main/xmi/observe-longline.properties | 161 ------------- entities/src/main/xmi/observe-seine.properties | 155 ------------- entities/src/main/xmi/observe.objectmodel-ext | 248 +++++++++++++++++++++ pom.xml | 3 +- services-dto/pom.xml | 16 +- .../xmi/observe-services-dto-common.properties | 52 ----- .../xmi/observe-services-dto-longline.properties | 123 ---------- .../main/xmi/observe-services-dto-seine.properties | 94 -------- .../main/xmi/observe-services-dto.objectmodel-ext | 216 ++++++++++++++++++ .../persistence/metadata/TopiaMetadataEntity.java | 12 +- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../templates/TopiaMetadataModelGenerator.java | 8 +- 15 files changed, 551 insertions(+), 805 deletions(-) delete mode 100644 entities/src/main/xmi/observe-common.properties delete mode 100644 entities/src/main/xmi/observe-longline.properties delete mode 100644 entities/src/main/xmi/observe-seine.properties create mode 100644 entities/src/main/xmi/observe.objectmodel-ext delete mode 100644 services-dto/src/main/xmi/observe-services-dto-common.properties delete mode 100644 services-dto/src/main/xmi/observe-services-dto-longline.properties delete mode 100644 services-dto/src/main/xmi/observe-services-dto-seine.properties create mode 100644 services-dto/src/main/xmi/observe-services-dto.objectmodel-ext -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ee0e6e63fa3ed4b4a745de787666b392f832a947 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 14:05:41 2016 +0200 Change log levels --- .../topia/persistence/metadata/TopiaMetadataEntity.java | 12 ++++++------ .../topia/persistence/metadata/TopiaMetadataModel.java | 2 +- .../nuiton/topia/templates/TopiaMetadataModelGenerator.java | 8 ++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java index 9a484de..c4336ea 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java +++ b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java @@ -258,38 +258,38 @@ public class TopiaMetadataEntity { } public void addOneToManyAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); + log.debug(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); oneToManyAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); } public void addOneToManyAssociationInverse(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); + log.debug(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); oneToManyAssociationInverses.add(name); addDbColumnName(name, dbColumnName); } public void addReversedAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); + log.debug(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); reversedAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); } public void addManyToManyAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName, String dbManyToManyAssociationTableName) { - log.info(getType() + "/" + name + "(" + dbManyToManyAssociationTableName + ") →" + associationClazz.getType()); + log.debug(getType() + "/" + name + "(" + dbManyToManyAssociationTableName + ") →" + associationClazz.getType()); manyToManyAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); dbManyToManyAssociationsTableName.put(name, dbManyToManyAssociationTableName); } public void addManyToOneAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); + log.debug(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); manyToOneAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); } public void addProperty(String name, String type, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + type); + log.debug(getType() + "/" + name + "(" + dbColumnName + ") →" + type); properties.put(name, type); if (Blob.class.getName().equals(type)) { blobProperties.add(name); diff --git a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java index 09a698a..b8019ec 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java +++ b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java @@ -73,7 +73,7 @@ public class TopiaMetadataModel implements Iterable<TopiaMetadataEntity> { Preconditions.checkState(!entities.containsKey(type), type + " already in cache"); TopiaMetadataEntity clazz = new TopiaMetadataEntity(parent, type, dbSchemaName, dbTableName); entities.put(type, clazz); - log.info(clazz.getType()); + log.debug("create new entity: " + clazz.getType()); return clazz; } diff --git a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java index a13f3cb..6ec37b5 100644 --- a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java +++ b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java @@ -160,7 +160,9 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { } else { - log.info("Start " + entityClassName); + if (isVerbose()) { + log.info("Start " + entityClassName); + } ObjectModelPackage aPackage = model.getPackage(entityClass); String dbSchemaName = topiaTagValues.getDbSchemaNameTagValue(entityClass, aPackage, model); @@ -264,7 +266,9 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { } } - log.info("End " + entityClassName); + if (isVerbose()) { + log.info("End " + entityClassName); + } } return metadataEntity; -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 26780910819a640c64ed4317f7452cb6cd545b75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 14:39:40 2016 +0200 Block actions if not on correct tab --- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index b834dbd..afd1794 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -141,7 +141,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doChooseFile", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getFileChooserAction().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getFileChooserAction().doClick(); + } } }); KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); @@ -150,7 +152,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doUseSsl", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getRemoteUseSsl().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getRemoteUseSsl().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK), "doUseSsl"); @@ -158,7 +162,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doKeepConfiguration", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getStoreRemoteConfig().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getStoreRemoteConfig().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "doKeepConfiguration"); @@ -182,14 +188,18 @@ public class StorageTabUIHandler { ui.getActionMap().put("doConfigureRemoteSource", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getConfigureCentralSource().doClick(); + if (StorageStep.CONFIG_REFERENTIEL == ui.getModel().getStep()) { + ui.getConfigureCentralSource().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doConfigureRemoteSource"); ui.getActionMap().put("doConfigureRemoteServer", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getConfigureCentralSourceServer().doClick(); + if (StorageStep.CONFIG_REFERENTIEL == ui.getModel().getStep()) { + ui.getConfigureCentralSourceServer().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doConfigureRemoteServer"); @@ -282,14 +292,18 @@ public class StorageTabUIHandler { ui.getActionMap().put("doBackup", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getDoBackup().doClick(); + if (StorageStep.BACKUP == ui.getModel().getStep()) { + ui.getDoBackup().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doBackup"); ui.getActionMap().put("doChooseDirectory", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getChooseFileAction().doClick(); + if (StorageStep.BACKUP == ui.getModel().getStep()) { + ui.getChooseFileAction().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doChooseDirectory"); @@ -412,17 +426,6 @@ public class StorageTabUIHandler { ui.getModel().validate(); } -// public void chooseSslCertificatFile(ConfigUI ui) { -// File f = UIHelper.chooseFile( -// ui, -// t("observe.title.choose.ssl.cert"), -// t("observe.action.choose.ssl.cert"), -// ui.getModel().getSslCertificatFile(), -// "^.+\\.jks$", -// t("observe.action.choose.ssl.cert.description")); -// ui.getModel().setSslCertificatFile(f); -// } - public void initTree(SelectDataUI ui, ObserveSwingDataSource source) { StorageUIModel model = ui.getModel(); if (model.isUseSelectData()) { -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 04a0621d81aa7b6cb24203ba39ae90ed0b5e73c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 15:06:23 2016 +0200 Use eugene 3.0-alpha-6 and use new compact format --- entities/pom.xml | 140 ++++-------- entities/src/main/xmi/observe-common.properties | 87 -------- entities/src/main/xmi/observe-longline.properties | 161 ------------- entities/src/main/xmi/observe-seine.properties | 155 ------------- entities/src/main/xmi/observe.objectmodel-ext | 248 +++++++++++++++++++++ pom.xml | 3 +- services-dto/pom.xml | 16 +- .../xmi/observe-services-dto-common.properties | 52 ----- .../xmi/observe-services-dto-longline.properties | 123 ---------- .../main/xmi/observe-services-dto-seine.properties | 94 -------- .../main/xmi/observe-services-dto.objectmodel-ext | 216 ++++++++++++++++++ 11 files changed, 517 insertions(+), 778 deletions(-) diff --git a/entities/pom.xml b/entities/pom.xml index c8f7b3a..887ad80 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -57,11 +58,11 @@ <!-- commons --> <dependency> - <groupId> org.apache.commons</groupId> + <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId> org.apache.commons</groupId> + <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> <dependency> @@ -92,11 +93,6 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> </dependency> - <!--dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-sql-batch</artifactId> - <scope>compile</scope> - </dependency--> <dependency> <groupId>org.hibernate</groupId> @@ -135,40 +131,36 @@ <build> <resources> <resource> - <directory>${project.build.directory}/generated-sources/resources/</directory> - <includes> - <include>objectmodel/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> + <directory>${project.build.directory}/xmi</directory> <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/xmi</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> + <include>*.objectmodel-ext</include> </includes> </resource> </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> + + <pluginManagement> + + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-templates-extension</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -177,68 +169,46 @@ <inherited>false</inherited> <executions> - <!-- on recopie le les fichiers de modèle pour appliquer les filtres --> + <!-- on recopie les fichiers de modèle pour appliquer les filtres --> <execution> - <id>copy model properties</id> + <id>copy model files</id> <phase>generate-sources</phase> <configuration> - <tasks> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/xmi"> + <target> + <copy verbose="true" failonerror="true" overwrite="true" filtering="true" + todir="${project.build.directory}/xmi"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version" /> + <filter value="${observe.model.version}" token="observe.model.version"/> </filterset> <fileset dir="${basedir}/src/main/xmi"> - <include name="*.properties" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>copy model zargo</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <copy verbose="true" failonerror="false" overwrite="true" todir="${project.build.directory}/xmi"> - <fileset dir="${basedir}/src/main/xmi"> - <include name="*.zargo" /> + <include name="*.objectmodel-ext"/> </fileset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> </goals> </execution> - </executions> </plugin> <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <configuration> - <defaultPackage>fr.ird.observe</defaultPackage> - <fullPackagePath>fr.ird.observe</fullPackagePath> - </configuration> <executions> <execution> <phase>generate-sources</phase> <id>generate-persistence</id> <configuration> + <defaultPackage>fr.ird.observe</defaultPackage> + <fullPackagePath>fr.ird.observe</fullPackagePath> + <modelExtensionFile>${project.build.directory}/xmi/observe.objectmodel-ext</modelExtensionFile> <inputs> - <input>zargo:target/xmi:observe-common.zargo</input> - <input>zargo:target/xmi:observe-seine.zargo</input> - <input>zargo:target/xmi:observe-longline.zargo</input> + <input>zargo</input> </inputs> - <!--org.nuiton.eugene.java.JavaInterfaceTransformer,--> <templates> org.nuiton.topia.templates.TopiaMetaTransformer, - org.nuiton.topia.templates.BinderHelperTransformer, org.nuiton.topia.templates.TopiaMetadataModelGenerator </templates> </configuration> @@ -247,32 +217,6 @@ </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-templates</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> </plugin> </plugins> diff --git a/entities/src/main/xmi/observe-common.properties b/entities/src/main/xmi/observe-common.properties deleted file mode 100644 index 491f35d..0000000 --- a/entities/src/main/xmi/observe-common.properties +++ /dev/null @@ -1,87 +0,0 @@ -### -# #%L -# ObServe :: Entities -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=@observe.model.version@ -model.tagvalue.notGenerateToString=true -model.tagvalue.generateForeignKeyNames=true -model.tagvalue.generatePropertyChangeSupport =true -model.tagvalue.indexForeignKeys=true -model.tagvalue.useEnumerationName=false -model.tagvalue.attributeType.String=java.lang.String -model.tagvalue.attributeType.Float=java.lang.Float -model.tagvalue.attributeType.Integer=java.lang.Integer -model.tagvalue.attributeType.Boolean=java.lang.Boolean -model.tagvalue.attributeType.Long=java.lang.Long - -############################################################################### -### Schema #################################################################### -############################################################################### - -package.fr.ird.observe.entities.referentiel.tagvalue.dbSchema=OBSERVE_COMMON -package.fr.ird.observe.entities.tagvalue.dbSchema=OBSERVE_COMMON - -############################################################################### -### Champ Commentaire en text ################################################# -############################################################################### - -fr.ird.observe.entities.CommentableEntity.attribute.comment.tagValue.hibernateAttributeType=text -fr.ird.observe.entities.referentiel.Vessel.attribute.comment.tagValue.hibernateAttributeType=text -fr.ird.observe.entities.referentiel.Program.attribute.comment.tagValue.hibernateAttributeType=text - -############################################################################### -### Champ Numeric (utilisation du type sql numeric) ########################### -############################################################################### - -fr.ird.observe.entities.referentiel.Vessel.attribute.capacity.tagvalue.sqlType=numeric -fr.ird.observe.entities.referentiel.Vessel.attribute.length.tagvalue.sqlType=numeric -fr.ird.observe.entities.referentiel.Vessel.attribute.searchMaximum.tagvalue.sqlType=numeric - -fr.ird.observe.entities.referentiel.Species.attribute.minWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.referentiel.Species.attribute.maxWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.referentiel.Species.attribute.minLength.tagvalue.sqlType=numeric -fr.ird.observe.entities.referentiel.Species.attribute.maxLength.tagvalue.sqlType=numeric - -############################################################################### -### Données lazy ############################################################## -############################################################################### - -fr.ird.observe.entities.referentiel.Gear.attribute.gearCaracteristic.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.GearCaracteristic.attribute.gearCaracteristicType.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Vessel.attribute.flagCountry.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Vessel.attribute.vesselType.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Vessel.attribute.vesselSizeCategory.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Species.attribute.speciesGroup.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Species.attribute.ocean.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.SpeciesList.attribute.species.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Organism.attribute.country.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.ocean.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.species.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.sex.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.Program.attribute.organism.tagvalue.lazy=false - -############################################################################### -### NotNull ################################################################### -############################################################################### - -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.ocean.tagvalue.notNull=true -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.species.tagvalue.notNull=true -fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.sex.tagValue.notNull=true -fr.ird.observe.entities.ObserveEntity.attribute.lastUpdateDate.tagValue.notNull=true diff --git a/entities/src/main/xmi/observe-longline.properties b/entities/src/main/xmi/observe-longline.properties deleted file mode 100644 index 3a7d693..0000000 --- a/entities/src/main/xmi/observe-longline.properties +++ /dev/null @@ -1,161 +0,0 @@ -### -# #%L -# ObServe :: Entities -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=@observe.model.version@ -model.tagvalue.notGenerateToString=true -model.tagvalue.generateOperatorForDAOHelper=true -model.tagvalue.generateForeignKeyNames=true -model.tagvalue.generatePropertyChangeSupport =true - -############################################################################### -### Schema #################################################################### -############################################################################### - -package.fr.ird.observe.entities.referentiel.longline.tagvalue.dbSchema=OBSERVE_LONGLINE -package.fr.ird.observe.entities.longline.tagvalue.dbSchema=OBSERVE_LONGLINE - -############################################################################### -### DbName #################################################################### -############################################################################### - -fr.ird.observe.entities.referentiel.longline.VesselActivityLongline.class.tagvalue.dbName=VesselActivity -fr.ird.observe.entities.longline.ActivityLongline.attribute.vesselActivityLongline.tagvalue.dbName=vesselActivity - -fr.ird.observe.entities.referentiel.longline.CatchFateLongline.class.tagvalue.dbName=CatchFate -fr.ird.observe.entities.longline.CatchLongline.attribute.catchFateLongline.tagvalue.dbName=catchFate - -fr.ird.observe.entities.longline.ActivityLongline.class.tagvalue.dbName=Activity -fr.ird.observe.entities.longline.ActivityLongline.attribute.encounter.tagvalue.reverseDbName=activity -fr.ird.observe.entities.longline.ActivityLongline.attribute.sensorUsed.tagvalue.reverseDbName=activity - -fr.ird.observe.entities.longline.CatchLongline.class.tagvalue.dbName=Catch -fr.ird.observe.entities.longline.CatchLongline.attribute.sizeMeasure.tagvalue.reverseDbName=catch -fr.ird.observe.entities.longline.CatchLongline.attribute.weightMeasure.tagvalue.reverseDbName=catch -fr.ird.observe.entities.longline.Branchline.attribute.catchLongline.tagvalue.dbName=catch -fr.ird.observe.entities.longline.CatchLongline.attribute.predator.tagvalue.reverseDbName=catch -fr.ird.observe.entities.longline.CatchLongline.attribute.predator.tagvalue.manyToManyTableName=catch_predator - -fr.ird.observe.entities.longline.SetLongline.class.tagvalue.dbName=Set -fr.ird.observe.entities.longline.ActivityLongline.attribute.setLongline.tagvalue.dbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.baitsComposition.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.floatlinesComposition.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.hooksComposition.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.section.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.tdr.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.branchlinesComposition.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.mitigationType.tagvalue.reverseDbName=set -fr.ird.observe.entities.longline.SetLongline.attribute.mitigationType.tagvalue.manyToManyTableName=mitigationtype_set - -fr.ird.observe.entities.longline.Section.attribute.setLongline.tagvalue.dbName=set - -fr.ird.observe.entities.longline.TripLongline.class.tagvalue.dbName=Trip -fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.tagvalue.reverseDbName=trip -fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.tagvalue.reverseDbName=trip - -fr.ird.observe.entities.longline.GearUseFeaturesLongline.class.tagvalue.dbName=GearUseFeatures -fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.reverseDbName=gearUseFeatures - -fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.class.tagvalue.dbName=GearUseFeaturesMeasurement - -############################################################################### -### Champ Numeric (utilisation du type sql numeric) ########################### -############################################################################### -fr.ird.observe.entities.longline.Branchline.attribute.hookSize.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Branchline.attribute.branchlineLength.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Branchline.attribute.swivelWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Branchline.attribute.snapWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Branchline.attribute.tracelineLength.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.BranchlinesComposition.attribute.length.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.CatchLongline.attribute.beatDiameter.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.CatchLongline.attribute.gonadeWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.CatchLongline.attribute.totalWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Encounter.attribute.distance.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.settingStartLatitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.settingStartLongitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.settingEndLatitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.settingEndLongitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.settingVesselSpeed.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.shooterSpeed.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.swivelWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.haulingStartLatitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.haulingStartLongitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.haulingEndLatitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.haulingEndLongitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SetLongline.attribute.snapWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.FloatlinesComposition.attribute.length.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.HooksComposition.attribute.hookSize.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.SizeMeasure.attribute.size.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Tdr.attribute.floatline1Length.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.Tdr.attribute.floatline2Length.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.TdrRecord.attribute.temperature.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.TdrRecord.attribute.depth.tagvalue.sqlType=numeric -fr.ird.observe.entities.longline.WeightMeasure.attribute.weight.tagvalue.sqlType=numeric - -############################################################################### -### Champ Date (utilisation du type sql date) ################################# -############################################################################### - -############################################################################### -### Champ Time (utilisation du type sql time ) ################################ -############################################################################### - -############################################################################### -### Données lazy ############################################################## -############################################################################### - -fr.ird.observe.entities.longline.ActivityLongline.attribute.vesselActivityLongline.tagvalue.lazy=false - -############################################################################### -### Natural Ids ############################################################### -############################################################################### - -############################################################################### -### OrderBy ################################################################### -############################################################################### - -fr.ird.observe.entities.longline.SetLongline.attribute.section.tagvalue.orderBy=settingIdentifier -fr.ird.observe.entities.longline.Section.attribute.basket.tagvalue.orderBy=settingIdentifier -fr.ird.observe.entities.longline.Basket.attribute.branchline.tagvalue.orderBy=settingIdentifier -fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.tagvalue.orderBy=topiaCreateDate -fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate - -############################################################################### -### Unique #################################################################### -############################################################################### - -fr.ird.observe.entities.longline.SetLongline.attribute.section.stereotype=unique -fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.stereotype=unique -fr.ird.observe.entities.longline.Section.attribute.basket.stereotype=unique -fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.stereotype=unique -fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.stereotype=unique -fr.ird.observe.entities.longline.Basket.attribute.branchline.stereotype=unique -fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique - -############################################################################### -### NotNull ################################################################### -############################################################################### - -fr.ird.observe.entities.longline.Section.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Basket.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Branchline.attribute.settingIdentifier.tagValue.notNull=true - -fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.notNull=true diff --git a/entities/src/main/xmi/observe-seine.properties b/entities/src/main/xmi/observe-seine.properties deleted file mode 100644 index 0f2da73..0000000 --- a/entities/src/main/xmi/observe-seine.properties +++ /dev/null @@ -1,155 +0,0 @@ -### -# #%L -# ObServe :: Entities -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=@observe.model.version@ -model.tagvalue.notGenerateToString=true -model.tagvalue.generateOperatorForDAOHelper=true -model.tagvalue.generateForeignKeyNames=true -model.tagvalue.generatePropertyChangeSupport =true - -############################################################################### -### Schema #################################################################### -############################################################################### - -package.fr.ird.observe.entities.referentiel.seine.tagvalue.dbSchema=OBSERVE_SEINE -package.fr.ird.observe.entities.seine.tagvalue.dbSchema=OBSERVE_SEINE - -############################################################################### -### DbName #################################################################### -############################################################################### - -fr.ird.observe.entities.seine.TripSeine.class.tagvalue.dbName=Trip -fr.ird.observe.entities.seine.TripSeine.attribute.route.tagvalue.reverseDbName=trip -fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.reverseDbName=trip - -fr.ird.observe.entities.referentiel.seine.VesselActivitySeine.class.tagvalue.dbName=VesselActivity -fr.ird.observe.entities.seine.ActivitySeine.attribute.vesselActivitySeine.tagvalue.dbName=vesselActivity - -fr.ird.observe.entities.seine.ActivitySeine.class.tagvalue.dbName=Activity -fr.ird.observe.entities.seine.ActivitySeine.attribute.floatingObject.tagvalue.reverseDbName=activity -fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.tagvalue.manyToManyTableName=activity_observedSystem -fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.tagvalue.reverseDbName=activity - -fr.ird.observe.entities.seine.SetSeine.class.tagvalue.dbName=Set -fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetCatch.tagvalue.reverseDbName=set -fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetSample.tagvalue.reverseDbName=set -fr.ird.observe.entities.seine.SetSeine.attribute.targetSample.tagvalue.reverseDbName=set -fr.ird.observe.entities.seine.SetSeine.attribute.targetCatch.tagvalue.reverseDbName=set -fr.ird.observe.entities.seine.SetSeine.attribute.schoolEstimate.tagvalue.reverseDbName=set -fr.ird.observe.entities.seine.ActivitySeine.attribute.setSeine.tagvalue.dbName=set -fr.ird.observe.entities.seine.TargetCatch.attribute.setSeine.tagvalue.dbName=set -fr.ird.observe.entities.seine.SchoolEstimate.attribute.setSeine.tagvalue.dbName=set - -fr.ird.observe.entities.seine.GearUseFeaturesSeine.class.tagvalue.dbName=GearUseFeatures -fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.reverseDbName=gearUseFeatures - -fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine.class.tagvalue.dbName=GearUseFeaturesMeasurement - -############################################################################### -### Champ Numeric (utilisation du type sql numeric) ########################### -############################################################################### -fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystemDistance.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.ActivitySeine.attribute.latitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.ActivitySeine.attribute.longitude.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.ActivitySeine.attribute.seaSurfaceTemperature.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.ActivitySeine.attribute.vesselSpeed.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.SetSeine.attribute.currentSpeed.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.NonTargetCatch.attribute.catchWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.NonTargetCatch.attribute.meanWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.NonTargetCatch.attribute.meanLength.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.TargetCatch.attribute.catchWeight.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.Route.attribute.startLogValue.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.Route.attribute.endLogValue.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.NonTargetLength.attribute.length.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.NonTargetLength.attribute.weight.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.TargetLength.attribute.length.tagvalue.sqlType=numeric -fr.ird.observe.entities.seine.TargetLength.attribute.weight.tagvalue.sqlType=numeric - -############################################################################### -### Champ Date (utilisation du type sql date) ################################# -############################################################################### - -fr.ird.observe.entities.seine.TripSeine.attribute.startDate.tagValue.hibernateAttributeType.java.util.Date=date -fr.ird.observe.entities.seine.TripSeine.attribute.endDate.tagValue.hibernateAttributeType.java.util.Date=date -fr.ird.observe.entities.seine.Route.attribute.date.tagValue.hibernateAttributeType.java.util.Date=date - -############################################################################### -### Champ Time (utilisation du type sql time ) ################################ -############################################################################### - -fr.ird.observe.entities.seine.SetSeine.attribute.startTime.tagValue.hibernateAttributeType.java.util.Date=time -fr.ird.observe.entities.seine.ActivitySeine.attribute.time.tagValue.hibernateAttributeType.java.util.Date=time - -############################################################################### -### Données lazy ############################################################## -############################################################################### - -fr.ird.observe.entities.seine.NonTargetLength.attribute.sex.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.seine.WeightCategory.attribute.species.tagvalue.lazy=false - -############################################################################### -### Natural Ids ############################################################### -############################################################################### - -# TargetCatch (weightCategory - reasonForDiscard - discarded - well - set) -fr.ird.observe.entities.seine.TargetCatch.class.tagvalue.naturalIdMutable=true -fr.ird.observe.entities.seine.TargetCatch.attribute.weightCategory.tagvalue.naturalId=true -fr.ird.observe.entities.seine.TargetCatch.attribute.reasonForDiscard.tagvalue.naturalId=true -fr.ird.observe.entities.seine.TargetCatch.attribute.discarded.tagvalue.naturalId=true -fr.ird.observe.entities.seine.TargetCatch.attribute.well.tagvalue.naturalId=true -fr.ird.observe.entities.seine.TargetCatch.attribute.setSeine.tagvalue.naturalId=true -# valeurs nulles possibles (reasonForDiscard - well) -fr.ird.observe.entities.seine.TargetCatch.attribute.well.tagvalue.notNull=false -fr.ird.observe.entities.seine.TargetCatch.attribute.reasonForDiscard.tagvalue.notNull=false - -# SchoolEstimate (species - set) -fr.ird.observe.entities.seine.SchoolEstimate.class.tagvalue.naturalIdMutable=true -fr.ird.observe.entities.seine.SchoolEstimate.attribute.setSeine.tagvalue.naturalId=true -fr.ird.observe.entities.seine.SchoolEstimate.attribute.species.tagvalue.naturalId=true - -############################################################################### -### OrderBy ################################################################### -############################################################################### - -fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.orderBy=topiaCreateDate -fr.ird.observe.entities.seine.TripSeine.attribute.route.tagvalue.orderBy=date -fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate -fr.ird.observe.entities.seine.Route.attribute.activitySeine.tagvalue.orderBy=time - -############################################################################### -### Unique #################################################################### -############################################################################### - -fr.ird.observe.entities.seine.TripSeine.attribute.route.stereotype=unique -fr.ird.observe.entities.seine.TargetSample.attribute.targetLength.stereotype=unique -fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetSample.stereotype=unique -fr.ird.observe.entities.seine.SetSeine.attribute.targetSample.stereotype=unique -fr.ird.observe.entities.seine.Route.attribute.activitySeine.stereotype=unique -fr.ird.observe.entities.seine.NonTargetSample.attribute.nonTargetLength.stereotype=unique -fr.ird.observe.entities.seine.FloatingObject.attribute.transmittingBuoy.stereotype=unique -fr.ird.observe.entities.seine.ActivitySeine.attribute.floatingObject.stereotype=unique -fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.stereotype=unique - -############################################################################### -### NotNull ################################################################### -############################################################################### - -fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine.attribute.gearCaracteristic.tagValue.notNull=true diff --git a/entities/src/main/xmi/observe.objectmodel-ext b/entities/src/main/xmi/observe.objectmodel-ext new file mode 100644 index 0000000..c3ad97f --- /dev/null +++ b/entities/src/main/xmi/observe.objectmodel-ext @@ -0,0 +1,248 @@ +[model] +attributeType.Boolean java.lang.Boolean +attributeType.Float java.lang.Float +attributeType.Integer java.lang.Integer +attributeType.Long java.lang.Long +attributeType.String java.lang.String +generateForeignKeyNames true +generateOperatorForDAOHelper true +generatePropertyChangeSupport true +indexForeignKeys true +notGenerateToString true +useEnumerationName false +version @observe.model.version@ + +[package] +fr.ird.observe.entities + dbSchema OBSERVE_COMMON +fr.ird.observe.entities.longline + dbSchema OBSERVE_LONGLINE +fr.ird.observe.entities.referentiel + dbSchema OBSERVE_COMMON +fr.ird.observe.entities.referentiel.longline + dbSchema OBSERVE_LONGLINE +fr.ird.observe.entities.referentiel.seine + dbSchema OBSERVE_SEINE +fr.ird.observe.entities.seine + dbSchema OBSERVE_SEINE + +[class] +fr.ird.observe.entities.CommentableEntity + comment.hibernateAttributeType text +fr.ird.observe.entities.ObserveEntity + lastUpdateDate.notNull true +fr.ird.observe.entities.longline.ActivityLongline + dbName Activity + encounter.reverseDbName activity + sensorUsed.reverseDbName activity + setLongline.dbName set + vesselActivityLongline.dbName vesselActivity + vesselActivityLongline.lazy false +fr.ird.observe.entities.longline.Basket + branchline.orderBy settingIdentifier + settingIdentifier.notNull true + branchline.unique +fr.ird.observe.entities.longline.Branchline + branchlineLength.sqlType numeric + catchLongline.dbName catch + hookSize.sqlType numeric + settingIdentifier.notNull true + snapWeight.sqlType numeric + swivelWeight.sqlType numeric + tracelineLength.sqlType numeric +fr.ird.observe.entities.longline.BranchlinesComposition + length.sqlType numeric +fr.ird.observe.entities.longline.CatchLongline + dbName Catch + beatDiameter.sqlType numeric + catchFateLongline.dbName catchFate + gonadeWeight.sqlType numeric + predator.manyToManyTableName catch_predator + predator.reverseDbName catch + sizeMeasure.reverseDbName catch + totalWeight.sqlType numeric + weightMeasure.reverseDbName catch +fr.ird.observe.entities.longline.Encounter + distance.sqlType numeric +fr.ird.observe.entities.longline.FloatlinesComposition + length.sqlType numeric +fr.ird.observe.entities.longline.GearUseFeaturesLongline + dbName GearUseFeatures + gearUseFeaturesMeasurement.orderBy topiaCreateDate + gearUseFeaturesMeasurement.reverseDbName gearUseFeatures + gearUseFeaturesMeasurement.unique +fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline + dbName GearUseFeaturesMeasurement + gearCaracteristic.notNull true +fr.ird.observe.entities.longline.HooksComposition + hookSize.sqlType numeric +fr.ird.observe.entities.longline.Section + basket.orderBy settingIdentifier + setLongline.dbName set + settingIdentifier.notNull true + basket.unique +fr.ird.observe.entities.longline.SetLongline + dbName Set + baitsComposition.reverseDbName set + branchlinesComposition.reverseDbName set + catchLongline.reverseDbName set + floatlinesComposition.reverseDbName set + haulingEndLatitude.sqlType numeric + haulingEndLongitude.sqlType numeric + haulingStartLatitude.sqlType numeric + haulingStartLongitude.sqlType numeric + hooksComposition.reverseDbName set + mitigationType.manyToManyTableName mitigationtype_set + mitigationType.reverseDbName set + section.orderBy settingIdentifier + section.reverseDbName set + settingEndLatitude.sqlType numeric + settingEndLongitude.sqlType numeric + settingStartLatitude.sqlType numeric + settingStartLongitude.sqlType numeric + settingVesselSpeed.sqlType numeric + shooterSpeed.sqlType numeric + snapWeight.sqlType numeric + swivelWeight.sqlType numeric + tdr.reverseDbName set + catchLongline.unique + section.unique +fr.ird.observe.entities.longline.SizeMeasure + size.sqlType numeric +fr.ird.observe.entities.longline.Tdr + floatline1Length.sqlType numeric + floatline2Length.sqlType numeric +fr.ird.observe.entities.longline.TdrRecord + depth.sqlType numeric + temperature.sqlType numeric +fr.ird.observe.entities.longline.TripLongline + dbName Trip + activityLongline.reverseDbName trip + gearUseFeaturesLongline.orderBy topiaCreateDate + gearUseFeaturesLongline.reverseDbName trip + activityLongline.unique + gearUseFeaturesLongline.unique +fr.ird.observe.entities.longline.WeightMeasure + weight.sqlType numeric +fr.ird.observe.entities.referentiel.Gear + gearCaracteristic.lazy false +fr.ird.observe.entities.referentiel.GearCaracteristic + gearCaracteristicType.lazy false +fr.ird.observe.entities.referentiel.LengthWeightParameter + ocean.lazy false + ocean.notNull true + sex.lazy false + sex.notNull true + species.lazy false + species.notNull true +fr.ird.observe.entities.referentiel.Organism + country.lazy false +fr.ird.observe.entities.referentiel.Program + comment.hibernateAttributeType text + organism.lazy false +fr.ird.observe.entities.referentiel.Species + maxLength.sqlType numeric + maxWeight.sqlType numeric + minLength.sqlType numeric + minWeight.sqlType numeric + ocean.lazy false + speciesGroup.lazy false +fr.ird.observe.entities.referentiel.SpeciesList + species.lazy false +fr.ird.observe.entities.referentiel.Vessel + capacity.sqlType numeric + comment.hibernateAttributeType text + flagCountry.lazy false + length.sqlType numeric + searchMaximum.sqlType numeric + vesselSizeCategory.lazy false + vesselType.lazy false +fr.ird.observe.entities.referentiel.longline.CatchFateLongline + dbName CatchFate +fr.ird.observe.entities.referentiel.longline.VesselActivityLongline + dbName VesselActivity +fr.ird.observe.entities.referentiel.seine.VesselActivitySeine + dbName VesselActivity +fr.ird.observe.entities.referentiel.seine.WeightCategory + species.lazy false +fr.ird.observe.entities.seine.ActivitySeine + dbName Activity + floatingObject.reverseDbName activity + latitude.sqlType numeric + longitude.sqlType numeric + observedSystem.manyToManyTableName activity_observedSystem + observedSystem.reverseDbName activity + observedSystemDistance.sqlType numeric + seaSurfaceTemperature.sqlType numeric + setSeine.dbName set + time.hibernateAttributeType.java.util.Date time + vesselActivitySeine.dbName vesselActivity + vesselSpeed.sqlType numeric + floatingObject.unique + observedSystem.unique +fr.ird.observe.entities.seine.FloatingObject + transmittingBuoy.unique +fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine + dbName GearUseFeaturesMeasurement + gearCaracteristic.notNull true +fr.ird.observe.entities.seine.GearUseFeaturesSeine + dbName GearUseFeatures + gearUseFeaturesMeasurement.orderBy topiaCreateDate + gearUseFeaturesMeasurement.reverseDbName gearUseFeatures +fr.ird.observe.entities.seine.NonTargetCatch + catchWeight.sqlType numeric + meanLength.sqlType numeric + meanWeight.sqlType numeric +fr.ird.observe.entities.seine.NonTargetLength + length.sqlType numeric + sex.lazy false + weight.sqlType numeric +fr.ird.observe.entities.seine.NonTargetSample + nonTargetLength.unique +fr.ird.observe.entities.seine.Route + activitySeine.orderBy time + date.hibernateAttributeType.java.util.Date date + endLogValue.sqlType numeric + startLogValue.sqlType numeric + activitySeine.unique +fr.ird.observe.entities.seine.SchoolEstimate + naturalIdMutable true + setSeine.dbName set + setSeine.naturalId true + species.naturalId true +fr.ird.observe.entities.seine.SetSeine + dbName Set + currentSpeed.sqlType numeric + nonTargetCatch.reverseDbName set + nonTargetSample.reverseDbName set + schoolEstimate.reverseDbName set + startTime.hibernateAttributeType.java.util.Date time + targetCatch.reverseDbName set + targetSample.reverseDbName set + nonTargetSample.unique + targetSample.unique +fr.ird.observe.entities.seine.TargetCatch + naturalIdMutable true + catchWeight.sqlType numeric + discarded.naturalId true + reasonForDiscard.naturalId true + reasonForDiscard.notNull false + setSeine.dbName set + setSeine.naturalId true + weightCategory.naturalId true + well.naturalId true + well.notNull false +fr.ird.observe.entities.seine.TargetLength + length.sqlType numeric + weight.sqlType numeric +fr.ird.observe.entities.seine.TargetSample + targetLength.unique +fr.ird.observe.entities.seine.TripSeine + dbName Trip + endDate.hibernateAttributeType.java.util.Date date + gearUseFeaturesSeine.orderBy topiaCreateDate + gearUseFeaturesSeine.reverseDbName trip + route.orderBy date + route.reverseDbName trip + startDate.hibernateAttributeType.java.util.Date date + route.unique diff --git a/pom.xml b/pom.xml index 0abfea3..69df214 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugenePluginVersion>2.15</eugenePluginVersion> + <eugenePluginVersion>3.0-alpha-6</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3</topiaVersion> @@ -941,6 +941,7 @@ <artifactId>buildnumber-maven-plugin</artifactId> <executions> <execution> + <inherited>false</inherited> <goals> <goal>create</goal> </goals> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index be919ba..359f1ec 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -121,23 +121,25 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <configuration> - <defaultPackage>fr.ird.observe.services.dto</defaultPackage> - <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> - </configuration> <executions> <execution> <phase>generate-sources</phase> <id>generate-services-dto</id> <configuration> <inputs> - <input>zargo:src/main/xmi:observe-services-dto-common.zargo</input> - <input>zargo:src/main/xmi:observe-services-dto-seine.zargo</input> - <input>zargo:src/main/xmi:observe-services-dto-longline.zargo</input> + <input>zargo</input> </inputs> + <!--<inputs>--> + <!--<input>zargo:src/main/xmi:observe-services-dto-common.zargo</input>--> + <!--<input>zargo:src/main/xmi:observe-services-dto-seine.zargo</input>--> + <!--<input>zargo:src/main/xmi:observe-services-dto-longline.zargo</input>--> + <!--</inputs>--> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <templates>org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer</templates> <failIfUnsafe>true</failIfUnsafe> + <defaultPackage>fr.ird.observe.services.dto</defaultPackage> + <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> + <modelExtensionFile>${project.basedir}/src/main/xmi/observe-services-dto.objectmodel-ext</modelExtensionFile> </configuration> <goals> <goal>generate</goal> diff --git a/services-dto/src/main/xmi/observe-services-dto-common.properties b/services-dto/src/main/xmi/observe-services-dto-common.properties deleted file mode 100644 index a1fb4fd..0000000 --- a/services-dto/src/main/xmi/observe-services-dto-common.properties +++ /dev/null @@ -1,52 +0,0 @@ -### -# #%L -# ObServe :: Services model -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=5.0 -model.tagvalue.java8=true - -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto - -package.fr.ird.observe.services.dto.stereotype=bean - -fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.stereotype=ordered -#fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered -fr.ird.observe.services.dto.referential.Species.attribute.ocean.stereotype=ordered -fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.stereotype=ordered -fr.ird.observe.services.dto.TripMap.attribute.points.stereotype=unique,ordered - -fr.ird.observe.services.dto.referential.Vessel.attribute.flagCountry.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.Vessel.attribute.vesselType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.VesselType -fr.ird.observe.services.dto.referential.Vessel.attribute.vesselSizeCategory.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.VesselSizeCategory -fr.ird.observe.services.dto.referential.Species.attribute.ocean.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Ocean -fr.ird.observe.services.dto.referential.Species.attribute.speciesGroup.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroup -fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Species -fr.ird.observe.services.dto.referential.Program.attribute.organism.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Organism -fr.ird.observe.services.dto.referential.Person.attribute.country.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.Organism.attribute.country.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Species -fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.ocean.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Ocean -fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.sex.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Sex -fr.ird.observe.services.dto.referential.Harbour.attribute.country.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristic -fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicType - diff --git a/services-dto/src/main/xmi/observe-services-dto-longline.properties b/services-dto/src/main/xmi/observe-services-dto-longline.properties deleted file mode 100644 index ace8c41..0000000 --- a/services-dto/src/main/xmi/observe-services-dto-longline.properties +++ /dev/null @@ -1,123 +0,0 @@ -### -# #%L -# ObServe :: Services model -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=5.0 -model.tagvalue.java8=true - -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto - -package.fr.ird.observe.services.dto.stereotype=bean - -fr.ird.observe.services.dto.longline.SetLongline.attribute.settingShape.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SettingShapeDto -fr.ird.observe.services.dto.longline.SetLongline.attribute.lineType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.SetLongline.attribute.lightsticksType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto -fr.ird.observe.services.dto.longline.SetLongline.attribute.lightsticksColor.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LightsticksColorDto - -fr.ird.observe.services.dto.longline.SetLonglineStub.attribute.activityLongline.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.ActivityLonglineDto - -fr.ird.observe.services.dto.longline.HooksComposition.attribute.hookType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookTypeDto -fr.ird.observe.services.dto.longline.HooksComposition.attribute.hookSize.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookSizeDto - -fr.ird.observe.services.dto.longline.SensorUsed.attribute.sensorDataFormat.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto -fr.ird.observe.services.dto.longline.SensorUsed.attribute.sensorType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorTypeDto -fr.ird.observe.services.dto.longline.SensorUsed.attribute.sensorBrand.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorBrandDto - -fr.ird.observe.services.dto.longline.SizeMeasure.attribute.sizeMeasureType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto - -fr.ird.observe.services.dto.longline.SetLonglineTdr.attribute.baskets.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto -fr.ird.observe.services.dto.longline.SetLonglineTdr.attribute.branchlines.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto -fr.ird.observe.services.dto.longline.SetLonglineTdr.attribute.sections.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto - -fr.ird.observe.services.dto.longline.Tdr.attribute.branchline.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto -fr.ird.observe.services.dto.longline.Tdr.attribute.sensorBrand.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorBrandDto -fr.ird.observe.services.dto.longline.Tdr.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.Tdr.attribute.section.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto -fr.ird.observe.services.dto.longline.Tdr.attribute.basket.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto -fr.ird.observe.services.dto.longline.Tdr.attribute.itemHorizontalPosition.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto -fr.ird.observe.services.dto.longline.Tdr.attribute.itemVerticalPosition.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto - -fr.ird.observe.services.dto.longline.TripLongline.attribute.tripType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.TripTypeDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.observer.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.vessel.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.VesselDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.captain.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.dataEntryOperator.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.program.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.ProgramDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.ocean.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.OceanDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.departureHarbour.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto -fr.ird.observe.services.dto.longline.TripLongline.attribute.landingHarbour.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto - -fr.ird.observe.services.dto.longline.FloatlinesComposition.attribute.lineType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto - -fr.ird.observe.services.dto.longline.Encounter.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.Encounter.attribute.encounterType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.EncounterTypeDto - -fr.ird.observe.services.dto.longline.SetLonglineCatch.attribute.baskets.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto -fr.ird.observe.services.dto.longline.SetLonglineCatch.attribute.branchlines.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto -fr.ird.observe.services.dto.longline.SetLonglineCatch.attribute.sections.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto - -fr.ird.observe.services.dto.longline.CatchLongline.attribute.basket.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.branchline.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.catchFateLongline.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.discardHealthness.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HealthnessDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.speciesCatch.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.predator.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.section.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.maturityStatus.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.MaturityStatusDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.stomacFullness.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.StomacFullnessDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.hookPosition.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookPositionDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.catchHealthness.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HealthnessDto -fr.ird.observe.services.dto.longline.CatchLongline.attribute.sex.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SexDto - -fr.ird.observe.services.dto.longline.BranchlinesComposition.attribute.topType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.BranchlinesComposition.attribute.tracelineType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto - -fr.ird.observe.services.dto.longline.Branchline.attribute.baitSettingStatus.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -fr.ird.observe.services.dto.longline.Branchline.attribute.hookSize.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookSizeDto -fr.ird.observe.services.dto.longline.Branchline.attribute.baitHaulingStatus.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto -fr.ird.observe.services.dto.longline.Branchline.attribute.hookType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookTypeDto -fr.ird.observe.services.dto.longline.Branchline.attribute.tracelineType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.Branchline.attribute.topType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.Branchline.attribute.baitType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitTypeDto - -fr.ird.observe.services.dto.longline.BaitsComposition.attribute.baitSettingStatus.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -fr.ird.observe.services.dto.longline.BaitsComposition.attribute.baitType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitTypeDto - -fr.ird.observe.services.dto.longline.ActivityLongline.attribute.fpaZone.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto -fr.ird.observe.services.dto.longline.ActivityLongline.attribute.vesselActivityLongline.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto -fr.ird.observe.services.dto.longline.ActivityLongline.attribute.setLongline.tagValue.attributeGeneric=fr.ird.observe.services.dto.longline.SetLonglineDto - -fr.ird.observe.services.dto.longline.WeightMeasure.attribute.weightMeasureType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto - -fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gear.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearDto - -fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto -fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition.attribute.mitigationType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.longline.MitigationTypeDto - -fr.ird.observe.services.dto.longline.SetLonglineDetailComposition.attribute.section.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.Section.attribute.basket.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.Basket.attribute.branchline.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.TripLonglineGearUse.attribute.gearUseFeaturesLongline.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.TripLongline.attribute.activityLongline.stereotype=unique,ordered -fr.ird.observe.services.dto.longline.SetLonglineStub.attribute.activityLongline.stereotype=unique - diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.properties b/services-dto/src/main/xmi/observe-services-dto-seine.properties deleted file mode 100644 index 31d55c9..0000000 --- a/services-dto/src/main/xmi/observe-services-dto-seine.properties +++ /dev/null @@ -1,94 +0,0 @@ -### -# #%L -# ObServe :: Services model -# %% -# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -model.tagvalue.version=5.0 -model.tagvalue.java8=true - -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto - -package.fr.ird.observe.services.dto.stereotype=bean - -fr.ird.observe.services.dto.seine.TripSeine.attribute.observer.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.captain.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.dataEntryOperator.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.vessel.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.VesselDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.ocean.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.OceanDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.departureHarbour.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.landingHarbour.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto -fr.ird.observe.services.dto.seine.TripSeine.attribute.program.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.ProgramDto - - -fr.ird.observe.services.dto.seine.TargetCatch.attribute.weightCategory.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.WeightCategoryDto -fr.ird.observe.services.dto.seine.TargetCatch.attribute.reasonForDiscard.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -fr.ird.observe.services.dto.seine.TargetCatch.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.SchoolEstimate.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.TransmittingBuoy.attribute.transmittingBuoyType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto -fr.ird.observe.services.dto.seine.TransmittingBuoy.attribute.transmittingBuoyOperation.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto -fr.ird.observe.services.dto.seine.TransmittingBuoy.attribute.country.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.CountryDto - -fr.ird.observe.services.dto.seine.TargetLength.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.SetSeine.attribute.reasonForNullSet.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto - -fr.ird.observe.services.dto.seine.ObjectSchoolEstimate.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.ObjectObservedSpecies.attribute.speciesStatus.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto -fr.ird.observe.services.dto.seine.ObjectObservedSpecies.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.NonTargetLength.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.seine.NonTargetLength.attribute.sex.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SexDto - -fr.ird.observe.services.dto.seine.NonTargetCatch.attribute.reasonForDiscard.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -fr.ird.observe.services.dto.seine.NonTargetCatch.attribute.speciesFate.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesFateDto -fr.ird.observe.services.dto.seine.NonTargetCatch.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto - -fr.ird.observe.services.dto.seine.FloatingObject.attribute.objectType.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectTypeDto -fr.ird.observe.services.dto.seine.FloatingObject.attribute.objectOperation.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectOperationDto -fr.ird.observe.services.dto.seine.FloatingObject.attribute.objectFate.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectFateDto - -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.vesselActivitySeine.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.surroundingActivity.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.wind.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.WindDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.detectionMode.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.DetectionModeDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.reasonForNoFishing.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.previousFpaZone.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.currentFpaZone.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.nextFpaZone.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto -fr.ird.observe.services.dto.seine.ActivitySeine.attribute.setSeine.tagValue.attributeGeneric=fr.ird.observe.services.dto.seine.SetSeineDto - -fr.ird.observe.services.dto.seine.GearUseFeaturesSeine.attribute.gear.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearDto - -fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine.attribute.gearCaracteristic.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto - -fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem.attribute.observedSystem.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObservedSystemDto - -fr.ird.observe.services.dto.referential.seine.WeightCategory.attribute.species.tagValue.attributeGeneric=fr.ird.observe.services.dto.referential.Species - -fr.ird.observe.services.dto.seine.TargetSample.attribute.targetLength.stereotype=unique -fr.ird.observe.services.dto.seine.NonTargetSample.attribute.nonTargetLength.stereotype=unique -fr.ird.observe.services.dto.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.stereotype=unique -fr.ird.observe.services.dto.seine.TripSeine.attribute.route.stereotype=unique,ordered -fr.ird.observe.services.dto.seine.TripSeineGearUse.attribute.gearUseFeaturesSeine.stereotype=unique,ordered -fr.ird.observe.services.dto.seine.Route.attribute.activitySeine.stereotype=unique,ordered diff --git a/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext b/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext new file mode 100644 index 0000000..2632896 --- /dev/null +++ b/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext @@ -0,0 +1,216 @@ +[model] +java8 true +simpleBeanWithNoInterfaceClassNameSuffix Dto +simpleBeanWithNoInterfaceDefaultsClassNameSuffix Dtos +simpleBeanWithNoInterfaceSuperClass fr.ird.observe.services.dto.AbstractObserveDto +version 5.0 + +[package] +fr.ird.observe.services.dto + bean + +[class] +fr.ird.observe.services.dto.TripMap + points.ordered + points.unique +fr.ird.observe.services.dto.longline.ActivityLongline + fpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto + setLongline.attributeGeneric fr.ird.observe.services.dto.longline.SetLonglineDto + vesselActivityLongline.attributeGeneric fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto +fr.ird.observe.services.dto.longline.BaitsComposition + baitSettingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto + baitType.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitTypeDto +fr.ird.observe.services.dto.longline.Basket + branchline.ordered + branchline.unique +fr.ird.observe.services.dto.longline.Branchline + baitHaulingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto + baitSettingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto + baitType.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitTypeDto + hookSize.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookSizeDto + hookType.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookTypeDto + topType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto + tracelineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto +fr.ird.observe.services.dto.longline.BranchlinesComposition + topType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto + tracelineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto +fr.ird.observe.services.dto.longline.CatchLongline + basket.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto + branchline.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto + catchFateLongline.attributeGeneric fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto + catchHealthness.attributeGeneric fr.ird.observe.services.dto.referential.longline.HealthnessDto + discardHealthness.attributeGeneric fr.ird.observe.services.dto.referential.longline.HealthnessDto + hookPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookPositionDto + maturityStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.MaturityStatusDto + predator.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto + section.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto + sex.attributeGeneric fr.ird.observe.services.dto.referential.SexDto + speciesCatch.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto + stomacFullness.attributeGeneric fr.ird.observe.services.dto.referential.longline.StomacFullnessDto +fr.ird.observe.services.dto.longline.Encounter + encounterType.attributeGeneric fr.ird.observe.services.dto.referential.longline.EncounterTypeDto + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.longline.FloatlinesComposition + lineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto +fr.ird.observe.services.dto.longline.GearUseFeaturesLongline + gear.attributeGeneric fr.ird.observe.services.dto.referential.GearDto + gearUseFeaturesMeasurement.ordered + gearUseFeaturesMeasurement.unique +fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline + gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicDto +fr.ird.observe.services.dto.longline.HooksComposition + hookSize.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookSizeDto + hookType.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookTypeDto +fr.ird.observe.services.dto.longline.Section + basket.ordered + basket.unique +fr.ird.observe.services.dto.longline.SensorUsed + sensorBrand.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorBrandDto + sensorDataFormat.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto + sensorType.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorTypeDto +fr.ird.observe.services.dto.longline.SetLongline + lightsticksColor.attributeGeneric fr.ird.observe.services.dto.referential.longline.LightsticksColorDto + lightsticksType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto + lineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto + settingShape.attributeGeneric fr.ird.observe.services.dto.referential.longline.SettingShapeDto +fr.ird.observe.services.dto.longline.SetLonglineCatch + baskets.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto + branchlines.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto + sections.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto +fr.ird.observe.services.dto.longline.SetLonglineDetailComposition + section.ordered + section.unique +fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition + mitigationType.attributeGeneric fr.ird.observe.services.dto.referential.longline.MitigationTypeDto +fr.ird.observe.services.dto.longline.SetLonglineStub + activityLongline.attributeGeneric fr.ird.observe.services.dto.longline.ActivityLonglineDto + activityLongline.unique +fr.ird.observe.services.dto.longline.SetLonglineTdr + baskets.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto + branchlines.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto + sections.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto +fr.ird.observe.services.dto.longline.SizeMeasure + sizeMeasureType.attributeGeneric fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto +fr.ird.observe.services.dto.longline.Tdr + basket.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto + branchline.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto + itemHorizontalPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto + itemVerticalPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto + section.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto + sensorBrand.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorBrandDto + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.longline.TripLongline + captain.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + dataEntryOperator.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + departureHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto + landingHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto + observer.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + ocean.attributeGeneric fr.ird.observe.services.dto.referential.OceanDto + program.attributeGeneric fr.ird.observe.services.dto.referential.ProgramDto + tripType.attributeGeneric fr.ird.observe.services.dto.referential.longline.TripTypeDto + vessel.attributeGeneric fr.ird.observe.services.dto.referential.VesselDto + activityLongline.ordered + activityLongline.unique +fr.ird.observe.services.dto.longline.TripLonglineGearUse + gearUseFeaturesLongline.ordered + gearUseFeaturesLongline.unique +fr.ird.observe.services.dto.longline.WeightMeasure + weightMeasureType.attributeGeneric fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto +fr.ird.observe.services.dto.referential.Gear + gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristic + gearCaracteristic.ordered +fr.ird.observe.services.dto.referential.GearCaracteristic + gearCaracteristicType.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicType +fr.ird.observe.services.dto.referential.Harbour + country.attributeGeneric fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.LengthWeightParameter + ocean.attributeGeneric fr.ird.observe.services.dto.referential.Ocean + sex.attributeGeneric fr.ird.observe.services.dto.referential.Sex + species.attributeGeneric fr.ird.observe.services.dto.referential.Species +fr.ird.observe.services.dto.referential.Organism + country.attributeGeneric fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.Person + country.attributeGeneric fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.Program + organism.attributeGeneric fr.ird.observe.services.dto.referential.Organism +fr.ird.observe.services.dto.referential.Species + ocean.attributeGeneric fr.ird.observe.services.dto.referential.Ocean + speciesGroup.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesGroup + ocean.ordered +fr.ird.observe.services.dto.referential.SpeciesList + species.attributeGeneric fr.ird.observe.services.dto.referential.Species + species.ordered +fr.ird.observe.services.dto.referential.Vessel + flagCountry.attributeGeneric fr.ird.observe.services.dto.referential.Country + vesselSizeCategory.attributeGeneric fr.ird.observe.services.dto.referential.VesselSizeCategory + vesselType.attributeGeneric fr.ird.observe.services.dto.referential.VesselType +fr.ird.observe.services.dto.referential.seine.WeightCategory + species.attributeGeneric fr.ird.observe.services.dto.referential.Species +fr.ird.observe.services.dto.seine.ActivitySeine + currentFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto + detectionMode.attributeGeneric fr.ird.observe.services.dto.referential.seine.DetectionModeDto + nextFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto + previousFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto + reasonForNoFishing.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto + setSeine.attributeGeneric fr.ird.observe.services.dto.seine.SetSeineDto + surroundingActivity.attributeGeneric fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto + vesselActivitySeine.attributeGeneric fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto + wind.attributeGeneric fr.ird.observe.services.dto.referential.seine.WindDto +fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem + observedSystem.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObservedSystemDto +fr.ird.observe.services.dto.seine.FloatingObject + objectFate.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectFateDto + objectOperation.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectOperationDto + objectType.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectTypeDto +fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine + gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicDto +fr.ird.observe.services.dto.seine.GearUseFeaturesSeine + gear.attributeGeneric fr.ird.observe.services.dto.referential.GearDto + gearUseFeaturesMeasurement.unique +fr.ird.observe.services.dto.seine.NonTargetCatch + reasonForDiscard.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto + speciesFate.attributeGeneric fr.ird.observe.services.dto.referential.seine.SpeciesFateDto +fr.ird.observe.services.dto.seine.NonTargetLength + sex.attributeGeneric fr.ird.observe.services.dto.referential.SexDto + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.seine.NonTargetSample + nonTargetLength.unique +fr.ird.observe.services.dto.seine.ObjectObservedSpecies + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto + speciesStatus.attributeGeneric fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto +fr.ird.observe.services.dto.seine.ObjectSchoolEstimate + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.seine.Route + activitySeine.ordered + activitySeine.unique +fr.ird.observe.services.dto.seine.SchoolEstimate + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.seine.SetSeine + reasonForNullSet.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto +fr.ird.observe.services.dto.seine.TargetCatch + reasonForDiscard.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto + weightCategory.attributeGeneric fr.ird.observe.services.dto.referential.seine.WeightCategoryDto +fr.ird.observe.services.dto.seine.TargetLength + species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.seine.TargetSample + targetLength.unique +fr.ird.observe.services.dto.seine.TransmittingBuoy + country.attributeGeneric fr.ird.observe.services.dto.referential.CountryDto + transmittingBuoyOperation.attributeGeneric fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto + transmittingBuoyType.attributeGeneric fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto +fr.ird.observe.services.dto.seine.TripSeine + captain.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + dataEntryOperator.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + departureHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto + landingHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto + observer.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto + ocean.attributeGeneric fr.ird.observe.services.dto.referential.OceanDto + program.attributeGeneric fr.ird.observe.services.dto.referential.ProgramDto + vessel.attributeGeneric fr.ird.observe.services.dto.referential.VesselDto + route.ordered + route.unique +fr.ird.observe.services.dto.seine.TripSeineGearUse + gearUseFeaturesSeine.ordered + gearUseFeaturesSeine.unique -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm