branch develop updated (555e473 -> cae497f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 555e473 Use new eugene apis new 2d618f7 use commons-collections4 new cae497f use ini model extension format + remove usage of commons-collections The 2 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 cae497fc49f45d293face79fd5abbaad0b5ce45c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:32:06 2016 +0200 use ini model extension format + remove usage of commons-collections commit 2d618f74e65febecf7378738fbb4fa83028721c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:27:05 2016 +0200 use commons-collections4 Summary of changes: application-swing/pom.xml | 4 - .../swing/ui/admin/export/ExportUIHandler.java | 2 +- entities/pom.xml | 4 +- entities/src/main/xmi/observe.ini | 295 +++++++++++++++++++++ entities/src/main/xmi/observe.objectmodel-ext | 248 ----------------- services-dto/pom.xml | 2 +- services-dto/src/main/xmi/observe-services-dto.ini | 268 +++++++++++++++++++ .../main/xmi/observe-services-dto.objectmodel-ext | 216 --------------- 8 files changed, 567 insertions(+), 472 deletions(-) create mode 100644 entities/src/main/xmi/observe.ini delete mode 100644 entities/src/main/xmi/observe.objectmodel-ext create mode 100644 services-dto/src/main/xmi/observe-services-dto.ini delete mode 100644 services-dto/src/main/xmi/observe-services-dto.objectmodel-ext -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2d618f74e65febecf7378738fbb4fa83028721c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:27:05 2016 +0200 use commons-collections4 --- .../ird/observe/application/swing/ui/admin/export/ExportUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 58b50c9..a3bbced 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -46,7 +46,7 @@ import fr.ird.observe.services.service.trip.ImportTripResult; import fr.ird.observe.services.service.trip.TripManagementService; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.ext.WizardState; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit cae497fc49f45d293face79fd5abbaad0b5ce45c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:32:06 2016 +0200 use ini model extension format + remove usage of commons-collections --- application-swing/pom.xml | 4 - entities/pom.xml | 4 +- entities/src/main/xmi/observe.ini | 295 +++++++++++++++++++++ entities/src/main/xmi/observe.objectmodel-ext | 248 ----------------- services-dto/pom.xml | 2 +- services-dto/src/main/xmi/observe-services-dto.ini | 268 +++++++++++++++++++ .../main/xmi/observe-services-dto.objectmodel-ext | 216 --------------- 7 files changed, 566 insertions(+), 471 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index f1d2197..2173103 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -194,10 +194,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> diff --git a/entities/pom.xml b/entities/pom.xml index 6623109..650ec32 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -179,7 +179,7 @@ <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/xmi"> - <include name="*.objectmodel-ext" /> + <include name="*.ini" /> </fileset> </copy> </target> @@ -201,7 +201,7 @@ <configuration> <defaultPackage>fr.ird.observe</defaultPackage> <fullPackagePath>fr.ird.observe</fullPackagePath> - <modelExtensionFile>${project.build.directory}/xmi/observe.objectmodel-ext</modelExtensionFile> + <modelExtensionFile>${project.build.directory}/xmi/observe.ini</modelExtensionFile> <inputs> <input>zargo</input> </inputs> diff --git a/entities/src/main/xmi/observe.ini b/entities/src/main/xmi/observe.ini new file mode 100644 index 0000000..b4d52f9 --- /dev/null +++ b/entities/src/main/xmi/observe.ini @@ -0,0 +1,295 @@ +[model] +attributeType.Boolean = java.lang.Boolean +attributeType.Float = java.lang.Float +attributeType.Integer = java.lang.Integer +attributeType.Long = java.lang.Long +attributeType.String = java.lang.String +generateForeignKeyNames = true +generateOperatorForDAOHelper = true +generatePropertyChangeSupport = true +indexForeignKeys = true +notGenerateToString = true +useEnumerationName = false +version = @observe.model.version@ + +[package fr.ird.observe.entities] +dbSchema = OBSERVE_COMMON + +[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 + +[class fr.ird.observe.entities.CommentableEntity] +comment.hibernateAttributeType = text + +[class fr.ird.observe.entities.ObserveEntity] +lastUpdateDate.notNull = true + +[class fr.ird.observe.entities.longline.ActivityLongline] +dbName = Activity +encounter.reverseDbName = activity +sensorUsed.reverseDbName = activity +setLongline.dbName = set +vesselActivityLongline.dbName = vesselActivity +vesselActivityLongline.lazy = false + +[class fr.ird.observe.entities.longline.Basket] +branchline.orderBy = settingIdentifier +branchline.unique = true +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.Branchline] +branchlineLength.sqlType = numeric +catchLongline.dbName = catch +hookSize.sqlType = numeric +settingIdentifier.notNull = true +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tracelineLength.sqlType = numeric + +[class fr.ird.observe.entities.longline.BranchlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.CatchLongline] +dbName = Catch +beatDiameter.sqlType = numeric +catchFateLongline.dbName = catchFate +gonadeWeight.sqlType = numeric +predator.manyToManyTableName = catch_predator +predator.reverseDbName = catch +sizeMeasure.reverseDbName = catch +totalWeight.sqlType = numeric +weightMeasure.reverseDbName = catch + +[class fr.ird.observe.entities.longline.Encounter] +distance.sqlType = numeric + +[class fr.ird.observe.entities.longline.FloatlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.GearUseFeaturesLongline] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures +gearUseFeaturesMeasurement.unique = true + +[class fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.longline.HooksComposition] +hookSize.sqlType = numeric + +[class fr.ird.observe.entities.longline.Section] +basket.orderBy = settingIdentifier +basket.unique = true +setLongline.dbName = set +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.SetLongline] +dbName = Set +baitsComposition.reverseDbName = set +branchlinesComposition.reverseDbName = set +catchLongline.reverseDbName = set +catchLongline.unique = true +floatlinesComposition.reverseDbName = set +haulingEndLatitude.sqlType = numeric +haulingEndLongitude.sqlType = numeric +haulingStartLatitude.sqlType = numeric +haulingStartLongitude.sqlType = numeric +hooksComposition.reverseDbName = set +mitigationType.manyToManyTableName = mitigationtype_set +mitigationType.reverseDbName = set +section.orderBy = settingIdentifier +section.reverseDbName = set +section.unique = true +settingEndLatitude.sqlType = numeric +settingEndLongitude.sqlType = numeric +settingStartLatitude.sqlType = numeric +settingStartLongitude.sqlType = numeric +settingVesselSpeed.sqlType = numeric +shooterSpeed.sqlType = numeric +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tdr.reverseDbName = set + +[class fr.ird.observe.entities.longline.SizeMeasure] +size.sqlType = numeric + +[class fr.ird.observe.entities.longline.Tdr] +floatline1Length.sqlType = numeric +floatline2Length.sqlType = numeric + +[class fr.ird.observe.entities.longline.TdrRecord] +depth.sqlType = numeric +temperature.sqlType = numeric + +[class fr.ird.observe.entities.longline.TripLongline] +dbName = Trip +activityLongline.reverseDbName = trip +activityLongline.unique = true +gearUseFeaturesLongline.orderBy = topiaCreateDate +gearUseFeaturesLongline.reverseDbName = trip +gearUseFeaturesLongline.unique = true + +[class fr.ird.observe.entities.longline.WeightMeasure] +weight.sqlType = numeric + +[class fr.ird.observe.entities.referentiel.Gear] +gearCaracteristic.lazy = false + +[class fr.ird.observe.entities.referentiel.GearCaracteristic] +gearCaracteristicType.lazy = false + +[class fr.ird.observe.entities.referentiel.LengthWeightParameter] +ocean.lazy = false +ocean.notNull = true +sex.lazy = false +sex.notNull = true +species.lazy = false +species.notNull = true + +[class fr.ird.observe.entities.referentiel.Organism] +country.lazy = false + +[class fr.ird.observe.entities.referentiel.Program] +comment.hibernateAttributeType = text +organism.lazy = false + +[class fr.ird.observe.entities.referentiel.Species] +maxLength.sqlType = numeric +maxWeight.sqlType = numeric +minLength.sqlType = numeric +minWeight.sqlType = numeric +ocean.lazy = false +speciesGroup.lazy = false + +[class fr.ird.observe.entities.referentiel.SpeciesList] +species.lazy = false + +[class fr.ird.observe.entities.referentiel.Vessel] +capacity.sqlType = numeric +comment.hibernateAttributeType = text +flagCountry.lazy = false +length.sqlType = numeric +searchMaximum.sqlType = numeric +vesselSizeCategory.lazy = false +vesselType.lazy = false + +[class fr.ird.observe.entities.referentiel.longline.CatchFateLongline] +dbName = CatchFate + +[class fr.ird.observe.entities.referentiel.longline.VesselActivityLongline] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.VesselActivitySeine] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.WeightCategory] +species.lazy = false + +[class fr.ird.observe.entities.seine.ActivitySeine] +dbName = Activity +floatingObject.reverseDbName = activity +floatingObject.unique = true +latitude.sqlType = numeric +longitude.sqlType = numeric +observedSystem.manyToManyTableName = activity_observedSystem +observedSystem.reverseDbName = activity +observedSystem.unique = true +observedSystemDistance.sqlType = numeric +seaSurfaceTemperature.sqlType = numeric +setSeine.dbName = set +time.hibernateAttributeType.java.util.Date = time +vesselActivitySeine.dbName = vesselActivity +vesselSpeed.sqlType = numeric + +[class fr.ird.observe.entities.seine.FloatingObject] +transmittingBuoy.unique = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesSeine] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures + +[class fr.ird.observe.entities.seine.NonTargetCatch] +catchWeight.sqlType = numeric +meanLength.sqlType = numeric +meanWeight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetLength] +length.sqlType = numeric +sex.lazy = false +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetSample] +nonTargetLength.unique = true + +[class fr.ird.observe.entities.seine.Route] +activitySeine.orderBy = time +activitySeine.unique = true +date.hibernateAttributeType.java.util.Date = date +endLogValue.sqlType = numeric +startLogValue.sqlType = numeric + +[class fr.ird.observe.entities.seine.SchoolEstimate] +naturalIdMutable = true +setSeine.dbName = set +setSeine.naturalId = true +species.naturalId = true + +[class fr.ird.observe.entities.seine.SetSeine] +dbName = Set +currentSpeed.sqlType = numeric +nonTargetCatch.reverseDbName = set +nonTargetSample.reverseDbName = set +nonTargetSample.unique = true +schoolEstimate.reverseDbName = set +startTime.hibernateAttributeType.java.util.Date = time +targetCatch.reverseDbName = set +targetSample.reverseDbName = set +targetSample.unique = true + +[class fr.ird.observe.entities.seine.TargetCatch] +naturalIdMutable = true +catchWeight.sqlType = numeric +discarded.naturalId = true +reasonForDiscard.naturalId = true +reasonForDiscard.notNull = false +setSeine.dbName = set +setSeine.naturalId = true +weightCategory.naturalId = true +well.naturalId = true +well.notNull = false + +[class fr.ird.observe.entities.seine.TargetLength] +length.sqlType = numeric +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.TargetSample] +targetLength.unique = true + +[class fr.ird.observe.entities.seine.TripSeine] +dbName = Trip +endDate.hibernateAttributeType.java.util.Date = date +gearUseFeaturesSeine.orderBy = topiaCreateDate +gearUseFeaturesSeine.reverseDbName = trip +route.orderBy = date +route.reverseDbName = trip +route.unique = true +startDate.hibernateAttributeType.java.util.Date = date diff --git a/entities/src/main/xmi/observe.objectmodel-ext b/entities/src/main/xmi/observe.objectmodel-ext deleted file mode 100644 index c3ad97f..0000000 --- a/entities/src/main/xmi/observe.objectmodel-ext +++ /dev/null @@ -1,248 +0,0 @@ -[model] -attributeType.Boolean java.lang.Boolean -attributeType.Float java.lang.Float -attributeType.Integer java.lang.Integer -attributeType.Long java.lang.Long -attributeType.String java.lang.String -generateForeignKeyNames true -generateOperatorForDAOHelper true -generatePropertyChangeSupport true -indexForeignKeys true -notGenerateToString true -useEnumerationName false -version @observe.model.version@ - -[package] -fr.ird.observe.entities - dbSchema OBSERVE_COMMON -fr.ird.observe.entities.longline - dbSchema OBSERVE_LONGLINE -fr.ird.observe.entities.referentiel - dbSchema OBSERVE_COMMON -fr.ird.observe.entities.referentiel.longline - dbSchema OBSERVE_LONGLINE -fr.ird.observe.entities.referentiel.seine - dbSchema OBSERVE_SEINE -fr.ird.observe.entities.seine - dbSchema OBSERVE_SEINE - -[class] -fr.ird.observe.entities.CommentableEntity - comment.hibernateAttributeType text -fr.ird.observe.entities.ObserveEntity - lastUpdateDate.notNull true -fr.ird.observe.entities.longline.ActivityLongline - dbName Activity - encounter.reverseDbName activity - sensorUsed.reverseDbName activity - setLongline.dbName set - vesselActivityLongline.dbName vesselActivity - vesselActivityLongline.lazy false -fr.ird.observe.entities.longline.Basket - branchline.orderBy settingIdentifier - settingIdentifier.notNull true - branchline.unique -fr.ird.observe.entities.longline.Branchline - branchlineLength.sqlType numeric - catchLongline.dbName catch - hookSize.sqlType numeric - settingIdentifier.notNull true - snapWeight.sqlType numeric - swivelWeight.sqlType numeric - tracelineLength.sqlType numeric -fr.ird.observe.entities.longline.BranchlinesComposition - length.sqlType numeric -fr.ird.observe.entities.longline.CatchLongline - dbName Catch - beatDiameter.sqlType numeric - catchFateLongline.dbName catchFate - gonadeWeight.sqlType numeric - predator.manyToManyTableName catch_predator - predator.reverseDbName catch - sizeMeasure.reverseDbName catch - totalWeight.sqlType numeric - weightMeasure.reverseDbName catch -fr.ird.observe.entities.longline.Encounter - distance.sqlType numeric -fr.ird.observe.entities.longline.FloatlinesComposition - length.sqlType numeric -fr.ird.observe.entities.longline.GearUseFeaturesLongline - dbName GearUseFeatures - gearUseFeaturesMeasurement.orderBy topiaCreateDate - gearUseFeaturesMeasurement.reverseDbName gearUseFeatures - gearUseFeaturesMeasurement.unique -fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline - dbName GearUseFeaturesMeasurement - gearCaracteristic.notNull true -fr.ird.observe.entities.longline.HooksComposition - hookSize.sqlType numeric -fr.ird.observe.entities.longline.Section - basket.orderBy settingIdentifier - setLongline.dbName set - settingIdentifier.notNull true - basket.unique -fr.ird.observe.entities.longline.SetLongline - dbName Set - baitsComposition.reverseDbName set - branchlinesComposition.reverseDbName set - catchLongline.reverseDbName set - floatlinesComposition.reverseDbName set - haulingEndLatitude.sqlType numeric - haulingEndLongitude.sqlType numeric - haulingStartLatitude.sqlType numeric - haulingStartLongitude.sqlType numeric - hooksComposition.reverseDbName set - mitigationType.manyToManyTableName mitigationtype_set - mitigationType.reverseDbName set - section.orderBy settingIdentifier - section.reverseDbName set - settingEndLatitude.sqlType numeric - settingEndLongitude.sqlType numeric - settingStartLatitude.sqlType numeric - settingStartLongitude.sqlType numeric - settingVesselSpeed.sqlType numeric - shooterSpeed.sqlType numeric - snapWeight.sqlType numeric - swivelWeight.sqlType numeric - tdr.reverseDbName set - catchLongline.unique - section.unique -fr.ird.observe.entities.longline.SizeMeasure - size.sqlType numeric -fr.ird.observe.entities.longline.Tdr - floatline1Length.sqlType numeric - floatline2Length.sqlType numeric -fr.ird.observe.entities.longline.TdrRecord - depth.sqlType numeric - temperature.sqlType numeric -fr.ird.observe.entities.longline.TripLongline - dbName Trip - activityLongline.reverseDbName trip - gearUseFeaturesLongline.orderBy topiaCreateDate - gearUseFeaturesLongline.reverseDbName trip - activityLongline.unique - gearUseFeaturesLongline.unique -fr.ird.observe.entities.longline.WeightMeasure - weight.sqlType numeric -fr.ird.observe.entities.referentiel.Gear - gearCaracteristic.lazy false -fr.ird.observe.entities.referentiel.GearCaracteristic - gearCaracteristicType.lazy false -fr.ird.observe.entities.referentiel.LengthWeightParameter - ocean.lazy false - ocean.notNull true - sex.lazy false - sex.notNull true - species.lazy false - species.notNull true -fr.ird.observe.entities.referentiel.Organism - country.lazy false -fr.ird.observe.entities.referentiel.Program - comment.hibernateAttributeType text - organism.lazy false -fr.ird.observe.entities.referentiel.Species - maxLength.sqlType numeric - maxWeight.sqlType numeric - minLength.sqlType numeric - minWeight.sqlType numeric - ocean.lazy false - speciesGroup.lazy false -fr.ird.observe.entities.referentiel.SpeciesList - species.lazy false -fr.ird.observe.entities.referentiel.Vessel - capacity.sqlType numeric - comment.hibernateAttributeType text - flagCountry.lazy false - length.sqlType numeric - searchMaximum.sqlType numeric - vesselSizeCategory.lazy false - vesselType.lazy false -fr.ird.observe.entities.referentiel.longline.CatchFateLongline - dbName CatchFate -fr.ird.observe.entities.referentiel.longline.VesselActivityLongline - dbName VesselActivity -fr.ird.observe.entities.referentiel.seine.VesselActivitySeine - dbName VesselActivity -fr.ird.observe.entities.referentiel.seine.WeightCategory - species.lazy false -fr.ird.observe.entities.seine.ActivitySeine - dbName Activity - floatingObject.reverseDbName activity - latitude.sqlType numeric - longitude.sqlType numeric - observedSystem.manyToManyTableName activity_observedSystem - observedSystem.reverseDbName activity - observedSystemDistance.sqlType numeric - seaSurfaceTemperature.sqlType numeric - setSeine.dbName set - time.hibernateAttributeType.java.util.Date time - vesselActivitySeine.dbName vesselActivity - vesselSpeed.sqlType numeric - floatingObject.unique - observedSystem.unique -fr.ird.observe.entities.seine.FloatingObject - transmittingBuoy.unique -fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine - dbName GearUseFeaturesMeasurement - gearCaracteristic.notNull true -fr.ird.observe.entities.seine.GearUseFeaturesSeine - dbName GearUseFeatures - gearUseFeaturesMeasurement.orderBy topiaCreateDate - gearUseFeaturesMeasurement.reverseDbName gearUseFeatures -fr.ird.observe.entities.seine.NonTargetCatch - catchWeight.sqlType numeric - meanLength.sqlType numeric - meanWeight.sqlType numeric -fr.ird.observe.entities.seine.NonTargetLength - length.sqlType numeric - sex.lazy false - weight.sqlType numeric -fr.ird.observe.entities.seine.NonTargetSample - nonTargetLength.unique -fr.ird.observe.entities.seine.Route - activitySeine.orderBy time - date.hibernateAttributeType.java.util.Date date - endLogValue.sqlType numeric - startLogValue.sqlType numeric - activitySeine.unique -fr.ird.observe.entities.seine.SchoolEstimate - naturalIdMutable true - setSeine.dbName set - setSeine.naturalId true - species.naturalId true -fr.ird.observe.entities.seine.SetSeine - dbName Set - currentSpeed.sqlType numeric - nonTargetCatch.reverseDbName set - nonTargetSample.reverseDbName set - schoolEstimate.reverseDbName set - startTime.hibernateAttributeType.java.util.Date time - targetCatch.reverseDbName set - targetSample.reverseDbName set - nonTargetSample.unique - targetSample.unique -fr.ird.observe.entities.seine.TargetCatch - naturalIdMutable true - catchWeight.sqlType numeric - discarded.naturalId true - reasonForDiscard.naturalId true - reasonForDiscard.notNull false - setSeine.dbName set - setSeine.naturalId true - weightCategory.naturalId true - well.naturalId true - well.notNull false -fr.ird.observe.entities.seine.TargetLength - length.sqlType numeric - weight.sqlType numeric -fr.ird.observe.entities.seine.TargetSample - targetLength.unique -fr.ird.observe.entities.seine.TripSeine - dbName Trip - endDate.hibernateAttributeType.java.util.Date date - gearUseFeaturesSeine.orderBy topiaCreateDate - gearUseFeaturesSeine.reverseDbName trip - route.orderBy date - route.reverseDbName trip - startDate.hibernateAttributeType.java.util.Date date - route.unique diff --git a/services-dto/pom.xml b/services-dto/pom.xml index cb687fa..dbbf1e3 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -134,7 +134,7 @@ <failIfUnsafe>true</failIfUnsafe> <defaultPackage>fr.ird.observe.services.dto</defaultPackage> <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> - <modelExtensionFile>${project.basedir}/src/main/xmi/observe-services-dto.objectmodel-ext</modelExtensionFile> + <modelExtensionFile>${project.basedir}/src/main/xmi/observe-services-dto.ini</modelExtensionFile> </configuration> <goals> <goal>generate</goal> diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini new file mode 100644 index 0000000..72bea18 --- /dev/null +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -0,0 +1,268 @@ +[model] +java8 = true +simpleBeanWithNoInterfaceClassNameSuffix = Dto +simpleBeanWithNoInterfaceDefaultsClassNameSuffix = Dtos +simpleBeanWithNoInterfaceSuperClass = fr.ird.observe.services.dto.AbstractObserveDto +version = 5.0 + +[package fr.ird.observe.services.dto] +bean = true + +[class fr.ird.observe.services.dto.TripMap] +points.ordered = true +points.unique = true + +[class fr.ird.observe.services.dto.longline.ActivityLongline] +fpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto +setLongline.attributeGeneric = fr.ird.observe.services.dto.longline.SetLonglineDto +vesselActivityLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto + +[class fr.ird.observe.services.dto.longline.BaitsComposition] +baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto +baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto + +[class fr.ird.observe.services.dto.longline.Basket] +branchline.ordered = true +branchline.unique = true + +[class fr.ird.observe.services.dto.longline.Branchline] +baitHaulingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto +baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto +baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto +hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto +hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto +topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto +tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto + +[class fr.ird.observe.services.dto.longline.BranchlinesComposition] +topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto +tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto + +[class fr.ird.observe.services.dto.longline.CatchLongline] +basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto +branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto +catchFateLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto +catchHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto +discardHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto +hookPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookPositionDto +maturityStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MaturityStatusDto +predator.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto +sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto +speciesCatch.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +stomacFullness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.StomacFullnessDto + +[class fr.ird.observe.services.dto.longline.Encounter] +encounterType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.EncounterTypeDto +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.longline.FloatlinesComposition] +lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto + +[class fr.ird.observe.services.dto.longline.GearUseFeaturesLongline] +gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto +gearUseFeaturesMeasurement.ordered = true +gearUseFeaturesMeasurement.unique = true + +[class fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline] +gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto + +[class fr.ird.observe.services.dto.longline.HooksComposition] +hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto +hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto + +[class fr.ird.observe.services.dto.longline.Section] +basket.ordered = true +basket.unique = true + +[class fr.ird.observe.services.dto.longline.SensorUsed] +sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto +sensorDataFormat.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto +sensorType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorTypeDto + +[class fr.ird.observe.services.dto.longline.SetLongline] +lightsticksColor.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksColorDto +lightsticksType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto +lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto +settingShape.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SettingShapeDto + +[class fr.ird.observe.services.dto.longline.SetLonglineCatch] +baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto +branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto +sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto + +[class fr.ird.observe.services.dto.longline.SetLonglineDetailComposition] +section.ordered = true +section.unique = true + +[class fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition] +mitigationType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MitigationTypeDto + +[class fr.ird.observe.services.dto.longline.SetLonglineStub] +activityLongline.attributeGeneric = fr.ird.observe.services.dto.longline.ActivityLonglineDto +activityLongline.unique = true + +[class fr.ird.observe.services.dto.longline.SetLonglineTdr] +baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto +branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto +sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto + +[class fr.ird.observe.services.dto.longline.SizeMeasure] +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto + +[class fr.ird.observe.services.dto.longline.Tdr] +basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto +branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto +itemHorizontalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto +itemVerticalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto +section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto +sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.longline.TripLongline] +activityLongline.ordered = true +activityLongline.unique = true +captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto +landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto +observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto +program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto +tripType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.TripTypeDto +vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto + +[class fr.ird.observe.services.dto.longline.TripLonglineGearUse] +gearUseFeaturesLongline.ordered = true +gearUseFeaturesLongline.unique = true + +[class fr.ird.observe.services.dto.longline.WeightMeasure] +weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto + +[class fr.ird.observe.services.dto.referential.Gear] +gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic +gearCaracteristic.ordered = true + +[class fr.ird.observe.services.dto.referential.GearCaracteristic] +gearCaracteristicType.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicType + +[class fr.ird.observe.services.dto.referential.Harbour] +country.attributeGeneric = fr.ird.observe.services.dto.referential.Country + +[class fr.ird.observe.services.dto.referential.LengthWeightParameter] +ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean +sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex +species.attributeGeneric = fr.ird.observe.services.dto.referential.Species + +[class fr.ird.observe.services.dto.referential.Organism] +country.attributeGeneric = fr.ird.observe.services.dto.referential.Country + +[class fr.ird.observe.services.dto.referential.Person] +country.attributeGeneric = fr.ird.observe.services.dto.referential.Country + +[class fr.ird.observe.services.dto.referential.Program] +organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism + +[class fr.ird.observe.services.dto.referential.Species] +ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean +ocean.ordered = true +speciesGroup.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroup + +[class fr.ird.observe.services.dto.referential.SpeciesList] +species.attributeGeneric = fr.ird.observe.services.dto.referential.Species +species.ordered = true + +[class fr.ird.observe.services.dto.referential.Vessel] +flagCountry.attributeGeneric = fr.ird.observe.services.dto.referential.Country +vesselSizeCategory.attributeGeneric = fr.ird.observe.services.dto.referential.VesselSizeCategory +vesselType.attributeGeneric = fr.ird.observe.services.dto.referential.VesselType + +[class fr.ird.observe.services.dto.referential.seine.WeightCategory] +species.attributeGeneric = fr.ird.observe.services.dto.referential.Species + +[class fr.ird.observe.services.dto.seine.ActivitySeine] +currentFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto +detectionMode.attributeGeneric = fr.ird.observe.services.dto.referential.seine.DetectionModeDto +nextFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto +previousFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto +reasonForNoFishing.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto +setSeine.attributeGeneric = fr.ird.observe.services.dto.seine.SetSeineDto +surroundingActivity.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto +vesselActivitySeine.attributeGeneric = fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto +wind.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WindDto + +[class fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem] +observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto + +[class fr.ird.observe.services.dto.seine.FloatingObject] +objectFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectFateDto +objectOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectOperationDto +objectType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectTypeDto + +[class fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine] +gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto + +[class fr.ird.observe.services.dto.seine.GearUseFeaturesSeine] +gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto +gearUseFeaturesMeasurement.unique = true + +[class fr.ird.observe.services.dto.seine.NonTargetCatch] +reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto + +[class fr.ird.observe.services.dto.seine.NonTargetLength] +sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.seine.NonTargetSample] +nonTargetLength.unique = true + +[class fr.ird.observe.services.dto.seine.ObjectObservedSpecies] +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +speciesStatus.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto + +[class fr.ird.observe.services.dto.seine.ObjectSchoolEstimate] +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.seine.Route] +activitySeine.ordered = true +activitySeine.unique = true + +[class fr.ird.observe.services.dto.seine.SchoolEstimate] +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.seine.SetSeine] +reasonForNullSet.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto + +[class fr.ird.observe.services.dto.seine.TargetCatch] +reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WeightCategoryDto + +[class fr.ird.observe.services.dto.seine.TargetLength] +species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto + +[class fr.ird.observe.services.dto.seine.TargetSample] +targetLength.unique = true + +[class fr.ird.observe.services.dto.seine.TransmittingBuoy] +country.attributeGeneric = fr.ird.observe.services.dto.referential.CountryDto +transmittingBuoyOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto +transmittingBuoyType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto + +[class fr.ird.observe.services.dto.seine.TripSeine] +captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto +landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto +observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto +ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto +program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto +route.ordered = true +route.unique = true +vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto + +[class fr.ird.observe.services.dto.seine.TripSeineGearUse] +gearUseFeaturesSeine.ordered = true +gearUseFeaturesSeine.unique = true diff --git a/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext b/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext deleted file mode 100644 index 2632896..0000000 --- a/services-dto/src/main/xmi/observe-services-dto.objectmodel-ext +++ /dev/null @@ -1,216 +0,0 @@ -[model] -java8 true -simpleBeanWithNoInterfaceClassNameSuffix Dto -simpleBeanWithNoInterfaceDefaultsClassNameSuffix Dtos -simpleBeanWithNoInterfaceSuperClass fr.ird.observe.services.dto.AbstractObserveDto -version 5.0 - -[package] -fr.ird.observe.services.dto - bean - -[class] -fr.ird.observe.services.dto.TripMap - points.ordered - points.unique -fr.ird.observe.services.dto.longline.ActivityLongline - fpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto - setLongline.attributeGeneric fr.ird.observe.services.dto.longline.SetLonglineDto - vesselActivityLongline.attributeGeneric fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto -fr.ird.observe.services.dto.longline.BaitsComposition - baitSettingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto - baitType.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitTypeDto -fr.ird.observe.services.dto.longline.Basket - branchline.ordered - branchline.unique -fr.ird.observe.services.dto.longline.Branchline - baitHaulingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto - baitSettingStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto - baitType.attributeGeneric fr.ird.observe.services.dto.referential.longline.BaitTypeDto - hookSize.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookSizeDto - hookType.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookTypeDto - topType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto - tracelineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.BranchlinesComposition - topType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto - tracelineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.CatchLongline - basket.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto - branchline.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto - catchFateLongline.attributeGeneric fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto - catchHealthness.attributeGeneric fr.ird.observe.services.dto.referential.longline.HealthnessDto - discardHealthness.attributeGeneric fr.ird.observe.services.dto.referential.longline.HealthnessDto - hookPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookPositionDto - maturityStatus.attributeGeneric fr.ird.observe.services.dto.referential.longline.MaturityStatusDto - predator.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto - section.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto - sex.attributeGeneric fr.ird.observe.services.dto.referential.SexDto - speciesCatch.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto - stomacFullness.attributeGeneric fr.ird.observe.services.dto.referential.longline.StomacFullnessDto -fr.ird.observe.services.dto.longline.Encounter - encounterType.attributeGeneric fr.ird.observe.services.dto.referential.longline.EncounterTypeDto - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.FloatlinesComposition - lineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto -fr.ird.observe.services.dto.longline.GearUseFeaturesLongline - gear.attributeGeneric fr.ird.observe.services.dto.referential.GearDto - gearUseFeaturesMeasurement.ordered - gearUseFeaturesMeasurement.unique -fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline - gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicDto -fr.ird.observe.services.dto.longline.HooksComposition - hookSize.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookSizeDto - hookType.attributeGeneric fr.ird.observe.services.dto.referential.longline.HookTypeDto -fr.ird.observe.services.dto.longline.Section - basket.ordered - basket.unique -fr.ird.observe.services.dto.longline.SensorUsed - sensorBrand.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorBrandDto - sensorDataFormat.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto - sensorType.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorTypeDto -fr.ird.observe.services.dto.longline.SetLongline - lightsticksColor.attributeGeneric fr.ird.observe.services.dto.referential.longline.LightsticksColorDto - lightsticksType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto - lineType.attributeGeneric fr.ird.observe.services.dto.referential.longline.LineTypeDto - settingShape.attributeGeneric fr.ird.observe.services.dto.referential.longline.SettingShapeDto -fr.ird.observe.services.dto.longline.SetLonglineCatch - baskets.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto - branchlines.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto - sections.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto -fr.ird.observe.services.dto.longline.SetLonglineDetailComposition - section.ordered - section.unique -fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition - mitigationType.attributeGeneric fr.ird.observe.services.dto.referential.longline.MitigationTypeDto -fr.ird.observe.services.dto.longline.SetLonglineStub - activityLongline.attributeGeneric fr.ird.observe.services.dto.longline.ActivityLonglineDto - activityLongline.unique -fr.ird.observe.services.dto.longline.SetLonglineTdr - baskets.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto - branchlines.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto - sections.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto -fr.ird.observe.services.dto.longline.SizeMeasure - sizeMeasureType.attributeGeneric fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto -fr.ird.observe.services.dto.longline.Tdr - basket.attributeGeneric fr.ird.observe.services.dto.longline.BasketDto - branchline.attributeGeneric fr.ird.observe.services.dto.longline.BranchlineDto - itemHorizontalPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto - itemVerticalPosition.attributeGeneric fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto - section.attributeGeneric fr.ird.observe.services.dto.longline.SectionDto - sensorBrand.attributeGeneric fr.ird.observe.services.dto.referential.longline.SensorBrandDto - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.longline.TripLongline - captain.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - dataEntryOperator.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - departureHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto - landingHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto - observer.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - ocean.attributeGeneric fr.ird.observe.services.dto.referential.OceanDto - program.attributeGeneric fr.ird.observe.services.dto.referential.ProgramDto - tripType.attributeGeneric fr.ird.observe.services.dto.referential.longline.TripTypeDto - vessel.attributeGeneric fr.ird.observe.services.dto.referential.VesselDto - activityLongline.ordered - activityLongline.unique -fr.ird.observe.services.dto.longline.TripLonglineGearUse - gearUseFeaturesLongline.ordered - gearUseFeaturesLongline.unique -fr.ird.observe.services.dto.longline.WeightMeasure - weightMeasureType.attributeGeneric fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto -fr.ird.observe.services.dto.referential.Gear - gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristic - gearCaracteristic.ordered -fr.ird.observe.services.dto.referential.GearCaracteristic - gearCaracteristicType.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicType -fr.ird.observe.services.dto.referential.Harbour - country.attributeGeneric fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.LengthWeightParameter - ocean.attributeGeneric fr.ird.observe.services.dto.referential.Ocean - sex.attributeGeneric fr.ird.observe.services.dto.referential.Sex - species.attributeGeneric fr.ird.observe.services.dto.referential.Species -fr.ird.observe.services.dto.referential.Organism - country.attributeGeneric fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.Person - country.attributeGeneric fr.ird.observe.services.dto.referential.Country -fr.ird.observe.services.dto.referential.Program - organism.attributeGeneric fr.ird.observe.services.dto.referential.Organism -fr.ird.observe.services.dto.referential.Species - ocean.attributeGeneric fr.ird.observe.services.dto.referential.Ocean - speciesGroup.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesGroup - ocean.ordered -fr.ird.observe.services.dto.referential.SpeciesList - species.attributeGeneric fr.ird.observe.services.dto.referential.Species - species.ordered -fr.ird.observe.services.dto.referential.Vessel - flagCountry.attributeGeneric fr.ird.observe.services.dto.referential.Country - vesselSizeCategory.attributeGeneric fr.ird.observe.services.dto.referential.VesselSizeCategory - vesselType.attributeGeneric fr.ird.observe.services.dto.referential.VesselType -fr.ird.observe.services.dto.referential.seine.WeightCategory - species.attributeGeneric fr.ird.observe.services.dto.referential.Species -fr.ird.observe.services.dto.seine.ActivitySeine - currentFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto - detectionMode.attributeGeneric fr.ird.observe.services.dto.referential.seine.DetectionModeDto - nextFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto - previousFpaZone.attributeGeneric fr.ird.observe.services.dto.referential.FpaZoneDto - reasonForNoFishing.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto - setSeine.attributeGeneric fr.ird.observe.services.dto.seine.SetSeineDto - surroundingActivity.attributeGeneric fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto - vesselActivitySeine.attributeGeneric fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto - wind.attributeGeneric fr.ird.observe.services.dto.referential.seine.WindDto -fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem - observedSystem.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObservedSystemDto -fr.ird.observe.services.dto.seine.FloatingObject - objectFate.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectFateDto - objectOperation.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectOperationDto - objectType.attributeGeneric fr.ird.observe.services.dto.referential.seine.ObjectTypeDto -fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine - gearCaracteristic.attributeGeneric fr.ird.observe.services.dto.referential.GearCaracteristicDto -fr.ird.observe.services.dto.seine.GearUseFeaturesSeine - gear.attributeGeneric fr.ird.observe.services.dto.referential.GearDto - gearUseFeaturesMeasurement.unique -fr.ird.observe.services.dto.seine.NonTargetCatch - reasonForDiscard.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto - speciesFate.attributeGeneric fr.ird.observe.services.dto.referential.seine.SpeciesFateDto -fr.ird.observe.services.dto.seine.NonTargetLength - sex.attributeGeneric fr.ird.observe.services.dto.referential.SexDto - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.seine.NonTargetSample - nonTargetLength.unique -fr.ird.observe.services.dto.seine.ObjectObservedSpecies - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto - speciesStatus.attributeGeneric fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto -fr.ird.observe.services.dto.seine.ObjectSchoolEstimate - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.seine.Route - activitySeine.ordered - activitySeine.unique -fr.ird.observe.services.dto.seine.SchoolEstimate - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.seine.SetSeine - reasonForNullSet.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto -fr.ird.observe.services.dto.seine.TargetCatch - reasonForDiscard.attributeGeneric fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto - weightCategory.attributeGeneric fr.ird.observe.services.dto.referential.seine.WeightCategoryDto -fr.ird.observe.services.dto.seine.TargetLength - species.attributeGeneric fr.ird.observe.services.dto.referential.SpeciesDto -fr.ird.observe.services.dto.seine.TargetSample - targetLength.unique -fr.ird.observe.services.dto.seine.TransmittingBuoy - country.attributeGeneric fr.ird.observe.services.dto.referential.CountryDto - transmittingBuoyOperation.attributeGeneric fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto - transmittingBuoyType.attributeGeneric fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto -fr.ird.observe.services.dto.seine.TripSeine - captain.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - dataEntryOperator.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - departureHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto - landingHarbour.attributeGeneric fr.ird.observe.services.dto.referential.HarbourDto - observer.attributeGeneric fr.ird.observe.services.dto.referential.PersonDto - ocean.attributeGeneric fr.ird.observe.services.dto.referential.OceanDto - program.attributeGeneric fr.ird.observe.services.dto.referential.ProgramDto - vessel.attributeGeneric fr.ird.observe.services.dto.referential.VesselDto - route.ordered - route.unique -fr.ird.observe.services.dto.seine.TripSeineGearUse - gearUseFeaturesSeine.ordered - gearUseFeaturesSeine.unique -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm