[Git][ultreiaio/ird-observe][develop] 2 commits: mise en place du friend model

29 Jun 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
5b79a51b by Tony CHEMIT at 2017-06-29T21:04:57+02:00
mise en place du friend model

- - - - -
d710fa0d by Tony CHEMIT at 2017-06-29T21:04:57+02:00
Utilisation d'un modèle textuel pour le developpement (See #786)

- - - - -


11 changed files:

- persistence/pom.xml
- + persistence/src/main/models/Observe.friendmodel
- persistence/src/main/xmi/observe-common.zargo
- persistence/src/main/xmi/observe-seine.zargo
- persistence/src/main/xmi/observe.ini
- pom.xml
- services/pom.xml
- + services/src/main/models/Observe.friendmodel
- services/src/main/xmi/observe-services-dto-seine.zargo
- services/src/main/xmi/observe-services-dto.ini
- topia-templates-extension/pom.xml


Changes:

=====================================
persistence/pom.xml
=====================================

--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -163,7 +163,7 @@
 
       <plugins>
         <plugin>
-          <groupId>org.nuiton.eugene</groupId>
+          <groupId>io.ultreia.java4all.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
           <dependencies>
             <dependency>
@@ -214,12 +214,12 @@
       </plugin>
 
       <plugin>
-        <groupId>org.nuiton.eugene</groupId>
+        <groupId>io.ultreia.java4all.eugene</groupId>
         <artifactId>eugene-maven-plugin</artifactId>
         <executions>
-          <execution>
+          <!--execution>
             <phase>generate-sources</phase>
-            <id>generate-persistence</id>
+            <id>generate-friend-model</id>
             <configuration>
               <defaultPackage>fr.ird.observe.persistence</defaultPackage>
               <fullPackagePath>fr.ird.observe</fullPackagePath>
@@ -227,6 +227,22 @@
               <inputs>
                 <input>zargo</input>
               </inputs>
+              <templates>org.nuiton.eugene.FriendTemplatesGenerator</templates>
+            </configuration>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution-->
+          <execution>
+            <phase>generate-sources</phase>
+            <id>generate-persistence</id>
+            <configuration>
+              <defaultPackage>fr.ird.observe.persistence</defaultPackage>
+              <fullPackagePath>fr.ird.observe</fullPackagePath>
+              <!--<modelExtensionFile>${project.build.directory}/xmi/observe.ini</modelExtensionFile>-->
+              <inputs>
+                <input>friend</input>
+              </inputs>
               <templates>
                 org.nuiton.topia.templates.TopiaMetaTransformer,
                 org.nuiton.topia.templates.TopiaMetadataModelGenerator


=====================================
persistence/src/main/models/Observe.friendmodel
=====================================
--- /dev/null
+++ b/persistence/src/main/models/Observe.friendmodel
@@ -0,0 +1,918 @@
+model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys 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 defaultPackage=fr.ird.observe.entities useEnumerationName=false version=6.901
+
+package fr.ird.observe.common | skip
+package fr.ird.observe.entities | dbSchema=OBSERVE_COMMON
+package fr.ird.observe.entities.longline | dbSchema=OBSERVE_LONGLINE
+package fr.ird.observe.entities.referentiel | dbSchema=OBSERVE_COMMON
+package fr.ird.observe.entities.referentiel.longline | dbSchema=OBSERVE_LONGLINE
+package fr.ird.observe.entities.referentiel.seine | dbSchema=OBSERVE_SEINE
+package fr.ird.observe.entities.seine | dbSchema=OBSERVE_SEINE
+
+enum !fr.ird.observe.common.constants.GearType
+
+enum !fr.ird.observe.common.constants.ReferenceStatus
+
+enum !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+
+enum !fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatusType
+
+enum !fr.ird.observe.common.constants.seine.Ownership
+
+enum !fr.ird.observe.common.constants.seine.SchoolType
+
+enum !fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation
+
+enum longline.ActivityLonglineConstants | skip
+date
+time
+
+enum longline.BranchlineConstants | skip
+timerTimeOnBoardDate
+timerTimeOnBoardTime
+
+enum longline.SetLonglineConstants | skip
+settingStartDate
+settingStartTime
+settingStartQuadrant
+settingEndDate
+settingEndTime
+settingEndQuadrant
+haulingStartDate
+haulingStartTime
+haulingStartQuadrant
+haulingEndDate
+haulingEndTime
+haulingEndQuadrant
+floatlinesCompositionProportionSum
+branchlinesCompositionProportionSum
+hooksCompositionProportionSum
+baitsCompositionProportionSum
+
+enum longline.TdrConstants | skip
+deployementStartDate
+deployementStartTime
+deployementEndDate
+deployementEndTime
+fishingStartDate
+fishingStartTime
+fishingEndDate
+fishingEndTime
+
+enum referentiel.FormulaSupportConstants | skip
+formulaOneValid
+formulaTwoValid
+
+enum referentiel.HarbourConstants | skip
+quadrant
+
+enum referentiel.ProgramConstants | skip
+gearTypePrefix
+
+enum seine.SetConstants | skip
+targetSampleCapture
+endSetDate
+endPursingDate
+endSetTime
+endPursingTime
+
+enum seine.TargetLengthConstants | skip
+totalWeight
+
+interface Activity
+
+interface LengthWeightComputable
+getLength() Float
+setLength(length Float)
+isLengthSource() boolean
+setLengthSource(lengthSource boolean)
+getWeight() Float
+setWeight(weight Float)
+isWeightSource() boolean
+setWeightSource(weightSource boolean)
+
+interface ObserveSet
+
+interface Trip
+
+interface longline.LonglineCompositionEntity
+getSettingIdentifier() Integer
+setSettingIdentifier(identifier Integer)
+getHaulingIdentifier() Integer
+setHaulingIdentifier(identifier Integer)
+
+interface longline.LonglinePositionAware
+getSection() longline.Section
+setSection(section longline.Section)
+getBasket() longline.Basket
+setBasket(basket longline.Basket)
+getBranchline() longline.Branchline
+getBranchline(branchline longline.Branchline)
+
+abstract CommentableEntity > ObserveDataEntity | entity
+comment + {*:1} String | hibernateAttributeType=text
+
+LastUpdateDate > ObserveEntity | entity
+type + {*:1} String
+
+abstract ObserveDataEntity > ObserveEntity | entity
+
+abstract ObserveEntity | entity
+lastUpdateDate + {*:1} Date | notNull
+
+longline.ActivityLongline > CommentableEntity >> Activity | entity dbName=Activity
+timeStamp + {*:1} Date
+latitude + {*:1} Float
+longitude + {*:1} Float
+seaSurfaceTemperature + {*:1} Float
+setLongline + {0..1} longline.SetLongline | dbName=set
+encounter + {*} longline.Encounter | reverseDbName=activity
+vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false
+sensorUsed + {*} longline.SensorUsed | reverseDbName=activity
+fpaZone {*:1} referentiel.FpaZone
+getDate() Date
+getTime() Date
+setDate(date Date)
+setTime(time Date)
+
+longline.BaitsComposition > ObserveDataEntity | entity
+proportion + {*:1} Integer
+individualSize + {*:1} Integer
+individualWeight + {*:1} Float
+baitSettingStatus {*:1} referentiel.longline.BaitSettingStatus
+baitType {*:1} referentiel.longline.BaitType
+
+longline.Basket > ObserveDataEntity >> longline.LonglineCompositionEntity | entity
+settingIdentifier + {*:1} Integer | notNull
+haulingIdentifier + {*:1} Integer
+floatline1Length + {*:1} Float
+floatline2Length + {*:1} Float
+branchline + {*} longline.Branchline | unique orderBy=settingIdentifier
+tdrRecord + {*} longline.TdrRecord
+catchLongline {*} longline.CatchLongline
+tdr {*} longline.Tdr
+setLongline {*:1} longline.SetLongline | dbName=set
+
+longline.Branchline > CommentableEntity >> longline.LonglineCompositionEntity | entity
+settingIdentifier + {*:1} Integer | notNull
+haulingIdentifier + {*:1} Integer
+depthRecorder + {*:1} Boolean
+timer + {*:1} Boolean
+timeSinceContact + {*:1} Long
+hookOffset + {*:1} Integer
+branchlineLength + {*:1} Float | sqlType=numeric
+weightedSwivel + {*:1} Boolean
+timerTimeOnBoard + {*:1} Date
+weightedSnap + {*:1} Boolean
+swivelWeight + {*:1} Float | sqlType=numeric
+snapWeight + {*:1} Float | sqlType=numeric
+tracelineLength + {*:1} Float | sqlType=numeric
+hookLost + {*:1} Boolean
+traceCutOff + {*:1} Boolean
+hookType {*:0..1} referentiel.longline.HookType
+tdr {*} longline.Tdr
+catchLongline {*} longline.CatchLongline | dbName=catch
+baitType {*:0..1} referentiel.longline.BaitType
+topType {*:0..1} referentiel.longline.LineType
+tracelineType {*:0..1} referentiel.longline.LineType
+baitSettingStatus {*:0..1} referentiel.longline.BaitSettingStatus
+baitHaulingStatus {*:0..1} referentiel.longline.BaitHaulingStatus
+hookSize {*:0..1} referentiel.longline.HookSize | sqlType=numeric
+getTimerTimeOnBoardDate() Date
+setTimerTimeOnBoardDate(timerTimeOnboardDate Date)
+getTimerTimeOnBoardTime() Date
+setTimerTimeOnBoardTime(timerTimeOnboardTime Date)
+
+longline.BranchlinesComposition > ObserveDataEntity | entity
+length + {*:1} Float | sqlType=numeric
+proportion + {*:1} Integer
+tracelineLength + {*:1} Float
+topType {*:0..1} referentiel.longline.LineType
+tracelineType {*:0..1} referentiel.longline.LineType
+
+longline.CatchLongline > CommentableEntity >> longline.LonglinePositionAware | entity dbName=Catch
+homeId + {*:1} String
+count + {*:1} Integer
+totalWeight + {*:1} Float | sqlType=numeric
+hookWhenDiscarded + {*:1} Boolean
+depredated + {*:1} Boolean
+beatDiameter + {*:1} Float | sqlType=numeric
+gonadeWeight + {*:1} Float | sqlType=numeric
+photoReferences + {*:1} String
+number + {*:1} Integer
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+basket {*:0..1} longline.Basket
+branchline {*:0..1} longline.Branchline
+catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate
+discardHealthness {*:1} referentiel.longline.Healthness
+sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch
+speciesCatch {*:1} referentiel.Species
+predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch
+section {*:0..1} longline.Section
+maturityStatus {*:0..1} referentiel.longline.MaturityStatus
+stomacFullness {*:0..1} referentiel.longline.StomacFullness
+hookPosition {*:0..1} referentiel.longline.HookPosition
+weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch
+catchHealthness {*:1} referentiel.longline.Healthness
+sex {*:0..1} referentiel.Sex
+
+longline.Encounter > ObserveDataEntity | entity
+distance + {*:1} Float | sqlType=numeric
+count + {*:1} Integer
+encounterType {*:1} referentiel.longline.EncounterType
+species {*:1} referentiel.Species
+
+longline.FloatlinesComposition > ObserveDataEntity | entity
+length + {*:1} Float | sqlType=numeric
+proportion + {*:1} Integer
+lineType {*:1} referentiel.longline.LineType
+
+longline.GearUseFeaturesLongline > CommentableEntity | entity dbName=GearUseFeatures
+number + {*:1} Integer
+usedInTrip + {*:1} Boolean
+gearUseFeaturesMeasurement + {*} longline.GearUseFeaturesMeasurementLongline | unique orderBy=topiaCreateDate reverseDbName=gearUseFeatures
+gear {*:1} referentiel.Gear
+getMeasurementsAsString() String
+
+longline.GearUseFeaturesMeasurementLongline > ObserveDataEntity | entity dbName=GearUseFeaturesMeasurement
+measurementValue + {*:1} String
+gearCaracteristic {*:1} referentiel.GearCaracteristic | notNull
+
+longline.HooksComposition > ObserveDataEntity | entity
+proportion + {*:1} Integer
+hookOffset + {*:1} Integer
+hookType {*:1} referentiel.longline.HookType
+hookSize {*:1} referentiel.longline.HookSize | sqlType=numeric
+
+longline.Section > ObserveDataEntity >> longline.LonglineCompositionEntity | entity
+settingIdentifier + {*:1} Integer | notNull
+haulingIdentifier + {*:1} Integer
+setLongline {*:1} longline.SetLongline | dbName=set
+basket + {*} longline.Basket | unique orderBy=settingIdentifier
+tdr {*} longline.Tdr
+catchLongline {*} longline.CatchLongline
+
+longline.SensorUsed > ObserveDataEntity | entity
+data + {*:1} !java.sql.Blob
+dataFilename + {*:1} String
+dataLocation + {*:1} String
+sensorSerialNo + {*:1} String
+sensorType {*:1} referentiel.longline.SensorType
+sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat
+sensorBrand {*:1} referentiel.longline.SensorBrand
+
+longline.SetLongline > CommentableEntity >> ObserveSet | entity dbName=Set
+homeId + {*:1} String
+number + {*:1} Integer
+basketsPerSectionCount + {*:1} Integer
+branchlinesPerBasketCount + {*:1} Integer
+totalSectionsCount + {*:1} Integer
+totalBasketsCount + {*:1} Integer
+totalHooksCount + {*:1} Integer
+weightedSnap + {*:1} Boolean
+snapWeight + {*:1} Float | sqlType=numeric
+weightedSwivel + {*:1} Boolean
+swivelWeight + {*:1} Float | sqlType=numeric
+lightsticksPerBasketCount + {*:1} Integer
+timeBetweenHooks + {*:1} Long
+shooterUsed + {*:1} Boolean
+shooterSpeed + {*:1} Float | sqlType=numeric
+maxDepthTargeted + {*:1} Integer
+settingStartTimeStamp + {*:1} Date
+settingStartLatitude + {*:1} Float | sqlType=numeric
+settingStartLongitude + {*:1} Float | sqlType=numeric
+settingEndTimeStamp + {*:1} Date
+settingEndLatitude + {*:1} Float | sqlType=numeric
+settingEndLongitude + {*:1} Float | sqlType=numeric
+settingVesselSpeed + {*:1} Float | sqlType=numeric
+haulingDirectionSameAsSetting + {*:1} Boolean
+haulingStartTimeStamp + {*:1} Date
+haulingStartLatitude + {*:1} Float | sqlType=numeric
+haulingStartLongitude + {*:1} Float | sqlType=numeric
+haulingEndTimeStamp + {*:1} Date
+haulingEndLatitude + {*:1} Float | sqlType=numeric
+haulingEndLongitude + {*:1} Float | sqlType=numeric
+haulingBreaks + {*:1} Integer
+monitored + {*:1} Boolean
+baitsComposition + {*} longline.BaitsComposition | reverseDbName=set
+floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set
+hooksComposition + {*} longline.HooksComposition | reverseDbName=set
+section + {*} longline.Section | unique orderBy=settingIdentifier reverseDbName=set
+settingShape {*:1} referentiel.longline.SettingShape
+tdr + {*} longline.Tdr | reverseDbName=set
+catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set
+lineType {*:0..1} referentiel.longline.LineType
+lightsticksType {*:0..1} referentiel.longline.LightsticksType
+lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
+mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set
+branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set
+getSettingStartTime() Date
+getSettingStartDate() Date
+setSettingStartDate(date Date)
+setSettingStartTime(time Date)
+getSettingEndDate() Date
+getSettingEndTime() Date
+setSettingEndDate(date Date)
+setSettingEndTime(time Date)
+getHaulingStartDate() Date
+getHaulingStartTime() Date
+setHaulingStartDate(date Date)
+setHaulingStartTime(time Date)
+getHaulingEndDate() Date
+getHaulingEndTime() Date
+setHaulingEndDate(date Date)
+setHaulingEndTime(time Date)
+getSettingEndQuadrant() Integer
+getHaulingStartQuadrant() Integer
+getHaulingEndQuadrant() Integer
+setSettingStartQuadrant(quadrant Integer)
+setSettingEndQuadrant(quadrant Integer)
+setHaulingStartQuadrant(quadrant Integer)
+setHaulingEndQuadrant(quadrant Integer)
+getSettingStartQuadrant() Integer
+getFloatlinesCompositionProportionSum() int
+getBranchlinesCompositionProportionSum() int
+getHooksCompositionProportionSum() int
+getBaitsCompositionProportionSum() int
+setFloatlinesCompositionProportionSum(sum int)
+setBranchlinesCompositionProportionSum(sum int)
+setHooksCompositionProportionSum(sum int)
+setBaitsCompositionProportionSum(sum int)
+
+longline.SizeMeasure > ObserveDataEntity | entity
+size + {*:1} Float | sqlType=numeric
+sizeMeasureType {*:1} referentiel.SizeMeasureType
+
+longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity
+homeId + {*:1} String
+floatline1Length + {*:1} Float | sqlType=numeric
+floatline2Length + {*:1} Float | sqlType=numeric
+serialNo + {*:1} String
+data + {*:1} !java.sql.Blob
+dataFilename + {*:1} String
+dataLocation + {*:1} String
+deployementStart + {*:1} Date
+deployementEnd + {*:1} Date
+fishingStart + {*:1} Date
+fishingEnd + {*:1} Date
+fishingStartDepth + {*:1} Float
+fishingEndDepth + {*:1} Float
+meanDeployementDepth + {*:1} Float
+medianDeployementDepth + {*:1} Float
+minFishingDepth + {*:1} Float
+maxFishingDepth + {*:1} Float
+meanFishingDepth + {*:1} Float
+medianFishingDepth + {*:1} Float
+branchline {*:0..1} longline.Branchline
+tdrRecord + {*} longline.TdrRecord
+sensorBrand {*:0..1} referentiel.longline.SensorBrand
+species {*:*} referentiel.Species
+section {*:0..1} longline.Section
+basket {*:0..1} longline.Basket
+itemHorizontalPosition {*:0..1} referentiel.longline.ItemHorizontalPosition
+itemVerticalPosition {*:0..1} referentiel.longline.ItemVerticalPosition
+getDeployementStartDate() Date
+getDeployementStartTime() Date
+getDeployementEndDate() Date
+getDeployementEndTime() Date
+getFishingStartDate() Date
+getFishingStartTime() Date
+getFishingEndDate() Date
+getFishingEndTime() Date
+setDeployementStartDate(date Date)
+setDeployementEndDate(date Date)
+setDeployementStartTime(time Date)
+setDeployementEndTime(time Date)
+setFishingStartDate(date Date)
+setFishingStartTime(time Date)
+setFishingEndDate(date Date)
+setFishingEndTime(time Date)
+
+longline.TdrRecord > ObserveDataEntity | entity
+timeStamp + {*:1} Date
+temperature + {*:1} Float | sqlType=numeric
+depth + {*:1} Float | sqlType=numeric
+
+longline.TripLongline > CommentableEntity >> Trip | entity dbName=Trip
+startDate + {*:1} Date
+endDate + {*:1} Date
+totalFishingOperationsNumber + {*:1} Integer
+homeId + {*:1} String
+activityLongline + {*} longline.ActivityLongline | unique reverseDbName=trip
+tripType {*:1} referentiel.longline.TripType
+observer {*:1} referentiel.Person
+vessel {*:1} referentiel.Vessel
+captain {*:1} referentiel.Person
+dataEntryOperator {*:1} referentiel.Person
+program {*:1} referentiel.Program
+ocean {*:1} referentiel.Ocean
+departureHarbour {*:0..1} referentiel.Harbour
+landingHarbour {*:0..1} referentiel.Harbour
+gearUseFeaturesLongline + {*} longline.GearUseFeaturesLongline | unique orderBy=topiaCreateDate reverseDbName=trip
+getActivityCount() int
+setActivityCount(activityCount int) longline.void
+
+longline.WeightMeasure > ObserveDataEntity | entity
+weight + {*:1} Float | sqlType=numeric
+weightMeasureType {*:1} referentiel.WeightMeasureType
+
+longline.void
+
+referentiel.Country > referentiel.I18nReferentialEntity | entity
+iso2Code + {*:1} String
+iso3Code + {*:1} String
+
+abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity
+coefficients + {*:1} String
+source + {*:1} String | hibernateAttributeType=text
+getCoefficientNames() Set<String>
+getCoefficientValue(coefficientName String) Double
+getCoefficientValues() Map<String, Double>
+isFormulaOneValid() boolean
+isFormulaTwoValid() boolean
+setFormulaOneValid(formulaOneValid boolean)
+setFormulaTwoValid(formulaTwoValid boolean)
+computeFromFomulaOne(data float) Float
+computeFromFomulaTwo(data float) Float
+getFormulaOne() String
+getFormulaTwo() String
+revalidateFormulaOne()
+revalidateFormulaTwo()
+
+referentiel.FpaZone > referentiel.I18nReferentialEntity | entity
+startDate + {*:1} Date
+endDate + {*:1} Date
+
+referentiel.Gear > referentiel.I18nReferentialEntity | entity
+gearCaracteristic {*:*} referentiel.GearCaracteristic | lazy=false
+
+referentiel.GearCaracteristic > referentiel.I18nReferentialEntity | entity
+unit + {*:1} String
+gearCaracteristicType {*:1} referentiel.GearCaracteristicType | lazy=false
+
+referentiel.GearCaracteristicType > referentiel.I18nReferentialEntity | entity
+
+referentiel.Harbour > referentiel.ObserveReferentialEntity | entity
+country {*:1} referentiel.Country
+locode + {*:1} String
+name + {*:1} String
+latitude + {*:1} Float
+longitude + {*:1} Float
+getQuadrant() Integer
+setQuadrant(quadrant Integer)
+
+abstract referentiel.I18nReferentialEntity > referentiel.ObserveReferentialEntity | entity
+label1 + {*:1} String
+label2 + {*:1} String
+label3 + {*:1} String
+label4 + {*:1} String
+label5 + {*:1} String
+label6 + {*:1} String
+label7 + {*:1} String
+label8 + {*:1} String
+
+referentiel.LengthLengthParameter > referentiel.FormulaSupport | entity
+inputOutputFormula + {*:1} String
+outputInputFormula + {*:1} String
+inputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false
+outputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false
+
+abstract referentiel.LengthWeightAble
+
+referentiel.LengthWeightParameter > referentiel.FormulaSupport | entity
+ocean {*:0..1} referentiel.Ocean | notNull lazy=false
+species {*:1} referentiel.Species | notNull lazy=false
+sex {*:1} referentiel.Sex | notNull lazy=false
+startDate + {*:1} Date
+endDate + {*:1} Date
+lengthWeightFormula + {*:1} String
+weightLengthFormula + {*:1} String
+meanLength + {*:1} Float
+meanWeight + {*:1} Float
+sizeMeasureType {*:0..1} referentiel.SizeMeasureType | lazy=false
+
+abstract referentiel.ObserveReferentialEntity > ObserveEntity | entity
+code + {*:1} String
+uri + {*:1} String
+needComment + {*:1} boolean | notNull
+status + {*:1} !fr.ird.observe.common.constants.ReferenceStatus
+isEnabled() boolean
+isDisabled() boolean
+
+referentiel.Ocean > referentiel.I18nReferentialEntity | entity
+
+referentiel.Organism > referentiel.I18nReferentialEntity | entity
+country {*:1} referentiel.Country | lazy=false
+description + {*:1} String
+
+referentiel.Person > referentiel.ObserveReferentialEntity | entity
+lastName + {*:1} String
+firstName + {*:1} String
+observer + {*:1} boolean
+captain + {*:1} boolean
+dataEntryOperator + {*:1} boolean
+country {*:0..1} referentiel.Country
+
+referentiel.Program > referentiel.I18nReferentialEntity | entity
+organism {*:1} referentiel.Organism | lazy=false
+nonTargetObservation + {*:1} int
+targetDiscardsObservation + {*:1} int
+samplesObservation + {*:1} int
+objectsObservation + {*:1} int
+detailledActivitiesObservation + {*:1} int
+mammalsObservation + {*:1} int
+birdsObservation + {*:1} int
+baitObservation + {*:1} int
+startDate + {*:1} Date
+endDate + {*:1} Date
+comment + {*:1} String | hibernateAttributeType=text
+gearType + {*:1} !fr.ird.observe.common.constants.GearType
+getGearTypePrefix() String
+setGearTypePrefix(gearTypePrefix String)
+setTripCount(tripCount int)
+getTripCount() int
+
+referentiel.ReferenceStatusPersist
+
+referentiel.Sex > referentiel.I18nReferentialEntity | entity
+
+referentiel.ShipOwner > referentiel.ObserveReferentialEntity | entity
+label + {*:1} String
+startDate + {*:1} Date
+endDate + {*:1} Date
+country {*:0..1} referentiel.Country
+
+referentiel.SizeMeasureType > referentiel.I18nReferentialEntity | entity
+
+referentiel.Species > referentiel.I18nReferentialEntity | entity
+speciesGroup {*:0..1} referentiel.SpeciesGroup | lazy=false
+ocean {*:*} referentiel.Ocean | lazy=false
+faoCode + {*:1} String
+scientificLabel + {*:1} String
+homeId + {*:1} String
+wormsId + {*:1} Long
+minLength + {*:1} Float | sqlType=numeric
+maxLength + {*:1} Float | sqlType=numeric
+minWeight + {*:1} Float | sqlType=numeric
+maxWeight + {*:1} Float | sqlType=numeric
+sizeMeasureType {*:0..1} referentiel.SizeMeasureType
+
+referentiel.SpeciesGroup > referentiel.I18nReferentialEntity | entity
+speciesGroupReleaseMode {*:*} referentiel.SpeciesGroupReleaseMode | unique lazy=false
+speciesGroupReleaseStatus {*:*} referentiel.SpeciesGroupReleaseStatus | unique lazy=false
+
+referentiel.SpeciesGroupReleaseMode > referentiel.I18nReferentialEntity | entity
+
+referentiel.SpeciesGroupReleaseStatus > referentiel.I18nReferentialEntity | entity
+
+referentiel.SpeciesList > referentiel.I18nReferentialEntity | entity
+species {*:+} referentiel.Species | lazy=false
+
+referentiel.Vessel > referentiel.I18nReferentialEntity | entity
+vesselSizeCategory {*:1} referentiel.VesselSizeCategory | lazy=false
+vesselType {*:1} referentiel.VesselType | lazy=false
+flagCountry {*:1} referentiel.Country | lazy=false
+keelCode + {*:1} Integer
+fleetCountry + {*:1} Integer
+changeDate + {*:1} Date
+yearService + {*:1} Integer
+length + {*:1} Float | sqlType=numeric
+capacity + {*:1} Float | sqlType=numeric
+power + {*:1} Integer
+searchMaximum + {*:1} Float | sqlType=numeric
+comment + {*:1} String | hibernateAttributeType=text
+iattcId + {*:1} String
+ctoiId + {*:1} String
+nationalId + {*:1} String
+comId + {*:1} String
+tuviId + {*:1} String
+imoId + {*:1} String
+radioCallSignId + {*:1} String
+shipOwner {*:0..1} referentiel.ShipOwner
+
+referentiel.VesselSizeCategory > referentiel.ObserveReferentialEntity | entity
+capacityLabel + {*:1} String
+gaugeLabel + {*:1} String
+
+referentiel.VesselType > referentiel.I18nReferentialEntity | entity
+
+referentiel.WeightMeasureType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.BaitSettingStatus > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.BaitType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.CatchFateLongline > referentiel.I18nReferentialEntity | entity dbName=CatchFate
+
+referentiel.longline.EncounterType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.Healthness > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.HookPosition > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.HookSize > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.HookType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.LightsticksColor > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.LightsticksType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.LineType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.MaturityStatus > referentiel.I18nReferentialEntity | entity
+lowerValue + {*:1} String
+upperValue + {*:1} String
+
+referentiel.longline.MitigationType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.SensorBrand > referentiel.ObserveReferentialEntity | entity
+brandName + {*:1} String
+
+referentiel.longline.SensorDataFormat > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.SensorType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.SettingShape > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.StomacFullness > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.TripType > referentiel.I18nReferentialEntity | entity
+
+referentiel.longline.VesselActivityLongline > referentiel.I18nReferentialEntity | entity dbName=VesselActivity
+
+referentiel.seine.DetectionMode > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity
+selectable + {*:1} boolean | notNull
+childrenMultiSelectable + {*:1} boolean | notNull
+childSelectionMandatory + {*:1} boolean | notNull
+usedInSimpleForm + {*:1} boolean | notNull
+usedInDetailledForm + {*:1} boolean | notNull
+parent {*:0..1} referentiel.seine.ObjectMaterial
+
+referentiel.seine.ObjectOperation > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.ObjectType > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.ObservedSystem > referentiel.I18nReferentialEntity | entity
+schoolType + {*:1} !fr.ird.observe.common.constants.seine.SchoolType
+
+referentiel.seine.ReasonForDiscard > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.ReasonForNullSet > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.SpeciesFate > referentiel.I18nReferentialEntity | entity
+discard + {*:1} Boolean
+
+referentiel.seine.SpeciesStatus > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.TransmittingBuoyOperation > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.TransmittingBuoyType > referentiel.I18nReferentialEntity | entity
+
+referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity
+allowFad + {*:1} boolean
+
+referentiel.seine.WeightCategory > referentiel.I18nReferentialEntity | entity
+species {*:1} referentiel.Species | lazy=false
+
+referentiel.seine.Wind > referentiel.I18nReferentialEntity | entity
+speedRange + {*:1} String
+waveHeight + {*:1} String
+
+seine.ActivitySeine > CommentableEntity >> Activity | entity dbName=Activity
+time + {*:1} Date | hibernateAttributeType.java.util.Date=time
+latitude + {*:1} Float | sqlType=numeric
+longitude + {*:1} Float | sqlType=numeric
+vesselSpeed + {*:1} Float | sqlType=numeric
+seaSurfaceTemperature + {*:1} Float | sqlType=numeric
+observedSystemDistance + {*:1} Float | sqlType=numeric
+ersId + {*:1} String
+vesselActivitySeine {*:1} referentiel.seine.VesselActivitySeine | dbName=vesselActivity
+surroundingActivity {*:0..1} referentiel.seine.SurroundingActivity
+wind {*:0..1} referentiel.seine.Wind
+detectionMode {*:0..1} referentiel.seine.DetectionMode
+reasonForNoFishing {*:0..1} referentiel.seine.ReasonForNoFishing
+floatingObject + {*} seine.FloatingObject | unique reverseDbName=activity
+observedSystem {*:*} referentiel.seine.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity
+setSeine + {0..1} seine.SetSeine | dbName=set
+currentFpaZone {*:0..1} referentiel.FpaZone
+previousFpaZone {*:0..1} referentiel.FpaZone
+nextFpaZone {*:0..1} referentiel.FpaZone
+isDCPOperation() boolean
+isSetOperation() boolean
+isObservedSystemOperation() boolean
+getSchoolType() !fr.ird.observe.common.constants.seine.SchoolType
+isActivityFinDeVeille() boolean
+isActivityDebutDePechePositive() boolean
+isActivityFinDePeche() boolean
+isChangedZoneOperation() boolean
+
+seine.FloatingObject > CommentableEntity | entity
+objectSchoolEstimate + {*} seine.ObjectSchoolEstimate
+objectObservedSpecies + {*} seine.ObjectObservedSpecies
+objectType {*:0..1} referentiel.seine.ObjectType
+objectOperation {*:1} referentiel.seine.ObjectOperation
+transmittingBuoy + {*} seine.TransmittingBuoy | unique
+floatingObjectPart + {*} seine.FloatingObjectPart | unique
+getTypeTransmittingBuoyOperation() !fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation
+
+seine.FloatingObjectPart > ObserveDataEntity | entity
+whenArriving + {*:1} boolean
+whenLeaving + {*:1} boolean
+floatingObject {*:1} seine.FloatingObject | notNull
+objectMaterial {*:1} referentiel.seine.ObjectMaterial | notNull
+
+seine.GearUseFeaturesMeasurementSeine > ObserveDataEntity | entity dbName=GearUseFeaturesMeasurement
+measurementValue + {*:1} String
+gearCaracteristic {*:1} referentiel.GearCaracteristic | notNull
+
+seine.GearUseFeaturesSeine > CommentableEntity | entity dbName=GearUseFeatures
+number + {*:1} Integer
+usedInTrip + {*:1} Boolean
+gear {*:1} referentiel.Gear
+gearUseFeaturesMeasurement + {*} seine.GearUseFeaturesMeasurementSeine | orderBy=topiaCreateDate reverseDbName=gearUseFeatures
+getMeasurementsAsString() String
+
+seine.NonTargetCatch > CommentableEntity >> LengthWeightComputable | entity
+catchWeight + {*:1} Float | sqlType=numeric
+catchWeightComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+meanWeight + {*:1} Float | sqlType=numeric
+meanWeightComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+meanLength + {*:1} Float | sqlType=numeric
+meanLengthComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+totalCount + {*:1} Integer
+totalCountComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+well + {*:1} String
+reasonForDiscard {*:0..1} referentiel.seine.ReasonForDiscard
+species {*:1} referentiel.Species
+speciesFate {*:0..1} referentiel.seine.SpeciesFate
+isCatchWeightComputed() boolean
+isMeanWeightComputed() boolean
+isTotalCountComputed() boolean
+isMeanLengthComputed() boolean
+
+seine.NonTargetCatchRelease > CommentableEntity | entity
+length + {*:1} Float | sqlType=numeric
+detectionTime + {*:1} Date | hibernateAttributeType.java.util.Date=timestamp
+releaseTime + {*:1} Date | hibernateAttributeType.java.util.Date=timestamp
+species {*:1} referentiel.Species | notNull
+nonTargetCatchReleaseStatus + {*} seine.NonTargetCatchReleaseStatus | unique lazy=false
+sex {*:1} referentiel.Sex | notNull
+speciesGroupReleaseMode {*:1} referentiel.SpeciesGroupReleaseMode | notNull
+
+seine.NonTargetCatchReleaseStatus > ObserveDataEntity | entity
+nonTargetCatchReleaseStatusType {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatusType | notNull
+speciesGroupReleaseStatus {*:1} referentiel.SpeciesGroupReleaseStatus | notNull
+
+seine.NonTargetLength > ObserveDataEntity >> LengthWeightComputable | entity
+length + {*:1} Float | sqlType=numeric
+isLengthComputed + {*:1} boolean
+picturesReferences + {*:1} String
+weight + {*:1} Float | sqlType=numeric
+isWeightComputed + {*:1} boolean
+count + {*:1} Integer
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+species {*:1} referentiel.Species
+sex {*:1} referentiel.Sex | lazy=false
+speciesFate {*:0..1} referentiel.seine.SpeciesFate
+sizeMeasureType {*:1} referentiel.SizeMeasureType
+
+seine.NonTargetSample > CommentableEntity | entity
+nonTargetLength + {*} seine.NonTargetLength | unique
+
+seine.ObjectObservedSpecies > ObserveDataEntity | entity
+count + {*:1} Integer
+statut + {*:1} Integer
+species {*:1} referentiel.Species
+speciesStatus {*:1} referentiel.seine.SpeciesStatus
+
+seine.ObjectSchoolEstimate > ObserveDataEntity | entity
+totalWeight + {*:1} Integer
+species {*:1} referentiel.Species
+
+seine.Route > CommentableEntity | entity
+date + {*:1} Date | hibernateAttributeType.java.util.Date=date
+startLogValue + {*:1} Float | sqlType=numeric
+endLogValue + {*:1} Float | sqlType=numeric
+checkLevel + {*:1} int
+activitySeine + {*} seine.ActivitySeine | unique orderBy=time
+
+seine.SchoolEstimate > ObserveDataEntity | naturalIdMutable entity
+totalWeight + {*:1} Integer
+meanWeight + {*:1} Integer
+setSeine {*:1} seine.SetSeine | naturalId dbName=set
+species {*:1} referentiel.Species | naturalId
+
+seine.SetSeine > CommentableEntity >> ObserveSet | entity dbName=Set
+startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time
+endPursingTimeStamp + {*:1} Date
+endSetTimeStamp + {*:1} Date
+maxGearDepth + {*:1} Integer
+currentSpeed + {*:1} Float | sqlType=numeric
+currentDirection + {*:1} Integer
+schoolTopDepth + {*:1} Integer
+schoolMeanDepth + {*:1} Integer
+schoolThickness + {*:1} Integer
+supportVesselName + {*:1} String
+targetDiscarded + {*:1} Boolean
+nonTargetDiscarded + {*:1} Boolean
+currentMeasureDepth + {*:1} Integer
+schoolType + {*:1} !fr.ird.observe.common.constants.seine.SchoolType
+targetCatchCompositionEstimatedByObserver + {*:1} boolean
+targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
+nonTargetCatch + {*} seine.NonTargetCatch | reverseDbName=set
+reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet
+nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set
+targetSample + {*} seine.TargetSample | unique reverseDbName=set
+targetCatch + {*} seine.TargetCatch | reverseDbName=set
+schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set
+nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set
+hasTargetCatch() boolean
+hasRejetThon() boolean
+canUseTargetSample(discarded boolean) boolean
+canUseNonTargetSample() boolean
+getTargetSample(discarded boolean) seine.TargetSample
+isFreeSchoolType() boolean
+isSchoolObjectType() boolean
+isUnknownSchoolType() boolean
+setEndSetDate(endSetDate Date)
+setEndPursingDate(endPursingDate Date)
+getEndSetDate() Date
+getEndPursingDate() Date
+getEndSetTime() Date
+setEndSetTime(endSetTime Date)
+getEndPursingTime() Date
+setEndPursingTime(endPursingTime Date)
+
+seine.TargetCatch > CommentableEntity | naturalIdMutable entity
+catchWeight + {*:1} Float | sqlType=numeric
+well + {*:1} String | naturalId notNull=false
+broughtOnDeck + {*:1} Boolean
+discarded + {*:1} boolean | naturalId
+setSeine {*:1} seine.SetSeine | naturalId dbName=set
+weightCategory {*:1} referentiel.seine.WeightCategory | naturalId
+reasonForDiscard {*:0..1} referentiel.seine.ReasonForDiscard | naturalId notNull=false
+getSpecies() referentiel.Species
+setSpecies(species referentiel.Species)
+
+seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity
+length + {*:1} Float | sqlType=numeric
+isLengthComputed + {*:1} boolean
+count + {*:1} Integer
+weight + {*:1} Float | sqlType=numeric
+isWeightComputed + {*:1} boolean
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+targetSample {*:1} seine.TargetSample
+species {*:1} referentiel.Species
+sizeMeasureType {*:1} referentiel.SizeMeasureType
+sex {*:0..1} referentiel.Sex
+getTotalWeight() Float
+
+seine.TargetSample > CommentableEntity | entity
+nature + {*:1} String
+discarded + {*:1} Boolean
+targetLength + {*} seine.TargetLength | unique
+
+seine.TransmittingBuoy > ObserveDataEntity | entity
+code + {*:1} String
+brand + {*:1} String
+ownership + {*:1} !fr.ird.observe.common.constants.seine.Ownership
+transmittingBuoyType {*:1} referentiel.seine.TransmittingBuoyType
+transmittingBuoyOperation {*:1} referentiel.seine.TransmittingBuoyOperation
+country {*:1} referentiel.Country
+
+seine.TripSeine > CommentableEntity >> Trip | entity dbName=Trip
+startDate + {*:1} Date | hibernateAttributeType.java.util.Date=date
+endDate + {*:1} Date | hibernateAttributeType.java.util.Date=date
+checkLevel + {*:1} int
+formsUrl + {*:1} String
+reportsUrl + {*:1} String
+historicalData + {*:1} boolean
+ersId + {*:1} String
+ocean {*:0..1} referentiel.Ocean
+route + {*} seine.Route | unique orderBy=date reverseDbName=trip
+vessel {*:1} referentiel.Vessel
+program {*:1} referentiel.Program
+observer {*:0..1} referentiel.Person
+captain {*:0..1} referentiel.Person
+dataEntryOperator {*:0..1} referentiel.Person
+departureHarbour {*:0..1} referentiel.Harbour
+landingHarbour {*:0..1} referentiel.Harbour
+gearUseFeaturesSeine + {*} seine.GearUseFeaturesSeine | orderBy=topiaCreateDate reverseDbName=trip
+getObserverLabel() String
+getRouteCount() int
+setRouteCount(routeCount int)


=====================================
persistence/src/main/xmi/observe-common.zargo
=====================================
Binary files a/persistence/src/main/xmi/observe-common.zargo and b/persistence/src/main/xmi/observe-common.zargo differ


=====================================
persistence/src/main/xmi/observe-seine.zargo
=====================================
Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/persistence/src/main/xmi/observe-seine.zargo differ


=====================================
persistence/src/main/xmi/observe.ini
=====================================
--- a/persistence/src/main/xmi/observe.ini
+++ b/persistence/src/main/xmi/observe.ini
@@ -10,6 +10,7 @@ generatePropertyChangeSupport = true
 indexForeignKeys = true
 notGenerateToString = true
 useEnumerationName = false
+defaultPackage = fr.ird.observe.entities
 version = @observe.model.version@
 
 [package fr.ird.observe.common]


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
 
     <mavenVersion>3.5.0</mavenVersion>
 
-    <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
+    <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion>
     <processorPluginVersion>1.3</processorPluginVersion>
     <!-- il faudra attendre la version 1.13 qui corrige des pb -->
     <licensePluginVersion>1.9</licensePluginVersion>
@@ -498,7 +498,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.nuiton.eugene</groupId>
+        <groupId>io.ultreia.java4all.eugene</groupId>
         <artifactId>eugene</artifactId>
         <version>${eugenePluginVersion}</version>
       </dependency>
@@ -865,7 +865,7 @@
         </plugin>
 
         <plugin>
-          <groupId>org.nuiton.eugene</groupId>
+          <groupId>io.ultreia.java4all.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
           <version>${eugenePluginVersion}</version>
         </plugin>


=====================================
services/pom.xml
=====================================
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -146,22 +146,39 @@
       </plugin>
 
         <plugin>
-          <groupId>org.nuiton.eugene</groupId>
+          <groupId>io.ultreia.java4all.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
           <executions>
+            <!--execution>
+              <phase>generate-sources</phase>
+              <id>generate-friend-model</id>
+              <configuration>
+                <defaultPackage>fr.ird.observe.services.dto</defaultPackage>
+                <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath>
+                <modelExtensionFile>${project.basedir}/src/main/xmi/observe-services-dto.ini</modelExtensionFile>
+                <inputs>
+                  <input>zargo</input>
+                </inputs>
+                <templates>org.nuiton.eugene.FriendTemplatesGenerator</templates>
+              </configuration>
+              <goals>
+                <goal>generate</goal>
+              </goals>
+            </execution-->
+
             <execution>
               <phase>generate-sources</phase>
               <id>generate-services-dto</id>
               <configuration>
                 <inputs>
-                  <input>zargo</input>
+                  <input>friend</input>
                 </inputs>
-                <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
+                <!--<resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>-->
                 <templates>org.nuiton.eugene.java.BeanTransformer</templates>
                 <failIfUnsafe>true</failIfUnsafe>
                 <defaultPackage>fr.ird.observe.services.dto</defaultPackage>
                 <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath>
-                <modelExtensionFile>../services/src/main/xmi/observe-services-dto.ini</modelExtensionFile>
+                <!--<modelExtensionFile>../services/src/main/xmi/observe-services-dto.ini</modelExtensionFile>-->
               </configuration>
               <goals>
                 <goal>generate</goal>


=====================================
services/src/main/models/Observe.friendmodel
=====================================
--- /dev/null
+++ b/services/src/main/models/Observe.friendmodel
@@ -0,0 +1,811 @@
+model Observe | java8 classNameSuffix=Dto defaultPackage=fr.ird.observe.services.dto superClass=fr.ird.observe.services.dto.AbstractObserveDto version=@observe.model.version@
+
+package fr.ird.observe.common | skip
+package fr.ird.observe.services.dto | bean
+
+enum constants.ObserveDbRole
+
+enum seine.SetSeineConstants | skip
+targetSampleCapture
+endSetDate
+endPursingDate
+endSetTime
+endPursingTime
+
+enum seine.TargetLengthConstants | skip
+totalWeight
+
+interface ObserveDto
+
+interface WithComment
+getComment() String
+setComment(comment String)
+
+interface longline.LonglineCompositionDto
+
+interface longline.LonglinePositionAwareDto
+
+interface longline.LonglinePositionSetDto
+
+interface reference.DataReference > fr.ird.observe.services.dto.ObserveDto
+
+interface reference.ReferentialReference > fr.ird.observe.services.dto.ObserveDto
+
+abstract Commentable > Data >> WithComment
+comment + {*:1} String
+
+abstract Data > Id
+
+abstract Id >> ObserveDto
+id + {*:1} String
+lastUpdateDate + {*:1} Date
+
+abstract Openable > Commentable
+open + {*:1} boolean
+
+abstract referential.I18nReferential > referential.Referential
+label1 + {*:1} String
+label2 + {*:1} String
+label3 + {*:1} String
+label4 + {*:1} String
+label5 + {*:1} String
+label6 + {*:1} String
+label7 + {*:1} String
+label8 + {*:1} String
+
+abstract referential.Referential > Id
+code + {*:1} String
+status + {*:1} !fr.ird.observe.common.constants.ReferenceStatus
+uri + {*:1} String
+needComment + {*:1} boolean
+version + {*:1} long
+createDate + {*:1} Date
+
+DataFile
+content + {*:1} !byte[]
+name + {*:1} String
+
+ObserveDbUser >> ObserveDto
+name + {*:1} String
+role {*:1} constants.ObserveDbRole
+
+TripMap > Id
+points + {*} !fr.ird.observe.common.TripMapPoint | ordered unique
+
+longline.ActivityLongline > Openable
+timeStamp + {*:1} Date
+latitude + {*:1} Float
+longitude + {*:1} Float
+seaSurfaceTemperature + {*:1} Float
+hasSetLongline + {*:1} boolean
+quadrant + {*:1} Integer
+fpaZone {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto
+vesselActivityLongline {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto
+setLongline {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.SetLonglineDto
+
+longline.ActivityLonglineEncounter > Commentable
+encounter {*} longline.Encounter
+
+longline.ActivityLonglineSensorUsed > Commentable
+sensorUsed {*} longline.SensorUsed
+
+longline.ActivityLonglineStub > Data
+timeStamp + {*:1} Date
+vesselActivityLonglineLabel + {*:1} String
+hasSetLongline + {*:1} Boolean
+
+longline.BaitsComposition > Data
+proportion + {*:1} Integer
+individualSize + {*:1} Integer
+individualWeight + {*:1} Float
+baitSettingStatus {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
+baitType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitTypeDto
+
+longline.Basket > Data >> longline.LonglineCompositionDto
+settingIdentifier + {*:1} Integer
+haulingIdentifier + {*:1} Integer
+floatline1Length + {*:1} Float
+floatline2Length + {*:1} Float
+branchline + {*} longline.Branchline | ordered unique
+
+longline.Branchline > Commentable >> longline.LonglineCompositionDto
+settingIdentifier + {*:1} Integer
+haulingIdentifier + {*:1} Integer
+depthRecorder + {*:1} Boolean
+timer + {*:1} Boolean
+timeSinceContact + {*:1} Long
+hookOffset + {*:1} Integer
+branchlineLength + {*:1} Float
+weightedSwivel + {*:1} Boolean
+timerTimeOnBoard + {*:1} Date
+weightedSnap + {*:1} Boolean
+swivelWeight + {*:1} Float
+snapWeight + {*:1} Float
+tracelineLength + {*:1} Float
+hookLost + {*:1} Boolean
+traceCutOff + {*:1} Boolean
+baitSettingStatus {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
+hookSize {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookSizeDto
+baitHaulingStatus {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto
+hookType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookTypeDto
+tracelineType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+topType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+baitType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.BaitTypeDto
+
+longline.BranchlinesComposition > Data
+length + {*:1} Float
+proportion + {*:1} Integer
+tracelineLength + {*:1} Float
+topType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+tracelineType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+
+longline.CatchLongline > Commentable >> longline.LonglinePositionAwareDto
+homeId + {*:1} String
+count + {*:1} Integer
+totalWeight + {*:1} Float
+hookWhenDiscarded + {*:1} Boolean
+depredated + {*:1} Boolean
+beatDiameter + {*:1} Float
+gonadeWeight + {*:1} Float
+photoReferences + {*:1} String
+number + {*:1} Integer
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+basket {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto
+branchline {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto
+catchFateLongline {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto
+discardHealthness {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HealthnessDto
+sizeMeasure + {*} longline.SizeMeasure
+speciesCatch {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+predator {*:*} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+section {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto
+maturityStatus {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.MaturityStatusDto
+stomacFullness {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.StomacFullnessDto
+hookPosition {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookPositionDto
+weightMeasure + {*} longline.WeightMeasure
+catchHealthness {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HealthnessDto
+sex {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SexDto
+
+longline.Encounter > Data
+distance + {*:1} Float
+count + {*:1} Integer
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+encounterType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.EncounterTypeDto
+
+longline.FloatlinesComposition > Data
+length + {*:1} Float
+proportion + {*:1} Integer
+lineType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+
+longline.GearUseFeaturesLongline > Commentable
+number + {*:1} Integer
+usedInTrip + {*:1} Boolean
+gearUseFeaturesMeasurement + {*} longline.GearUseFeaturesMeasurementLongline | ordered unique
+gear {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.GearDto
+
+longline.GearUseFeaturesMeasurementLongline > Data
+measurementValue + {*:1} String
+gearCaracteristic {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto
+
+longline.HooksComposition > Data
+proportion + {*:1} Integer
+hookOffset + {*:1} Integer
+hookType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookTypeDto
+hookSize {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.HookSizeDto
+
+longline.Section > Data >> longline.LonglineCompositionDto
+settingIdentifier + {*:1} Integer
+haulingIdentifier + {*:1} Integer
+basket + {*} longline.Basket | ordered unique
+
+longline.SensorUsed > Data
+hasData + {*:1} boolean
+sensorSerialNo + {*:1} String
+dataLocation + {*:1} String
+sensorDataFormat {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto
+sensorType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorTypeDto
+sensorBrand {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorBrandDto
+data {*:0..1} DataFile
+
+longline.SetLongline > Commentable
+homeId + {*:1} String
+number + {*:1} Integer
+basketsPerSectionCount + {*:1} Integer
+branchlinesPerBasketCount + {*:1} Integer
+totalSectionsCount + {*:1} Integer
+totalBasketsCount + {*:1} Integer
+totalHooksCount + {*:1} Integer
+weightedSnap + {*:1} Boolean
+snapWeight + {*:1} Float
+weightedSwivel + {*:1} Boolean
+swivelWeight + {*:1} Float
+lightsticksPerBasketCount + {*:1} Integer
+timeBetweenHooks + {*:1} Long
+shooterUsed + {*:1} Boolean
+shooterSpeed + {*:1} Float
+maxDepthTargeted + {*:1} Integer
+settingStartTimeStamp + {*:1} Date
+settingStartLatitude + {*:1} Float
+settingStartLongitude + {*:1} Float
+settingEndTimeStamp + {*:1} Date
+settingEndLatitude + {*:1} Float
+settingEndLongitude + {*:1} Float
+settingVesselSpeed + {*:1} Float
+haulingDirectionSameAsSetting + {*:1} Boolean
+haulingStartTimeStamp + {*:1} Date
+haulingStartLatitude + {*:1} Float
+haulingStartLongitude + {*:1} Float
+haulingEndTimeStamp + {*:1} Date
+haulingEndLatitude + {*:1} Float
+haulingEndLongitude + {*:1} Float
+haulingBreaks + {*:1} Integer
+monitored + {*:1} Boolean
+haulingStartQuadrant + {*:1} Integer
+haulingEndQuadrant + {*:1} Integer
+settingStartQuadrant + {*:1} Integer
+settingEndQuadrant + {*:1} Integer
+settingShape {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.SettingShapeDto
+lineType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LineTypeDto
+lightsticksType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto
+lightsticksColor {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.LightsticksColorDto
+otherSets {*} longline.SetLonglineStub
+
+longline.SetLonglineCatch > Data >> longline.LonglinePositionSetDto
+catchLongline {*} longline.CatchLongline | ordered
+sections {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto
+baskets {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto
+branchlines {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto
+
+longline.SetLonglineDetailComposition > Data
+settingStartTimeStamp + {*:1} Date
+monitored + {*:1} Boolean
+totalSectionsCount + {*:1} Integer
+basketsPerSectionCount + {*:1} Integer
+branchlinesPerBasketCount + {*:1} Integer
+haulingDirectionSameAsSetting + {*:1} Boolean
+haulingBreaks + {*:1} Integer
+section + {*} longline.Section | ordered unique
+
+longline.SetLonglineGlobalComposition > Commentable
+baitsComposition + {*} longline.BaitsComposition
+floatlinesComposition + {*} longline.FloatlinesComposition
+hooksComposition + {*} longline.HooksComposition
+mitigationType:set + {*:*} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.MitigationTypeDto
+branchlinesComposition + {*} longline.BranchlinesComposition
+
+longline.SetLonglineStub > Data
+homeId + {*:1} String
+number + {*:1} Integer
+activityLongline {*:1} reference.DataReference | unique attributeGeneric=fr.ird.observe.services.dto.longline.ActivityLonglineDto
+
+longline.SetLonglineTdr > Data >> longline.LonglinePositionSetDto
+settingStartTimeStamp + {*:1} Date
+tdr {*} longline.Tdr
+sections {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto
+baskets {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto
+branchlines {*:*} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto
+
+longline.SizeMeasure > Data
+size + {*:1} Float
+sizeMeasureType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
+
+longline.Tdr > Data >> longline.LonglinePositionAwareDto
+homeId + {*:1} String
+floatline1Length + {*:1} Float
+floatline2Length + {*:1} Float
+serialNo + {*:1} String
+hasData + {*:1} boolean
+deployementStart + {*:1} Date
+deployementEnd + {*:1} Date
+fishingStart + {*:1} Date
+fishingEnd + {*:1} Date
+fishingStartDepth + {*:1} Float
+fishingEndDepth + {*:1} Float
+meanDeployementDepth + {*:1} Float
+medianDeployementDepth + {*:1} Float
+minFishingDepth + {*:1} Float
+maxFishingDepth + {*:1} Float
+meanFishingDepth + {*:1} Float
+medianFishingDepth + {*:1} Float
+dataLocation + {*:1} String
+branchline {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto
+sensorBrand {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorBrandDto
+species {*:*} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+section {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.SectionDto
+basket {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.longline.BasketDto
+itemHorizontalPosition {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto
+itemVerticalPosition {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto
+data {*:0..1} DataFile
+
+longline.TripLongline > Openable
+startDate + {*:1} Date
+endDate + {*:1} Date
+totalFishingOperationsNumber + {*:1} Integer
+homeId + {*:1} String
+activityCount + {*:1} int
+tripType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.longline.TripTypeDto
+observer {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+vessel {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.VesselDto
+captain {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+dataEntryOperator {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+program {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.ProgramDto
+ocean {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.OceanDto
+departureHarbour {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto
+landingHarbour {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto
+activityLongline + {*} longline.TripLonglineActivity | ordered unique
+
+longline.TripLonglineActivity > Data
+timeStamp + {*:1} Date
+
+longline.TripLonglineGearUse > Data
+gearUseFeaturesLongline + {*} longline.GearUseFeaturesLongline | ordered unique
+
+longline.WeightMeasure > Data
+weight + {*:1} Float
+weightMeasureType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.WeightMeasureTypeDto
+
+referential.Country > referential.I18nReferential
+iso2Code + {*:1} String
+iso3Code + {*:1} String
+
+referential.FpaZone > referential.I18nReferential
+startDate + {*:1} Date
+endDate + {*:1} Date
+
+referential.Gear > referential.I18nReferential
+gearCaracteristic {*:*} reference.ReferentialReference | ordered attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristic
+
+referential.GearCaracteristic > referential.I18nReferential
+unit + {*:1} String
+gearCaracteristicType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicType
+
+referential.GearCaracteristicType > referential.I18nReferential
+
+referential.Harbour > referential.Referential
+locode + {*:1} String
+name + {*:1} String
+latitude + {*:1} Float
+longitude + {*:1} Float
+quadrant + {*:1} Integer
+country {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Country
+
+referential.LengthLengthParameter > referential.Referential >> WithComment
+coefficients + {*:1} String
+inputOutputFormula + {*:1} String
+inputOutputFormulaValid + {*:1} boolean
+outputInputFormula + {*:1} String
+outputInputFormulaValid + {*:1} boolean
+source + {*:1} String
+inputSizeMeasureType {*:1} reference.ReferentialReference
+outputSizeMeasureType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureType
+
+referential.LengthWeightParameter > referential.Referential >> WithComment
+startDate + {*:1} Date
+endDate + {*:1} Date
+coefficients + {*:1} String
+lengthWeightFormula + {*:1} String
+weightLengthFormula + {*:1} String
+meanLength + {*:1} Float
+meanWeight + {*:1} Float
+lengthWeightFormulaValid + {*:1} boolean
+weightLengthFormulaValid + {*:1} boolean
+source + {*:1} String
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Species
+ocean {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Ocean
+sex {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Sex
+sizeMeasureType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureType
+
+referential.Ocean > referential.I18nReferential
+
+referential.Organism > referential.I18nReferential
+description + {*:1} String
+country {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Country
+
+referential.Person > referential.Referential
+lastName + {*:1} String
+firstName + {*:1} String
+observer + {*:1} boolean
+captain + {*:1} boolean
+dataEntryOperator + {*:1} boolean
+country {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Country
+
+referential.Program > referential.I18nReferential >> WithComment
+nonTargetObservation + {*:1} int
+targetDiscardsObservation + {*:1} int
+samplesObservation + {*:1} int
+objectsObservation + {*:1} int
+detailledActivitiesObservation + {*:1} int
+mammalsObservation + {*:1} int
+birdsObservation + {*:1} int
+baitObservation + {*:1} int
+startDate + {*:1} Date
+endDate + {*:1} Date
+comment + {*:1} String
+tripCount + {*:1} int
+gearType {*:1} !fr.ird.observe.common.constants.GearType
+organism {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Organism
+
+referential.Sex > referential.I18nReferential
+
+referential.ShipOwner > referential.Referential
+label + {*:1} String
+startDate + {*:1} Date
+endDate + {*:1} Date
+country {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Country
+
+referential.SizeMeasureType > referential.I18nReferential
+
+referential.Species > referential.I18nReferential
+faoCode + {*:1} String
+scientificLabel + {*:1} String
+homeId + {*:1} String
+wormsId + {*:1} Long
+minLength + {*:1} Float
+maxLength + {*:1} Float
+minWeight + {*:1} Float
+maxWeight + {*:1} Float
+ocean {*:*} reference.ReferentialReference | ordered attributeGeneric=fr.ird.observe.services.dto.referential.Ocean
+speciesGroup {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroup
+sizeMeasureType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureType
+
+referential.SpeciesGroup > referential.I18nReferential
+speciesGroupReleaseMode {*:*} reference.ReferentialReference | ordered attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroupReleaseMode
+speciesGroupReleaseStatus {*:*} reference.ReferentialReference | ordered attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatus
+
+referential.SpeciesGroupReleaseMode > referential.I18nReferential
+
+referential.SpeciesGroupReleaseStatus > referential.I18nReferential
+
+referential.SpeciesList > referential.I18nReferential
+species {*:*} reference.ReferentialReference | ordered attributeGeneric=fr.ird.observe.services.dto.referential.Species
+
+referential.Vessel > referential.I18nReferential
+keelCode + {*:1} Integer
+fleetCountry + {*:1} Integer
+changeDate + {*:1} Date
+yearService + {*:1} Integer
+length + {*:1} Float
+capacity + {*:1} Float
+power + {*:1} Integer
+searchMaximum + {*:1} Float
+comment + {*:1} String
+iattcId + {*:1} String
+ctoiId + {*:1} String
+nationalId + {*:1} String
+comId + {*:1} String
+tuviId + {*:1} String
+imoId + {*:1} String
+radioCallSignId + {*:1} String
+flagCountry {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Country
+vesselType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.VesselType
+vesselSizeCategory {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.VesselSizeCategory
+shipOwner {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.ShipOwner
+
+referential.VesselSizeCategory > referential.Referential
+capacityLabel + {*:1} String
+gaugeLabel + {*:1} String
+
+referential.VesselType > referential.I18nReferential
+
+referential.WeightMeasureType > referential.I18nReferential
+
+referential.longline.BaitHaulingStatus > referential.I18nReferential
+
+referential.longline.BaitSettingStatus > referential.I18nReferential
+
+referential.longline.BaitType > referential.I18nReferential
+
+referential.longline.CatchFateLongline > referential.I18nReferential
+
+referential.longline.EncounterType > referential.I18nReferential
+
+referential.longline.Healthness > referential.I18nReferential
+
+referential.longline.HookPosition > referential.I18nReferential
+
+referential.longline.HookSize > referential.I18nReferential
+
+referential.longline.HookType > referential.I18nReferential
+
+referential.longline.ItemHorizontalPosition > referential.I18nReferential
+
+referential.longline.ItemVerticalPosition > referential.I18nReferential
+
+referential.longline.LightsticksColor > referential.I18nReferential
+
+referential.longline.LightsticksType > referential.I18nReferential
+
+referential.longline.LineType > referential.I18nReferential
+
+referential.longline.MaturityStatus > referential.I18nReferential
+lowerValue + {*:1} String
+upperValue + {*:1} String
+
+referential.longline.MitigationType > referential.I18nReferential
+
+referential.longline.SensorBrand > referential.Referential
+brandName + {*:1} String
+
+referential.longline.SensorDataFormat > referential.I18nReferential
+
+referential.longline.SensorType > referential.I18nReferential
+
+referential.longline.SettingShape > referential.I18nReferential
+
+referential.longline.StomacFullness > referential.I18nReferential
+
+referential.longline.TripType > referential.I18nReferential
+
+referential.longline.VesselActivityLongline > referential.I18nReferential
+
+referential.seine.DetectionMode > referential.I18nReferential
+
+referential.seine.ObjectMaterial > referential.I18nReferential
+selectable + {*:1} boolean
+childrenMultiSelectable + {*:1} boolean
+childSelectionMandatory + {*:1} boolean
+usedInSimpleForm + {*:1} boolean
+usedInDetailledForm + {*:1} boolean
+parent {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto
+
+referential.seine.ObjectOperation > referential.I18nReferential
+
+referential.seine.ObjectType > referential.I18nReferential
+
+referential.seine.ObservedSystem > referential.I18nReferential
+schoolType + {*:1} !fr.ird.observe.common.constants.seine.SchoolType
+
+referential.seine.ReasonForDiscard > referential.I18nReferential
+
+referential.seine.ReasonForNoFishing > referential.I18nReferential
+
+referential.seine.ReasonForNullSet > referential.I18nReferential
+
+referential.seine.SpeciesFate > referential.I18nReferential
+discard + {*:1} Boolean
+
+referential.seine.SpeciesStatus > referential.I18nReferential
+
+referential.seine.SurroundingActivity > referential.I18nReferential
+
+referential.seine.TransmittingBuoyOperation > referential.I18nReferential
+
+referential.seine.TransmittingBuoyType > referential.I18nReferential
+
+referential.seine.VesselActivitySeine > referential.I18nReferential
+allowFad + {*:1} boolean
+
+referential.seine.WeightCategory > referential.I18nReferential
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Species
+
+referential.seine.Wind > referential.I18nReferential
+speedRange + {*:1} String
+waveHeight + {*:1} String
+
+result.SaveResult > Id
+
+result.TripChildSaveResult > result.SaveResult
+tripEndDateUpdated + {*:1} boolean
+
+seine.ActivitySeine > Openable
+time + {*:1} Date
+latitude + {*:1} Float
+longitude + {*:1} Float
+vesselSpeed + {*:1} Float
+seaSurfaceTemperature + {*:1} Float
+ersId + {*:1} String
+floatingObjectEmpty + {*:1} boolean
+observedSystemDistance + {*:1} Float
+quadrant + {*:1} Integer
+vesselActivitySeine {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto
+surroundingActivity {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto
+wind {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.WindDto
+detectionMode {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.DetectionModeDto
+reasonForNoFishing {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto
+previousFpaZone {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto
+currentFpaZone {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto
+nextFpaZone {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto
+setSeine {*:0..1} reference.DataReference | attributeGeneric=fr.ird.observe.services.dto.seine.SetSeineDto
+observedSystem {*:*} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObservedSystemDto
+
+seine.ActivitySeineStub > Data
+time + {*:1} Date
+latitude + {*:1} Float
+longitude + {*:1} Float
+seaSurfaceTemperature + {*:1} Float
+activityFinDeVeille + {*:1} boolean
+
+seine.FloatingObject > Commentable
+objectType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectTypeDto
+objectOperation {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectOperationDto
+
+seine.FloatingObjectObservedSpecies > Commentable
+objectObservedSpecies {*} seine.ObjectObservedSpecies
+
+seine.FloatingObjectPart > Data
+whenArriving + {*:1} boolean
+whenLeaving + {*:1} boolean
+objectMaterial {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto
+
+seine.FloatingObjectSchoolEstimate > Commentable
+objectSchoolEstimate {*} seine.ObjectSchoolEstimate
+
+seine.FloatingObjectTransmittingBuoy > Commentable
+transmittingBuoy {*} seine.TransmittingBuoy
+
+seine.GearUseFeaturesMeasurementSeine > Data
+measurementValue + {*:1} String
+gearCaracteristic {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto
+
+seine.GearUseFeaturesSeine > Commentable
+number + {*:1} Integer
+usedInTrip + {*:1} Boolean
+gearUseFeaturesMeasurement + {*} seine.GearUseFeaturesMeasurementSeine | unique
+gear {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.GearDto
+
+seine.NonTargetCatch > Commentable
+catchWeight + {*:1} Float
+catchWeightComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+meanWeight + {*:1} Float
+meanWeightComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+meanLength + {*:1} Float
+meanLengthComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+totalCount + {*:1} Integer
+totalCountComputedSource + {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource
+hasSample + {*:1} boolean
+well + {*:1} String
+hasRelease + {*:1} boolean
+reasonForDiscard {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
+speciesFate {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesFateDto
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+newOperation()
+
+seine.NonTargetCatchRelease > Commentable
+length + {*:1} Float
+detectionTime + {*:1} Date
+releaseTime + {*:1} Date
+nonTargetCatchReleaseStatus + {*} seine.NonTargetCatchReleaseStatus | ordered
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+sex {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SexDto
+speciesGroupReleaseMode {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroupReleaseModeDto
+
+seine.NonTargetCatchReleaseStatus > Data
+speciesGroupReleaseStatus {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatusDto
+nonTargetCatchReleaseStatusType {*:1} !fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatusType
+
+seine.NonTargetLength > Data
+length + {*:1} Float
+isLengthComputed + {*:1} boolean
+picturesReferences + {*:1} String
+weight + {*:1} Float
+isWeightComputed + {*:1} boolean
+count + {*:1} Integer
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Species
+sex {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.Sex
+speciesFate {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesFate
+sizeMeasureType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureType
+
+seine.NonTargetSample > Commentable
+nonTargetLength + {*} seine.NonTargetLength | unique
+speciesFate {*:*} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesFateDto
+
+seine.ObjectObservedSpecies > Data
+count + {*:1} Integer
+statut + {*:1} Integer
+speciesStatus {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+
+seine.ObjectSchoolEstimate > Data
+totalWeight + {*:1} Integer
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+
+seine.Route > Openable
+date + {*:1} Date
+startLogValue + {*:1} Float
+endLogValue + {*:1} Float
+checkLevel + {*:1} int
+activitySeine {*} seine.ActivitySeineStub | ordered unique
+
+seine.RouteStub > Data
+date + {*:1} Date
+startLogValue + {*:1} Float
+endLogValue + {*:1} Float
+
+seine.SchoolEstimate > Data
+totalWeight + {*:1} Integer
+meanWeight + {*:1} Integer
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+
+seine.SetSeine > Commentable
+startTime + {*:1} Date
+endPursingTimeStamp + {*:1} Date
+endSetTimeStamp + {*:1} Date
+maxGearDepth + {*:1} Integer
+currentSpeed + {*:1} Float
+currentDirection + {*:1} Integer
+schoolTopDepth + {*:1} Integer
+schoolMeanDepth + {*:1} Integer
+schoolThickness + {*:1} Integer
+supportVesselName + {*:1} String
+targetDiscarded + {*:1} Boolean
+nonTargetDiscarded + {*:1} Boolean
+currentMeasureDepth + {*:1} Integer
+schoolType + {*:1} !fr.ird.observe.common.constants.seine.SchoolType
+targetCatchCompositionEstimatedByObserver + {*:1} boolean
+targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
+reasonForNullSet {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto
+
+seine.SetSeineNonTargetCatch > Data
+nonTargetCatch {*} seine.NonTargetCatch
+
+seine.SetSeineNonTargetCatchRelease > Data
+endPursingTimeStamp + {*:1} Date
+nonTargetCatchRelease {*} seine.NonTargetCatchRelease | ordered
+
+seine.SetSeineSchoolEstimate > Commentable
+schoolEstimate {*} seine.SchoolEstimate
+
+seine.SetSeineTargetCatch > Data
+discarded + {*:1} boolean
+targetCatchCompositionEstimatedByObserver + {*:1} boolean
+targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
+targetCatch {*} seine.TargetCatch
+
+seine.TargetCatch > Commentable
+catchWeight + {*:1} Float
+well + {*:1} String
+broughtOnDeck + {*:1} Boolean
+discarded + {*:1} boolean
+hasSample + {*:1} boolean
+weightCategory {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.WeightCategoryDto
+reasonForDiscard {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+
+seine.TargetLength > Data
+length + {*:1} Float
+isLengthComputed + {*:1} boolean
+count + {*:1} Integer
+weight + {*:1} Float
+isWeightComputed + {*:1} boolean
+acquisitionMode + {*:1} int
+tagNumber + {*:1} String
+species {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto
+sizeMeasureType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
+sex {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.SexDto
+
+seine.TargetSample > Commentable
+nature + {*:1} String
+discarded + {*:1} Boolean
+targetLength + {*} seine.TargetLength | unique
+
+seine.TransmittingBuoy > Data
+code + {*:1} String
+brand + {*:1} String
+ownership + {*:1} !fr.ird.observe.common.constants.seine.Ownership
+transmittingBuoyType {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto
+transmittingBuoyOperation {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto
+country {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.CountryDto
+
+seine.TripSeine > Openable
+startDate + {*:1} Date
+endDate + {*:1} Date
+checkLevel + {*:1} int
+formsUrl + {*:1} String
+reportsUrl + {*:1} String
+historicalData + {*:1} boolean
+ersId + {*:1} String
+routeCount + {*:1} int
+observer {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+captain {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+dataEntryOperator {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.PersonDto
+vessel {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.VesselDto
+ocean {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.OceanDto
+departureHarbour {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto
+landingHarbour {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto
+route {*} seine.RouteStub | ordered unique
+program {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.ProgramDto
+
+seine.TripSeineGearUse > Data
+gearUseFeaturesSeine + {*} seine.GearUseFeaturesSeine | ordered unique


=====================================
services/src/main/xmi/observe-services-dto-seine.zargo
=====================================
Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and b/services/src/main/xmi/observe-services-dto-seine.zargo differ


=====================================
services/src/main/xmi/observe-services-dto.ini
=====================================
--- a/services/src/main/xmi/observe-services-dto.ini
+++ b/services/src/main/xmi/observe-services-dto.ini
@@ -3,6 +3,7 @@ java8 = true
 classNameSuffix = Dto
 superClass = fr.ird.observe.services.dto.AbstractObserveDto
 version = @observe.model.version@
+defaultPackage=fr.ird.observe.services.dto
 
 [package fr.ird.observe.common]
 skip= true


=====================================
topia-templates-extension/pom.xml
=====================================
--- a/topia-templates-extension/pom.xml
+++ b/topia-templates-extension/pom.xml
@@ -60,7 +60,7 @@
 
     <!-- Eugene -->
     <dependency>
-      <groupId>org.nuiton.eugene</groupId>
+      <groupId>io.ultreia.java4all.eugene</groupId>
       <artifactId>eugene</artifactId>
     </dependency>
 
@@ -127,7 +127,7 @@
       </plugin>
 
       <plugin>
-        <groupId>org.nuiton.eugene</groupId>
+        <groupId>io.ultreia.java4all.eugene</groupId>
         <artifactId>eugene-maven-plugin</artifactId>
         <dependencies>
           <dependency>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8f60cc5f29e678f388f451fb94a...

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8f60cc5f29e678f388f451fb94a...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)