branch develop updated (70103b3 -> 319e51a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 70103b3 Retour sur develop Merge branch 'feature/7458-4' into develop new 319e51a supression du ordered dans les modèles argo pour les DTO (remplacer par le stereotype unique dans les propriétées des modèles de DTO (refs #7458). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 319e51afdb25d960c5197432aca69ded3d63df45 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 25 14:56:56 2015 +0200 supression du ordered dans les modèles argo pour les DTO (remplacer par le stereotype unique dans les propriétées des modèles de DTO (refs #7458). Summary of changes: .../xmi/observe-services-dto-longline.properties | 6 ++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 57355 -> 57340 bytes .../main/xmi/observe-services-dto-seine.properties | 5 +++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55301 -> 55273 bytes 4 files changed, 11 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 319e51afdb25d960c5197432aca69ded3d63df45 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 25 14:56:56 2015 +0200 supression du ordered dans les modèles argo pour les DTO (remplacer par le stereotype unique dans les propriétées des modèles de DTO (refs #7458). --- .../xmi/observe-services-dto-longline.properties | 6 ++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 57355 -> 57340 bytes .../main/xmi/observe-services-dto-seine.properties | 5 +++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55301 -> 55273 bytes 4 files changed, 11 insertions(+) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 29b7352..8d802e9 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -79,3 +79,9 @@ fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gear.tagV fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition.attribute.mitigationType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.MitigationTypeDto + +fr.ird.observe.services.dto.longline.SetLonglineDetailComposition.attribute.section.stereotype=unique +fr.ird.observe.services.dto.longline.Section.attribute.basket.stereotype=unique +fr.ird.observe.services.dto.longline.Basket.attribute.branchline.stereotype=unique +fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique + diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index ce76874..348b6d6 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties index 3b2a970..16fe69f 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties @@ -57,3 +57,8 @@ fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine.attribute.gear fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem.attribute.observedSystem.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.services.dto.referential.seine.WeightCategory.attribute.species.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=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.ActivitySeineObservedSystem.attribute.observedSystem.stereotype=unique diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index e36346a..3c802d5 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm