This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository tutti. See http://git.codelutin.com/tutti.git commit dcc13a997a0089a6d9b4e1ce57dcef608e52d926 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 14:24:05 2015 +0100 FloatingObject est aussi une entité qui a une date de dernière mise à jour + tous les DataDto ont une date de dernière mise à jour --- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_5_0_1.java | 72 +++++++++++++++++++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 + .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 + observe-entities/src/main/xmi/observe-seine.zargo | Bin 84457 -> 85015 bytes .../xmi/observe-services-dto-common.properties | 17 +---- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42680 -> 43178 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 65747 -> 64456 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61382 -> 59797 bytes pom.xml | 2 +- 10 files changed, 81 insertions(+), 18 deletions(-) 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 9bbd769..2e66560 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 @@ -85,10 +85,12 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_5_0 = Versions.valueOf("5.0"); + public static final Version V_5_0_1 = Versions.valueOf("5.0.1"); + /** 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_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, V_5_0 + V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, V_5_0, V_5_0_1 }; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java new file mode 100644 index 0000000..96c9f5d --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java @@ -0,0 +1,72 @@ +package fr.ird.observe.entities.migration.versions; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +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.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 25/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_5_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_5_0_1, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + // Ajout des champs lastUpdate + // See https://forge.codelutin.com/issues/7470 + addScript("add_lastUpdate_field_2", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql new file mode 100644 index 0000000..94e0622 --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql @@ -0,0 +1,2 @@ +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql new file mode 100644 index 0000000..6564a44 --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql @@ -0,0 +1,2 @@ +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 32c9bc2..227cb93 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/observe-services-model/src/main/xmi/observe-services-dto-common.properties index 87eec39..1473813 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-common.properties @@ -28,7 +28,7 @@ model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto package.fr.ird.observe.services.dto.stereotype=bean fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.stereotype=ordered -fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered +#fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered fr.ird.observe.services.dto.referential.Species.attribute.ocean.stereotype=ordered fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.stereotype=ordered fr.ird.observe.services.dto.TripMap.attribute.points.stereotype=unique,ordered @@ -49,18 +49,3 @@ fr.ird.observe.services.dto.referential.Harbour.attribute.country.tagValue.simpl fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristic fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicType -#TODO Add also generic on class -#fr.ird.observe.services.dto.Form.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto -#fr.ird.observe.services.dto.Form.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D -#fr.ird.observe.services.dto.Form.attribute.labels.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D - -#fr.ird.observe.services.dto.Reference.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto -#fr.ird.observe.services.dto.Reference.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D - -#fr.ird.observe.services.dto.ReferentialReference.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto -#fr.ird.observe.services.dto.ReferentialReference.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D - -#fr.ird.observe.services.dto.ReferenceSet.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto -#fr.ird.observe.services.dto.ReferenceSet.attribute.referenctype.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D -#fr.ird.observe.services.dto.ReferenceSet.attribute.reference.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D - diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 3ab7a39..41fc634 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 546c74e..4a9cac5 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index f278524..c88f417 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/pom.xml b/pom.xml index 5aaaa95..c27ea3a 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>5.0</observe.model.version> + <observe.model.version>5.0.1</observe.model.version> </properties> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.