- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] fix a test after updating tests db
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8c49cf6c by tchemit at 2019-01-04T14:30:39Z fix a test after updating tests db - - - - - 1 changed file: - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java Changes: ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -281,7 +281,7 @@ public class ObserveFixtures { .put("observe_seine.nontargetcatchreleasestatus", 6L) .put("observe_seine.nontargetcatchreleasingtime", 4L) .put("observe_seine.objectoperation", 10L) - .put("observe_seine.objectmaterial", 79L) + .put("observe_seine.objectmaterial", 80L) .put("observe_seine.objectmaterialtype", 4L) .put("observe_seine.observedsystem", 24L) .put("observe_seine.reasonfordiscard", 5L) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8c49cf6c05d12fd369d098336cd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8c49cf6c05d12fd369d098336cd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements...
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5e3208a9 by tchemit at 2019-01-04T14:44:22Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - Closes #1130 - - - - - 8bec0e21 by tchemit at 2019-01-04T14:44:25Z Fix at last tests database generation + try to update a little longline test db :( - - - - - 59d9e1a2 by tchemit at 2019-01-04T14:44:25Z There is no more selectable column on ObjectMaterial - - - - - 11bc6fe5 by tchemit at 2019-01-04T14:44:25Z Now can really use v7.0 as migration starts + update 7.2 db tests - - - - - 29 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchLonglineLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/resources/db/migration/7.2/03_create_ps_observation_schema-common.sql - + persistence/src/main/resources/db/migration/7.2/12_update_ll_speciesList-common.sql - + persistence/src/main/resources/db/migration/7.2/13_fill_ll_speciesList-common.sql - services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java - test/src/main/filtered-resources/observetest.properties - test/src/main/resources/db/6.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/empty_h2.sql.gz - test/src/main/resources/db/7.0/empty_pg.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz - test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - test/src/main/resources/db/7.2/empty_h2.sql.gz - test/src/main/resources/db/7.2/empty_pg.sql.gz - test/src/main/resources/db/7.2/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/validate-service-referential.properties Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -381,9 +381,9 @@ key = speciesList.longline.obs.encounter type = string defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.4" -[option speciesListLonglineObsDepredatorId] -description = observe.config.speciesList.longline.obs.depredator -key = speciesList.longline.obs.tdr +[option speciesListLonglineDepredatorId] +description = observe.config.speciesList.longline.depredator +key = speciesList.longline.depredator type = string defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.5" @@ -391,19 +391,19 @@ defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.5" description = observe.config.speciesList.longline.logbook.catch key = speciesList.longline.logbook.catch type = string -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3" +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8" [option speciesListLonglineLogbookLandingId] description = observe.config.speciesList.longline.logbook.landing key = speciesList.longline.logbook.landing type = string -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3" +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8" [option speciesListLonglineLogbookSampleId] description = observe.config.speciesList.longline.logbook.sample key = speciesList.longline.logbook.sample type = string -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3" +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8" [option speciesListLonglineTripId] description = observe.config.speciesList.longline.trip ===================================== client-configuration/src/main/i18n/getters/config.getter ===================================== @@ -71,11 +71,11 @@ observe.config.serverDataSourceConfigurations.description observe.config.showMigrationProgression observe.config.showMigrationSql observe.config.showSql +observe.config.speciesList.longline.depredator observe.config.speciesList.longline.logbook.catch observe.config.speciesList.longline.logbook.landing observe.config.speciesList.longline.logbook.sample observe.config.speciesList.longline.obs.catch -observe.config.speciesList.longline.obs.depredator observe.config.speciesList.longline.obs.encounter observe.config.speciesList.longline.trip observe.config.speciesList.seine.nonTargetCatch ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -108,11 +108,12 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(), }; - //FIXME + //FIXME PROTECTED-ID private final ImmutableSet<String> longlineVesselTypeIds = ImmutableSet.copyOf( Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", "'fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869", "'fr.ird.referential.common.VesselType#1239832686137#0.1")); + //FIXME PROTECTED-ID private final ImmutableSet<String> seineVesselTypeIds = ImmutableSet.copyOf( Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", "'fr.ird.referential.common.VesselType#1239832675735#0.307197212385357", ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java ===================================== @@ -236,8 +236,8 @@ public class ShowConfigAction extends MenuActionSupport { ObserveUICallback.ui.name()); helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_TRIP_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_DEPREDATOR_ID); helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_CATCH_ID); - helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_DEPREDATOR_ID); helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_ENCOUNTER_ID); helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_CATCH_ID); helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_LANDING_ID); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchLonglineLogbookUIHandler.java ===================================== @@ -129,7 +129,7 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); }); referenceCache.addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); }); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -36,6 +36,7 @@ import fr.ird.observe.client.ui.tree.navigation.NavigationTree; import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.dto.data.ll.common.TripLonglineReference; import fr.ird.observe.dto.data.ll.observation.BasketObsReference; import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto; import fr.ird.observe.dto.data.ll.observation.BranchlineObsHelper; @@ -45,7 +46,6 @@ import fr.ird.observe.dto.data.ll.observation.SectionObsReference; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchDto; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchHelper; import fr.ird.observe.dto.data.ll.observation.SizeMeasureObsDto; -import fr.ird.observe.dto.data.ll.common.TripLonglineReference; import fr.ird.observe.dto.data.ll.observation.WeightMeasureObsDto; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; @@ -170,7 +170,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline }); referenceCache.addReferentialFilter(CatchLonglineObsDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); }); ===================================== dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java ===================================== @@ -37,6 +37,11 @@ public interface SpeciesListConfiguration { void setSpeciesListLonglineTripId(String speciesListLonglineTripId); + String getSpeciesListLonglineDepredatorId(); + + void setSpeciesListLonglineDepredatorId(String speciesListLonglineDepredatorId); + + // // Longline - Obs // @@ -45,10 +50,6 @@ public interface SpeciesListConfiguration { void setSpeciesListLonglineObsCatchId(String speciesListLonglineObsCatchId); - String getSpeciesListLonglineObsDepredatorId(); - - void setSpeciesListLonglineObsDepredatorId(String speciesListLonglineObsDepredatorId); - String getSpeciesListLonglineObsEncounterId(); void setSpeciesListLonglineObsEncounterId(String speciesListLonglineObsEncounterId); ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=Server data source con observe.config.showMigrationProgression=Show migration progression observe.config.showMigrationSql=Show migration sql queries observe.config.showSql=Show sql +observe.config.speciesList.longline.depredator=Species for observation depredator observe.config.speciesList.longline.logbook.catch=Species for logbook catches observe.config.speciesList.longline.logbook.landing=Species for logbook landings observe.config.speciesList.longline.logbook.sample=Species for logbook samples observe.config.speciesList.longline.obs.catch=Species for observation catches -observe.config.speciesList.longline.obs.depredator=Species for observation depredator observe.config.speciesList.longline.obs.encounter=Species for encounters observe.config.speciesList.longline.trip=Species for trip longline observe.config.speciesList.seine.nonTargetCatch=Species for non target catches ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=Conexiones a servidore observe.config.showMigrationProgression=Mostrar los logs de actualización de una base de datos observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos observe.config.showSql=Mostrar en todas las consultas sql ejecutadas +observe.config.speciesList.longline.depredator=Espèces pour les déprédations observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook observe.config.speciesList.longline.obs.catch=Especies para las capturas - TDR -observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations observe.config.speciesList.longline.obs.encounter=Especies para los encuentros observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre observe.config.speciesList.seine.nonTargetCatch=Especies para las capturas que no forman parte del objetivo ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=connexions à des serv observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées +observe.config.speciesList.longline.depredator=Espèces pour les déprédations observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook observe.config.speciesList.longline.obs.catch=Espèces pour les captures observation -observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations observe.config.speciesList.longline.obs.encounter=Espèces pour les rencontre observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java ===================================== @@ -67,6 +67,21 @@ public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource executor.addScript("09", "change_vessel_fleetCountry_field"); executor.addScript("10", "add_home_id"); executor.addScript("11", "alter_ll_logbook_activity"); + Boolean withIds = executor.findSingleResult(new TopiaSqlQuery<Boolean>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT COUNT (*) FROM observe_common.species"); + } + + @Override + public Boolean prepareResult(ResultSet resultSet) throws SQLException { + return resultSet.getInt(1) > 0; + } + }); + if (withIds) { + executor.addScript("12", "update_ll_speciesList"); + executor.addScript("13", "fill_ll_speciesList"); + } } private void fixPostgisTriggers(MigrationVersionResourceExecutor executor) { ===================================== persistence/src/main/resources/db/migration/7.2/03_create_ps_observation_schema-common.sql ===================================== @@ -27,7 +27,35 @@ CREATE TABLE ps_observation.nontargetcatchreleaseconformity(topiaid VARCHAR(255) CREATE TABLE ps_observation.nontargetcatchreleasestatus(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetcatchreleasestatus PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); CREATE TABLE ps_observation.nontargetcatchreleasingtime(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetcatchreleasingtime PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); CREATE TABLE ps_observation.objectmaterialtype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_object_material_type PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); -CREATE TABLE ps_observation.objectmaterial(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_object_material PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacycode VARCHAR(1025), standardcode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), objectmaterialtype VARCHAR(255), biodegradable BOOLEAN, nonentangling BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), selectable BOOLEAN, childrenmultiselectable BOOLEAN, childselectionmandatory BOOLEAN, validation VARCHAR(255)); +CREATE TABLE ps_observation.objectmaterial +( + topiaid VARCHAR(255) NOT NULL + CONSTRAINT pk_ps_observation_object_material PRIMARY KEY, + topiaversion BIGINT NOT NULL, + topiacreatedate DATE, + lastupdatedate TIMESTAMP NOT NULL, + code VARCHAR(255) NOT NULL, + legacycode VARCHAR(1025), + standardcode VARCHAR(255), + parent VARCHAR(255), + status INTEGER DEFAULT 1, + needcomment BOOLEAN DEFAULT FALSE, + uri VARCHAR(255), + objectmaterialtype VARCHAR(255), + biodegradable BOOLEAN, + nonentangling BOOLEAN, + label1 VARCHAR(255), + label2 VARCHAR(255), + label3 VARCHAR(255), + label4 VARCHAR(255), + label5 VARCHAR(255), + label6 VARCHAR(255), + label7 VARCHAR(255), + label8 VARCHAR(255), + childrenmultiselectable BOOLEAN, + childselectionmandatory BOOLEAN, + validation VARCHAR(255) +); CREATE TABLE ps_observation.objectoperation(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_objectoperation PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, whenarriving BOOLEAN DEFAULT TRUE, whenleaving BOOLEAN DEFAULT TRUE); CREATE TABLE ps_observation.observedsystem(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_observedsystem PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), needcomment BOOLEAN, uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), schooltype INTEGER, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); CREATE TABLE ps_observation.reasonfordiscard(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_reasonfordiscard PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), needcomment BOOLEAN, uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); @@ -60,7 +88,36 @@ INSERT INTO ps_observation.nontargetcatchreleaseconformity(topiaid, topiaversion INSERT INTO ps_observation.nontargetcatchreleasestatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_seine.nontargetcatchreleasestatus; INSERT INTO ps_observation.nontargetcatchreleasingtime(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_seine.nontargetcatchreleasingtime; INSERT INTO ps_observation.objectmaterialtype(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_seine.objectmaterialtype; -INSERT INTO ps_observation.objectmaterial(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation FROM observe_seine.objectmaterial; +INSERT INTO ps_observation.objectmaterial(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, + standardcode, parent, status, needcomment, uri, objectmaterialtype, + biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, + label7, label8, childrenmultiselectable, childselectionmandatory, validation) +SELECT topiaid, + topiaversion, + topiacreatedate, + lastupdatedate, + code, + legacycode, + standardcode, + parent, + status, + needcomment, + uri, + objectmaterialtype, + biodegradable, + nonentangling, + label1, + label2, + label3, + label4, + label5, + label6, + label7, + label8, + childrenmultiselectable, + childselectionmandatory, + validation +FROM observe_seine.objectmaterial; INSERT INTO ps_observation.objectoperation(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, whenarriving, whenleaving) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, whenarriving, whenleaving FROM observe_seine.objectoperation; INSERT INTO ps_observation.observedsystem(topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, lastupdatedate FROM observe_seine.observedsystem; INSERT INTO ps_observation.reasonfordiscard(topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, lastupdatedate FROM observe_seine.reasonfordiscard; ===================================== persistence/src/main/resources/db/migration/7.2/12_update_ll_speciesList-common.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- 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% +--- + +UPDATE common.speciesList SET label1='LL Observation - Catch species', label2='LL Observation - Espèces capturées', label3='LL Observation - Catch species' WHERE topiaId='fr.ird.referential.common.SpeciesList#1433499395455#0.684944737469777'; +UPDATE common.speciesList SET code='6' WHERE topiaId='fr.ird.referential.common.SpeciesList#1239832675370#0.7'; +INSERT INTO common.speciesList (topiaid, topiaversion, topiacreatedate, code, status, label1, label2, label3, needcomment, lastupdatedate) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 0, '2019-01-04', '7', 1, 'LL Logbook - Catch species', 'LL Logbook - Espèces capturées', 'LL Logbook - Catch species', false, '2019-01-04 00:00:00.0'); \ No newline at end of file ===================================== persistence/src/main/resources/db/migration/7.2/13_fill_ll_speciesList-common.sql ===================================== @@ -0,0 +1,175 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- 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% +--- + +-- FIXME A remplacer par la bonne liste +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258597#0.544545796932653'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1265910963905#0.274742122896921'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684519#0.10519861144934894'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684971#0.8622121191938249'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683748#0.9215143239720961'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1339687473179#0.0836471277685924'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683737#0.9054429876194163'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1308747162000#0.64970548903892'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345248'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345247'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684813#0.23032822909041595'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684819#0.5710822650999473'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345369'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685233#0.9753172599708958'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685113#0.7014499115802707'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685119#0.05669776907577062'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685240#0.16727135240325364'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345371'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684983#0.38453892687871216'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683725#0.39445809291491807'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345601'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684959#0.8280432216962142'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684940#0.3941475292396889'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684953#0.5908437547687754'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685039#0.9885160092180597'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685052#0.41637903112663477'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685107#0.34538015098950847'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684201#0.30554150296793947'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685094#0.8862082966884622'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684861#0.36396067375732244'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684885#0.5770224986830752'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684795#0.6053463019344153'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684946#0.29129778706560716'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684771#0.9223458397529432'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684904#0.7999183854146987'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684928#0.20119509838828453'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684531#0.01962657179799221'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684831#0.9665297005737801'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684549#0.4997270804575126'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684837#0.36870634574294836'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684688#0.8193074495746601'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684327#0.8415482323514992'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684892#0.9272035028442585'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684644#0.6230088204735412'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684807#0.8492371601281514'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684537#0.2397229787936519'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684638#0.8261519152704289'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684332#0.5394989374753841'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684296#0.3383076607094946'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683985#0.48335145439788996'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683991#0.18251172983518738'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683731#0.3892121873590658'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683791#0.20975568563021063'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683785#0.49501050869628815'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683774#0.3664090332253188'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683867#0.5251675316716491'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683996#0.008204938561974351'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683883#0.6583610159371419'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1383399210341#0.7324960169421437'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683921#0.2103636331742268'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499239128#0.665396141353995'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499241880#0.899191892240196'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499238727#0.452269877539948'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499239536#0.330866874894127'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246494#0.0585299937520176'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499248852#0.334059100132436'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256581#0.978984408080578'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256876#0.726763370446861'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244116#0.263819849817082'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249696#0.920608930755407'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246929#0.383034072816372'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243755#0.461645959643647'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244489#0.986759799998254'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244884#0.506351491902024'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499247475#0.928730154642835'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249131#0.665475294925272'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499267203#0.701659282203764'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499257194#0.127699023578316'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258033#0.552436746191233'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266257#0.0992674820590764'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260045#0.0712781408801675'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499257718#0.396484187571332'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499259266#0.48745713243261'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499259647#0.824619286460802'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499248540#0.732951018260792'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243058#0.63963223923929'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499245237#0.58819441543892'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499245598#0.165684843435884'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246005#0.946029571583495'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499252420#0.0952591823879629'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256301#0.958709618076682'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499240431#0.633104688022286'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499242297#0.261897447984666'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499242684#0.74281100789085'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249440#0.0824802028946579'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249945#0.289872533408925'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250234#0.266232012072578'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250533#0.295620504068211'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250836#0.588542830199003'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499267485#0.782962923869491'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499252053#0.543697426561266'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499253401#0.815398659789935'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499253837#0.98946483922191'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260412#0.782278389902785'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260828#0.285295381676406'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499261248#0.86915645818226'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499261722#0.202710725832731'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499262792#0.345151128945872'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263165#0.897860581753775'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263589#0.698522278340533'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263954#0.282807369716465'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499264353#0.645280970726162'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499264730#0.786850868025795'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265493#0.594366625649855'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265902#0.337987961713225'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266610#0.696541526820511'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266912#0.871948149055243'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441009702588#0.40917879257817036'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441010206207#0.6596599567069653'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441009299213#0.02413154397693007'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684085#0.7869093021514663'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684036#0.959050780883495'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683888#0.6223394488789843'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684213#0.644772725177114'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684157#0.9835191073325458'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685477#0.2673009297087321'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685474#0.975344121171992'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258308#0.886130484519526'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265113#0.891799515346065'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1452608644320#0.2661386360079536'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1437472180346#0.0669468408450484'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683835#0.03404189793534684'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683841#0.25560065674558863'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683846#0.9864285434180587'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1459342059807#0.7580852539552073'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1462887416751#0.8043157184784889'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684989#0.8258827419292817'); +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1478087930936#0.6045894606694016'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684041#0.017218753201439285'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345249'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684279#0.3790726155671563'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441287921299#0.016754076421811148'); +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1487077692368#0.2801571805347951'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684694#0.11252990999137946'); +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1487325303004#0.4857736650819311'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684843#0.7390723511555113'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684207#0.6586381203701787'); +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1504021804594#0.14974523666399353'); +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243755#0.461645959643647'); \ No newline at end of file ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java ===================================== @@ -38,12 +38,15 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.script.SqlScriptReader; +import org.nuiton.topia.persistence.script.SqlScriptWriter; import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; /** * Created on 25/12/15. @@ -154,7 +157,18 @@ public class MigrateTestsDatabases extends ServiceLocalTestSupport { } Files.createDirectories(scriptFile.toPath().getParent()); - dump.copy(scriptFile.toPath()); + copy(dump, scriptFile.toPath()); + + } + + public void copy(TopiaSqlScript reader, Path target) throws IOException { + try (SqlScriptWriter scriptWriter = SqlScriptWriter.builder(target).gzip().keepCommentLine().keepEmptyLine().build()) { + try (SqlScriptReader scriptReader = reader.getLocation()) { + for (String statement : scriptReader) { + scriptWriter.writeSql(statement); + } + } + } } } ===================================== test/src/main/filtered-resources/observetest.properties ===================================== @@ -22,7 +22,7 @@ observetest.devMode=${devMode} observetest.build.version=${project.version} observetest.model.version=${observe.model.version} -observetest.previous.model.version=6.0 +observetest.previous.model.version=7.0 observetest.first.model.version=5.0 observetest.first.model.for.ref.synchro.version=5.0 observetest.h2.login=sa ===================================== test/src/main/resources/db/6.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_h2.sql.gz and b/test/src/main/resources/db/7.0/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_pg.sql.gz and b/test/src/main/resources/db/7.0/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/referentiel.sql.gz and b/test/src/main/resources/db/7.0/referentiel.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_h2.sql.gz and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_pg.sql.gz and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/referentiel.sql.gz and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -41,11 +41,11 @@ common.shipowner=27 common.sex=5 common.sizemeasuretype=16 common.species=285 -common.species_specieslist=401 +common.species_specieslist=549 common.speciesgroup=11 common.speciesgroupreleasemode=9 common.speciesgroup_speciesgroupreleasemode=19 -common.specieslist=7 +common.specieslist=8 common.vessel=1172 common.vesselsizecategory=13 common.vesseltype=16 ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -34,7 +34,7 @@ SpeciesDto=24 PersonDto=4 HookPositionDto=1 HookTypeDto=1 -SpeciesListDto=3 +SpeciesListDto=2 LightsticksColorDto=2 BaitSettingStatusDto=1 VesselTypeDto=3 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d86573f19963fda322fa011cb5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d86573f19963fda322fa011cb5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Fix at last tests database generation + try to update a little longline test db :(
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f9bdec58 by tchemit at 2019-01-04T14:09:52Z Fix at last tests database generation + try to update a little longline test db :( - - - - - 7 changed files: - services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java - test/src/main/resources/db/6.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/empty_h2.sql.gz - test/src/main/resources/db/7.0/empty_pg.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz Changes: ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java ===================================== @@ -38,12 +38,15 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.script.SqlScriptReader; +import org.nuiton.topia.persistence.script.SqlScriptWriter; import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; /** * Created on 25/12/15. @@ -154,7 +157,18 @@ public class MigrateTestsDatabases extends ServiceLocalTestSupport { } Files.createDirectories(scriptFile.toPath().getParent()); - dump.copy(scriptFile.toPath()); + copy(dump, scriptFile.toPath()); + + } + + public void copy(TopiaSqlScript reader, Path target) throws IOException { + try (SqlScriptWriter scriptWriter = SqlScriptWriter.builder(target).gzip().keepCommentLine().keepEmptyLine().build()) { + try (SqlScriptReader scriptReader = reader.getLocation()) { + for (String statement : scriptReader) { + scriptWriter.writeSql(statement); + } + } + } } } ===================================== test/src/main/resources/db/6.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_h2.sql.gz and b/test/src/main/resources/db/7.0/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_pg.sql.gz and b/test/src/main/resources/db/7.0/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/referentiel.sql.gz and b/test/src/main/resources/db/7.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9bdec587a89226058dcbce7518… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9bdec587a89226058dcbce7518… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Clean binders code
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2f8d3c0a by tchemit at 2019-01-04T11:10:44Z Clean binders code - - - - - d86573f1 by tchemit at 2019-01-04T11:10:56Z at last clean service local code (remove any dummy log.trace + extra empty lines) - - - - - 30 changed files: - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/GearUseFeaturesLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/GearUseFeaturesMeasurementLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/TripLonglineGearUseEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/BaitsCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/BranchlinesCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/CatchLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/FloatlinesCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/HooksCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SampleLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookCatchEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookGlobalCompositionEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsEncounterEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsSensorUsedEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BaitsCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BasketObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BranchlineObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BranchlinesCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/CatchLonglineObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/EncounterObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/FloatlinesCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/HooksCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SectionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SensorUsedObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SetLonglineObsCatchEntityDtoBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6d4cd87bb8fe5d602d63f99021… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6d4cd87bb8fe5d602d63f99021… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Happy new year commit
by Tony CHEMIT 03 Jan '19

03 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d4cd87b by tchemit at 2019-01-03T10:18:28Z Happy new year commit - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d4cd87bb8fe5d602d63f990212… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d4cd87bb8fe5d602d63f990212… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: c1ee509d by 166231 at 2019-01-02T15:28:47Z Site checkin for project ObServe :: Pom - - - - - 6 changed files: - administration-web.html - architecture-logicielle.html - img/architecture.svg - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,8 +101,8 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0-alpha-4.log # logs de l'application - |-- observeweb-log4j.conf # configuration des logs + | `-- observeweb-7.0.1.log # logs de l'application + |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -196,14 +196,6 @@ <div> <div> <pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) -</pre></div></div> - -<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> -<p>Dans le fichier de configuration <tt>httpd.conf</tt> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> - -<div> -<div> -<pre class="source">ProxyTimeout 1200 </pre></div></div> </div> </div> @@ -212,7 +204,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -150,7 +150,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== img/architecture.svg ===================================== @@ -3,7 +3,7 @@ #%L ObServe :: Pom %% - Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -94,7 +94,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -336,7 +336,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -107,7 +107,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c1ee509dba8a6409e653de726f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c1ee509dba8a6409e653de726f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.1
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT deleted branch release/7.0.1 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0.1
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed new tag v7.0.1 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0.1 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0.1] 2 commits: fix deploy
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch release/7.0.1 at ultreiaio / ird-observe Commits: d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>observe</artifactId> @@ -38,7 +38,7 @@ <properties>  -  + <maven.deploy.skip>false</maven.deploy.skip> <clientFile>client-runner-${project.version}.zip</clientFile> <serverFile>server-runner-${project.version}.war</serverFile> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f321a9664ea4917af607e51ff5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f321a9664ea4917af607e51ff5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 13 commits: [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 075bfed9 by tchemit at 2018-11-26T12:23:20Z [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci] - - - - - fdd54082 by tchemit at 2018-11-26T12:39:00Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 33652305 by tchemit at 2018-11-26T12:39:01Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 285a3f13 by tchemit at 2018-11-26T12:39:02Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f664945e by tchemit at 2018-12-21T03:25:02Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - 91712433 by tchemit at 2018-12-21T04:03:32Z Conformité des topiaid de floatingobjectpart - See #1191 - - - - - 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 3655d085 by tchemit at 2019-01-02T14:37:30Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - f321a966 by tchemit at 2019-01-02T14:51:32Z Happy new year commit - - - - - d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 71c951c6 by tchemit at 2019-01-02T14:57:31Z [jgitflow-maven-plugin]merging 'release/7.0.1' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb… You're receiving this email because of your account on gitlab.com.

1 0