This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a35a1178df1107a34c5c33df0acb30ef5e16defd Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:05:14 2016 +0200 Finish modification for the model with tagValues and declaration --- .../ifremer/echobase/persistence/EchoBaseDbMeta.java | 5 ++++- echobase-domain/src/main/xmi/echobase.properties | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java index 3cc1300..70f3255 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java @@ -69,6 +69,8 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.MeasureType, EchoBaseUserEntityEnum.MeasurementMetadata, EchoBaseUserEntityEnum.ReferencingMethod, + EchoBaseUserEntityEnum.Port, + EchoBaseUserEntityEnum.AncillaryInstrumentation, // with deps EchoBaseUserEntityEnum.Strata, @@ -114,7 +116,8 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.LengthAgeKey, EchoBaseUserEntityEnum.LengthWeightKey, - EchoBaseUserEntityEnum.Voyage)); + EchoBaseUserEntityEnum.Voyage, + EchoBaseUserEntityEnum.Mooring)); private final List<TableMeta<EchoBaseUserEntityEnum>> referenceTables; diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index f3a1f92..767fb2e 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -188,6 +188,12 @@ fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.naturalId fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.serialNumber.tagValue.naturalId=true + +fr.ifremer.echobase.entities.references.Port.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.references.Port.attribute.id.tagValue.naturalId=true + ############################################################################### ### Not null for references ################################################### ############################################################################### @@ -266,6 +272,12 @@ fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.notNull=t fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.notNull=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.name.tagValue.notNull=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.serialNumber.tagValue.notNull=true + +fr.ifremer.echobase.entities.references.Port.attribute.id.tagValue.notNull=true +fr.ifremer.echobase.entities.references.Port.attribute.name.tagValue.notNull=true + ############################################################################### ### Natural id for data ###################################################### ############################################################################### @@ -284,6 +296,9 @@ fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.na fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.data.Mooring.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.data.Mooring.attribute.code.tagValue.naturalId=true + ############################################################################### ### Not null for data ######################################################### ############################################################################### @@ -364,3 +379,7 @@ fr.ifremer.echobase.entities.data.Voyage.attribute.endPort.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.mission.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.datum.tagValue.notNull=true + +fr.ifremer.echobase.entities.data.Mooring.attribute.code.tagValue.notNull=true +fr.ifremer.echobase.entities.data.Mooring.attribute.mission.tagValue.notNull=true +fr.ifremer.echobase.entities.data.Mooring.attribute.description.tagValue.notNull=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.