This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ad69dc5ff5f2d3a915c622ed355f7e61251504fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 09:21:37 2015 +0200 ajout de la persistence pour les équipements sur modèle LL + ajout d'un ordre sur les équipements d'une marée seine (refs #7013) --- .../test/resources/db/4.0-RC4/referentiel.sql.gz | Bin 0 -> 138256 bytes .../java/fr/ird/observe/entities/Entities.java | 56 ++++++++++++-------- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 58 +++++++++++++++++++++ .../main/resources/db/4.0-RC4/add-gear-data-H2.sql | 18 +++++++ .../main/resources/db/4.0-RC4/add-gear-data-PG.sql | 19 +++++++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 10 +++- .../src/main/xmi/observe-longline.zargo | Bin 93860 -> 96409 bytes .../src/main/xmi/observe-seine.properties | 4 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85905 bytes 11 files changed, 144 insertions(+), 27 deletions(-) diff --git a/observe-business/src/test/resources/db/4.0-RC4/referentiel.sql.gz b/observe-business/src/test/resources/db/4.0-RC4/referentiel.sql.gz new file mode 100644 index 0000000..c85d8e8 Binary files /dev/null and b/observe-business/src/test/resources/db/4.0-RC4/referentiel.sql.gz differ diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index e958c12..f69517c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -42,7 +42,8 @@ import java.util.Map; * @since 3.7 */ public class Entities { - public static final ObserveEntityEnum[] REFERENCE_ENTITIES = + + public static final ObserveEntityEnum[] REFERENCE_COMMON_ENTITIES = new ObserveEntityEnum[]{ ObserveEntityEnum.VesselSizeCategory, ObserveEntityEnum.Country, @@ -61,8 +62,11 @@ public class Entities { ObserveEntityEnum.Program, ObserveEntityEnum.GearCaracteristicType, ObserveEntityEnum.GearCaracteristic, - ObserveEntityEnum.Gear, + ObserveEntityEnum.Gear + }; + public static final ObserveEntityEnum[] REFERENCE_SEINE_ENTITIES = + new ObserveEntityEnum[]{ ObserveEntityEnum.VesselActivitySeine, ObserveEntityEnum.SurroundingActivity, ObserveEntityEnum.ReasonForNullSet, @@ -78,8 +82,11 @@ public class Entities { ObserveEntityEnum.ObservedSystem, ObserveEntityEnum.TransmittingBuoyType, ObserveEntityEnum.ObjectType, - ObserveEntityEnum.Wind, + ObserveEntityEnum.Wind + }; + public static final ObserveEntityEnum[] REFERENCE_LONGLINE_ENTITIES = + new ObserveEntityEnum[]{ ObserveEntityEnum.BaitHaulingStatus, ObserveEntityEnum.BaitSettingStatus, ObserveEntityEnum.BaitType, @@ -107,7 +114,16 @@ public class Entities { ObserveEntityEnum.WeightMeasureType }; - public static final ObserveEntityEnum[] REFERENCE_COMMON_ENTITIES = + public static final List<ObserveEntityEnum> REFERENCE_COMMON_ENTITIES_LIST = + Collections.unmodifiableList(Arrays.asList(REFERENCE_COMMON_ENTITIES)); + + public static final List<ObserveEntityEnum> REFERENCE_SEINE_ENTITIES_LIST = + Collections.unmodifiableList(Arrays.asList(REFERENCE_SEINE_ENTITIES)); + + public static final List<ObserveEntityEnum> REFERENCE_LONGLINE_ENTITIES_LIST = + Collections.unmodifiableList(Arrays.asList(REFERENCE_LONGLINE_ENTITIES)); + + public static final ObserveEntityEnum[] REFERENCE_ENTITIES = new ObserveEntityEnum[]{ ObserveEntityEnum.VesselSizeCategory, ObserveEntityEnum.Country, @@ -126,14 +142,8 @@ public class Entities { ObserveEntityEnum.Program, ObserveEntityEnum.GearCaracteristicType, ObserveEntityEnum.GearCaracteristic, - ObserveEntityEnum.Gear - }; - - public static final List<ObserveEntityEnum> REFERENCE_COMMON_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(REFERENCE_COMMON_ENTITIES)); + ObserveEntityEnum.Gear, - public static final ObserveEntityEnum[] REFERENCE_SEINE_ENTITIES = - new ObserveEntityEnum[]{ ObserveEntityEnum.VesselActivitySeine, ObserveEntityEnum.SurroundingActivity, ObserveEntityEnum.ReasonForNullSet, @@ -149,14 +159,8 @@ public class Entities { ObserveEntityEnum.ObservedSystem, ObserveEntityEnum.TransmittingBuoyType, ObserveEntityEnum.ObjectType, - ObserveEntityEnum.Wind - }; - - public static final List<ObserveEntityEnum> REFERENCE_SEINE_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(REFERENCE_SEINE_ENTITIES)); + ObserveEntityEnum.Wind, - public static final ObserveEntityEnum[] REFERENCE_LONGLINE_ENTITIES = - new ObserveEntityEnum[]{ ObserveEntityEnum.BaitHaulingStatus, ObserveEntityEnum.BaitSettingStatus, ObserveEntityEnum.BaitType, @@ -184,8 +188,8 @@ public class Entities { ObserveEntityEnum.WeightMeasureType }; - public static final List<ObserveEntityEnum> REFERENCE_LONGLINE_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(REFERENCE_LONGLINE_ENTITIES)); + public static final List<ObserveEntityEnum> REFERENCE_ENTITIES_LIST = + Collections.unmodifiableList(Arrays.asList(REFERENCE_ENTITIES)); public static final ObserveEntityEnum[] DATA_ENTITIES = new ObserveEntityEnum[]{ @@ -203,6 +207,8 @@ public class Entities { ObserveEntityEnum.FloatingObject, ObserveEntityEnum.ActivitySeine, ObserveEntityEnum.Route, + ObserveEntityEnum.GearUseFeaturesMeasurementSeine, + ObserveEntityEnum.GearUseFeaturesSeine, ObserveEntityEnum.TripSeine, ObserveEntityEnum.HooksComposition, @@ -221,6 +227,8 @@ public class Entities { ObserveEntityEnum.SensorUsed, ObserveEntityEnum.ActivityLongline, ObserveEntityEnum.TdrRecord, + ObserveEntityEnum.GearUseFeaturesMeasurementLongline, + ObserveEntityEnum.GearUseFeaturesLongline, ObserveEntityEnum.TripLongline }; @@ -253,6 +261,8 @@ public class Entities { ObserveEntityEnum.FloatingObject, ObserveEntityEnum.ActivitySeine, ObserveEntityEnum.Route, + ObserveEntityEnum.GearUseFeaturesMeasurementSeine, + ObserveEntityEnum.GearUseFeaturesSeine, ObserveEntityEnum.TripSeine }; @@ -274,6 +284,8 @@ public class Entities { ObserveEntityEnum.SensorUsed, ObserveEntityEnum.ActivityLongline, ObserveEntityEnum.TdrRecord, + ObserveEntityEnum.GearUseFeaturesMeasurementLongline, + ObserveEntityEnum.GearUseFeaturesLongline, ObserveEntityEnum.TripLongline }; @@ -290,7 +302,7 @@ public class Entities { return false; } klass = ObserveDAOHelper.getContractClass((Class<? extends TopiaEntity>) klass); - for (ObserveEntityEnum c : REFERENCE_ENTITIES) { + for (ObserveEntityEnum c : REFERENCE_ENTITIES_LIST) { if (c.getContract().equals(klass)) { return true; } @@ -303,7 +315,7 @@ public class Entities { * @return {@code true} si c'est une classe du référentiel. */ public static boolean isReferentielClass(ObserveEntityEnum constant) { - for (ObserveEntityEnum c : REFERENCE_ENTITIES) { + for (ObserveEntityEnum c : REFERENCE_ENTITIES_LIST) { if (c.equals(constant)) { return true; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 4cfa18c..da55de9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -79,9 +79,11 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_RC3 = Versions.valueOf("4.0-RC3"); + public static final Version V_4_0_RC4 = Versions.valueOf("4.0-RC4"); + /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ - V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3 + V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3, V_4_0_RC4 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java new file mode 100644 index 0000000..48dcec8 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java @@ -0,0 +1,58 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.util.List; + +/** + * Created on 4/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0-RC4 + */ +public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrationCallBack { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); + + public DataSourceMigrationForVersion_4_0_RC4(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_0_RC4, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + + // See https://forge.codelutin.com/issues/7013 + addScript("add-gear-data", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC4 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC4 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + + +} \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-H2.sql b/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-H2.sql new file mode 100644 index 0000000..04e6a75 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-H2.sql @@ -0,0 +1,18 @@ +-- +-- GearUseFeatures Definition +-- +CREATE TABLE OBSERVE_LONGLINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255), gear VARCHAR(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_LONGLINE.TRIP(topiaid); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURES_TRIP ON OBSERVE_LONGLINE.GEARUSEFEATURES(trip); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURES_GEAR ON OBSERVE_LONGLINE.GEARUSEFEATURES(gear); +-- +-- GearUseFeaturesMeasurement Definition +-- +CREATE TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic VARCHAR(255) NOT NULL, gearUseFeatures VARCHAR(255), measurementValue VARCHAR(255) NOT NULL); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_LONGLINE.GEARUSEFEATURES(topiaid); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(gearCaracteristic); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(gearUseFeatures); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-PG.sql b/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-PG.sql new file mode 100644 index 0000000..76aa9a3 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-PG.sql @@ -0,0 +1,19 @@ +-- +-- GearUseFeatures Definition +-- +CREATE TABLE OBSERVE_LONGLINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255), gear character varying(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_LONGLINE.TRIP(topiaid); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURES_TRIP ON OBSERVE_LONGLINE.GEARUSEFEATURES(trip); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURES_GEAR ON OBSERVE_LONGLINE.GEARUSEFEATURES(gear); +-- +-- GearUseFeaturesMeasurement Definition +-- +CREATE TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic character varying(255) NOT NULL, gearUseFeatures character varying(255), measurementValue character varying(255) NOT NULL); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_LONGLINE.GEARUSEFEATURES(topiaid); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(gearCaracteristic); +CREATE INDEX IDX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(gearUseFeatures); + diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index ee471f3..47d09fb 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC3 +model.tagvalue.version=4.0-RC4 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 526e683..14871b1 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC3 +model.tagvalue.version=4.0-RC4 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true @@ -69,6 +69,12 @@ fr.ird.observe.entities.longline.Section.attribute.setLongline.tagvalue.dbName=s fr.ird.observe.entities.longline.TripLongline.class.tagvalue.dbName=Trip fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.tagvalue.reverseDbName=trip +fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.tagvalue.reverseDbName=trip + +fr.ird.observe.entities.longline.GearUseFeaturesLongline.class.tagvalue.dbName=GearUseFeatures +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.reverseDbName=gearUseFeatures + +fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.class.tagvalue.dbName=GearUseFeaturesMeasurement ############################################################################### ### Champ Numeric (utilisation du type sql numeric) ########################### @@ -129,6 +135,8 @@ fr.ird.observe.entities.longline.ActivityLongline.attribute.vesselActivityLongli fr.ird.observe.entities.longline.SetLongline.attribute.section.tagvalue.orderBy=settingIdentifier fr.ird.observe.entities.longline.Section.attribute.basket.tagvalue.orderBy=settingIdentifier fr.ird.observe.entities.longline.Basket.attribute.branchline.tagvalue.orderBy=settingIdentifier +fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.tagvalue.orderBy=topiaCreateDate +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate ############################################################################### ### NotNull ################################################################### diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 1158f69..114c920 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 7777689..56c5db0 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -20,7 +20,7 @@ # #L% ### -model.tagvalue.version=4.0-RC3 +model.tagvalue.version=4.0-RC4 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true @@ -103,7 +103,6 @@ fr.ird.observe.entities.seine.SetSeine.attribute.startTime.tagvalue.type=time fr.ird.observe.entities.seine.NonTargetLength.attribute.sex.tagvalue.lazy=false fr.ird.observe.entities.referentiel.seine.WeightCategory.attribute.species.tagvalue.lazy=false -fr.ird.observe.entities.referentiel.GearCaracteristic.attribute.gearCaracteristicType.tagvalue.lazy=false ############################################################################### ### Natural Ids ############################################################### @@ -128,6 +127,7 @@ fr.ird.observe.entities.seine.SchoolEstimate.attribute.species.tagvalue.naturalI ############################################################################### ### OrderBy ################################################################### ############################################################################### +fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.orderBy=topiaCreateDate fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate ############################################################################### diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index ef9f846..9116a17 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.