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

[Git][ultreiaio/ird-observe][develop] Bascule entre langues - Closes #1553
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1ccd9702 by Tony Chemit at 2020-07-10T13:21:05+02:00 Bascule entre langues - Closes #1553 Improve the way to keep data source while reload application - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/close/OpenLocalDataSourceActionStep.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-runner/src/main/java/fr/ird/observe/client/RunObserve.java - common-service/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java - common-service/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.ObserveServiceMainFactoryApplicationComponent; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.spi.DtoModelHelper; import io.ultreia.java4all.application.context.ApplicationContext; import org.apache.logging.log4j.LogManager; @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ObserveSwingApplicationContext extends ApplicationContext { private static final Logger log = LogManager.getLogger(ObserveSwingApplicationContext.class); - private static ObserveSwingDataSource dataSourceToReload; + private static ObserveDataSourceConfiguration dataSourceConfigurationToReload; public static ObserveSwingApplicationContext init(ClientConfig config) { ClientConfigFinderInstance.config = config; @@ -94,11 +94,11 @@ public class ObserveSwingApplicationContext extends ApplicationContext { } - public static void setDataSourceToReload(ObserveSwingDataSource dataSourceToReload) { - ObserveSwingApplicationContext.dataSourceToReload = dataSourceToReload; + public static void setDataSourceToReload(ObserveDataSourceConfiguration dataSourceToReload) { + ObserveSwingApplicationContext.dataSourceConfigurationToReload = dataSourceToReload; } - public static Optional<ObserveSwingDataSource> getDataSourceToReload() { - return Optional.ofNullable(dataSourceToReload); + public static Optional<ObserveDataSourceConfiguration> getDataSourceToReload() { + return Optional.ofNullable(dataSourceConfigurationToReload); } } ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.client.datasource.api; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; @@ -42,6 +41,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.DatabaseOpenException; import io.ultreia.java4all.application.context.spi.GenerateApplicationComponent; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -50,11 +50,11 @@ import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; import static fr.ird.observe.client.configuration.ClientConfig.DB_NAME; -import static io.ultreia.java4all.i18n.I18n.t; /** * Permet de gérer les différentes data sources utilisées dans l'application. @@ -102,7 +102,7 @@ public class ObserveDataSourcesManager implements Closeable { */ public ObserveSwingDataSource newLocalDataSource() { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); if (!dataSourceConfigurationH2.getDatabaseFile().exists()) { throw new IllegalStateException("local base must exist, when using this method (" + @@ -197,7 +197,7 @@ public class ObserveDataSourcesManager implements Closeable { super.onOpened(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.add(dataSource); - log.info(String.format("Data source opened : %s (%d datas sources open)", dataSource.getConfiguration(), dataSources.size())); + log.info(String.format("Data source opened : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } @Override @@ -205,6 +205,10 @@ public class ObserveDataSourcesManager implements Closeable { super.onClosed(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.remove(dataSource); + if (Objects.equals(dataSource, getMainDataSource())) { + log.info(String.format("Remove main data source: %s", dataSource)); + setMainDataSource(null); + } log.info(String.format("Data source closed : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } }); @@ -215,10 +219,6 @@ public class ObserveDataSourcesManager implements Closeable { @Override public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException, DatabaseOpenException { try { - //FIXME:BodyContent Review progress model, not linked to ui any more... - if (getProgressModel() == null) { - setProgressModel(new ProgressModel()); - } create(createDto); } catch (IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new DatabaseOpenException(e, configuration); ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -134,6 +134,8 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple this.servicesProvider = new ObserveDataSourceServicesProvider(this); this.serviceFactory = serviceFactory; this.expired = false; + setProgressModel(new ProgressModel()); + if (isLocal()) { icon = SwingUtil.getUIManagerActionIcon("db-local"); } else if (isRemote()) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.main.body.NoBodyContentComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner; @@ -57,15 +58,17 @@ public class ReloadApplicationAction extends CloseApplicationAction { ObserveSwingDataSource mainDataSource = getObserveDataSourcesManager().getMainDataSource(); if (mainDataSource != null) { + ObserveDataSourceConfiguration mainDataSourceConfiguration = mainDataSource.getConfiguration(); if (mainDataSource.isOpen()) { try { mainDataSource.close(); } catch (Exception e) { UIHelper.handlingError("Can't close data source", e); - mainDataSource = null; + // In this case, won't try to reopen it + mainDataSourceConfiguration = null; } } - ObserveSwingApplicationContext.setDataSourceToReload(mainDataSource); + ObserveSwingApplicationContext.setDataSourceToReload(mainDataSourceConfiguration); } ApplicationRunner.getRunner().setReload(true); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/close/OpenLocalDataSourceActionStep.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.api.ObserveDataSourcesManager; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.loading.LoadingDataSourceContext; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,7 +63,7 @@ public class OpenLocalDataSourceActionStep extends CloseDataSourceActionStepSupp public void doAction0(ActionWithSteps<LoadingDataSourceContext> mainAction) throws Exception { ObserveDataSourcesManager dataSourcesManager = actionContext.getDataSourcesManager(); - ObserveDataSourceConfigurationTopiaH2 localConfiguration = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); + ObserveDataSourceConfigurationTopiaH2 localConfiguration = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); // can't migrate datasource in this case //FIXME I don't understand why in this cas we can't try to migrate local data source? ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -63,6 +63,7 @@ import fr.ird.observe.services.service.PingService; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import io.ultreia.java4all.application.template.spi.GenerateTemplate; +import io.ultreia.java4all.i18n.I18n; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; @@ -160,8 +161,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie * doBackup est active. */ protected File backupFile = new File(""); - /** un drapeau pour savoir s'il faut sauver la configuration à distante */ - protected boolean storeRemoteConfig; /** le storage precedemment utilise */ protected ObserveDataSourceConfiguration previousDataSourceConfiguration; protected ConnexionStatus connexionStatus; @@ -236,7 +235,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie Version modelVersion = getClientConfig().getModelVersion(); h2Config = factory.createObserveDataSourceConfigurationTopiaH2( - t("observe.runner.initStorage.label.local"), + I18n.n("observe.runner.initStorage.label.local"), null, ClientConfig.DB_NAME, "", @@ -247,7 +246,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ); pgConfig = factory.createObserveDataSourceConfigurationTopiaPG( - t("observe.storage.label.remote"), + I18n.n("observe.storage.label.remote"), "", "", EMPTY_PASSWORD, @@ -258,7 +257,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ); restConfig = factory.createObserveDataSourceConfigurationRest( - t("observe.storage.label.server"), + I18n.n("observe.storage.label.server"), null, "", EMPTY_PASSWORD, @@ -341,9 +340,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); if (source != null) { @@ -417,9 +416,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); // on initialise les configuration avec les valeurs par défaut - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); if (previousConfig instanceof ObserveDataSourceConfigurationTopiaH2) { @@ -451,7 +450,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourceConfiguration configuration; switch (getDbMode()) { case CREATE_LOCAL: - configuration = toH2StorageConfig(t("observe.runner.initStorage.label.local")); + configuration = toH2StorageConfig(I18n.n("observe.runner.initStorage.label.local")); dataSource = dataSourcesManager.newDataSource(configuration); dataSource.addObserveSwingDataSourceListener( @@ -493,15 +492,15 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie break; case USE_LOCAL: - configuration = toH2StorageConfig(t("observe.runner.initStorage.label.local")); + configuration = toH2StorageConfig(I18n.n("observe.runner.initStorage.label.local")); dataSource = dataSourcesManager.newDataSource(configuration); break; case USE_REMOTE: - configuration = toPGStorageConfig(t("observe.storage.label.remote")); + configuration = toPGStorageConfig(I18n.n("observe.storage.label.remote")); dataSource = dataSourcesManager.newDataSource(configuration); break; case USE_SERVER: - configuration = toRestStorageConfig(t("observe.storage.label.server")); + configuration = toRestStorageConfig(I18n.n("observe.storage.label.server")); dataSource = dataSourcesManager.newDataSource(configuration); break; } @@ -553,9 +552,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); Pair<CreationMode, DbMode> modes = computeModes(config); CreationMode mode = modes.getLeft(); @@ -1217,10 +1216,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie validate(); } - public boolean isStoreRemoteConfig() { - return storeRemoteConfig; - } - public File getBackupFile() { return backupFile; } @@ -1839,7 +1834,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie if (isImportReferential()) { - String dbLabel = t("observe.storage.label.reference.import.db"); + String dbLabel = I18n.n("observe.storage.label.reference.import.db"); switch (getReferentielImportMode()) { @@ -1916,7 +1911,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie if (isImportData()) { - String dbLabel = t("observe.storage.label.data.import.db"); + String dbLabel = I18n.n("observe.storage.label.data.import.db"); switch (getDataImportMode()) { ===================================== client-runner/src/main/java/fr/ird/observe/client/RunObserve.java ===================================== @@ -40,9 +40,9 @@ import fr.ird.observe.client.datasource.h2.backup.WithLocalDatabaseBackupTimer; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.util.FloatConverter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import io.ultreia.java4all.application.context.ApplicationContext; @@ -80,7 +80,6 @@ import java.util.Set; import java.util.logging.Level; import static fr.ird.observe.client.ClientUIContext.askUser; -import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -119,6 +118,125 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, return (RunObserve) ApplicationRunner.getRunner(); } + public static void askToCreateLocalDatabase(ObserveMainUI mainUI, + ClientConfig config, + ObserveDataSourcesManager dataSourcesManager, + BackupStorage lastAutomaticBackup) { + + InitStorageModel initStorageModel = new InitStorageModel(config.getLocalDBDirectory(), lastAutomaticBackup); + + String text = InitStorageModelTemplate.generate(initStorageModel); + + Object[] options; + int defaultOption; + boolean noAutomaticBackup = lastAutomaticBackup == null; + if (noAutomaticBackup) { + options = new Object[]{ + t("observe.runner.initStorage.choice.useRemoteStorage"), + t("observe.runner.initStorage.choice.createLocalStorage"), + t("observe.runner.initStorage.choice.doNothing")}; + defaultOption = 1; + + } else { + options = new Object[]{ + t("observe.runner.initStorage.choice.useRemoteStorage"), + t("observe.runner.initStorage.choice.createLocalStorage"), + t("observe.runner.initStorage.choice.loadLastAutomaticBackup"), + t("observe.runner.initStorage.choice.doNothing")}; + defaultOption = 2; + + } + + JLabel label = new JLabel(text); + int response = askUser( + null, + t("observe.runner.initStorage.title.no.local.db.found"), + label, + JOptionPane.QUESTION_MESSAGE, + options, + defaultOption + ); + log.debug(String.format("response : %d", response)); + + if (noAutomaticBackup) { + Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); + String title = null; + if (response != JOptionPane.CLOSED_OPTION && response < 2) { + + if (response == 1) { + // creation de la base locale + dbModes.add(DbMode.CREATE_LOCAL); + title = I18n.n("observe.runner.initStorage.title.create.local.db"); + } else { + // connexion à une base distante + dbModes.add(DbMode.USE_REMOTE); + dbModes.add(DbMode.USE_SERVER); + title = I18n.n("observe.runner.initStorage.title.load.remote.db"); + } + } + if (!dbModes.isEmpty()) { + + DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); + body.doChangeStorage(dbModes, title); + } + } else { + + Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); + String title = null; + if (response != JOptionPane.CLOSED_OPTION && response < 3) { + + switch (response) { + case 2: + // load last backup + loadBackup(dataSourcesManager, mainUI, lastAutomaticBackup); + break; + case 1: + // create local db + // creation de la base locale + dbModes.add(DbMode.CREATE_LOCAL); + title = I18n.n("observe.runner.initStorage.title.create.local.db"); + break; + case 0: + // use remote db + dbModes.add(DbMode.USE_REMOTE); + dbModes.add(DbMode.USE_SERVER); + title = I18n.n("observe.runner.initStorage.title.load.remote.db"); + break; + } + } + if (!dbModes.isEmpty()) { + DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); + body.doChangeStorage(dbModes, title); + } + } + + } + + public static void loadBackup(ObserveDataSourcesManager dataSourcesManager, ObserveMainUI mainUI, BackupStorage backupStorage) { + log.info("Will load last backup: " + backupStorage.getFile()); + try { +// byte[] dump = Files.readAllBytes(backupStorage.getFile().toPath()); + DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto(); + createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI())); + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + + ObserveSwingDataSource dataSource = dataSourcesManager.newDataSource(dataSourceConfigurationH2, createDto); + + mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource, true); + + //FIXME:BodyContent Review progress model, not linked to ui any more... +// dataSource.setProgressModel(new ProgressModel()); +// dataSource.create(createDto); +// +// mainUI.changeBodyContent(DataSourceEditor.class); +// mainUI.getModel().setMode(ObserveUIMode.DB); + + } catch (Exception e) { + throw new ObserveSwingTechnicalException("Impossible de créer la base locale", e); + } + } + @Override protected void initOnce() { if (!init) { @@ -272,7 +390,7 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // // return; // } - Optional<ObserveSwingDataSource> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); + Optional<ObserveDataSourceConfiguration> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); ObserveSwingApplicationContext.setDataSourceToReload(null); if (!config.isLoadLocalStorage() && !dataSourceToReload.isPresent()) { @@ -368,19 +486,19 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, //FIXME Need to have a unified API and only one //FIXME first try to open specified ds (here local ds) //FIXME if can not load local ds, then feedback it and propose to load automatic backup, or to create a new local ds - private void initStorage(ClientConfig config, JFrame ui, ObserveSwingDataSource previousDataSource) { + private void initStorage(ClientConfig config, JFrame ui, ObserveDataSourceConfiguration previousDataSourceConfiguration) { ObserveMainUI mainUI = (ObserveMainUI) ui; ObserveDataSourcesManager dataSourcesManager = getObserveDataSourcesManager(); BackupsManager backupsManager = getBackupsManager(); - if (previousDataSource != null) { + if (previousDataSourceConfiguration != null) { // reuse previous data source - previousDataSource.setProgressModel(new ProgressModel()); + ObserveSwingDataSource previousDataSource = dataSourcesManager.newDataSource(previousDataSourceConfiguration); mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, previousDataSource, true); - } else if (config.isLoadLocalStorage()){ + } else if (config.isLoadLocalStorage()) { boolean askToCreate = true; BackupStorage lastAutomaticBackup = backupsManager.getAutomaticBackups().stream().findFirst().orElse(null); @@ -390,7 +508,6 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // une base locale existe, on l'ouvre ObserveSwingDataSource dataSource = dataSourcesManager.newLocalDataSource(); - dataSource.setProgressModel(new ProgressModel()); try { @@ -430,124 +547,4 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, log.info(t("observe.runner.initStorage.done")); } - - public static void askToCreateLocalDatabase(ObserveMainUI mainUI, - ClientConfig config, - ObserveDataSourcesManager dataSourcesManager, - BackupStorage lastAutomaticBackup) { - - InitStorageModel initStorageModel = new InitStorageModel(config.getLocalDBDirectory(), lastAutomaticBackup); - - String text = InitStorageModelTemplate.generate(initStorageModel); - - Object[] options; - int defaultOption; - boolean noAutomaticBackup = lastAutomaticBackup == null; - if (noAutomaticBackup) { - options = new Object[]{ - t("observe.runner.initStorage.choice.useRemoteStorage"), - t("observe.runner.initStorage.choice.createLocalStorage"), - t("observe.runner.initStorage.choice.doNothing")}; - defaultOption = 1; - - } else { - options = new Object[]{ - t("observe.runner.initStorage.choice.useRemoteStorage"), - t("observe.runner.initStorage.choice.createLocalStorage"), - t("observe.runner.initStorage.choice.loadLastAutomaticBackup"), - t("observe.runner.initStorage.choice.doNothing")}; - defaultOption = 2; - - } - - JLabel label = new JLabel(text); - int response = askUser( - null, - t("observe.runner.initStorage.title.no.local.db.found"), - label, - JOptionPane.QUESTION_MESSAGE, - options, - defaultOption - ); - log.debug(String.format("response : %d", response)); - - if (noAutomaticBackup) { - Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); - String title = null; - if (response != JOptionPane.CLOSED_OPTION && response < 2) { - - if (response == 1) { - // creation de la base locale - dbModes.add(DbMode.CREATE_LOCAL); - title = n("observe.runner.initStorage.title.create.local.db"); - } else { - // connexion à une base distante - dbModes.add(DbMode.USE_REMOTE); - dbModes.add(DbMode.USE_SERVER); - title = n("observe.runner.initStorage.title.load.remote.db"); - } - } - if (!dbModes.isEmpty()) { - - DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); - body.doChangeStorage(dbModes, title); - } - } else { - - Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); - String title = null; - if (response != JOptionPane.CLOSED_OPTION && response < 3) { - - switch (response) { - case 2: - // load last backup - loadBackup(dataSourcesManager, mainUI, lastAutomaticBackup); - break; - case 1: - // create local db - // creation de la base locale - dbModes.add(DbMode.CREATE_LOCAL); - title = n("observe.runner.initStorage.title.create.local.db"); - break; - case 0: - // use remote db - dbModes.add(DbMode.USE_REMOTE); - dbModes.add(DbMode.USE_SERVER); - title = n("observe.runner.initStorage.title.load.remote.db"); - break; - } - } - if (!dbModes.isEmpty()) { - DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); - body.doChangeStorage(dbModes, title); - } - } - - } - - public static void loadBackup(ObserveDataSourcesManager dataSourcesManager, ObserveMainUI mainUI, BackupStorage backupStorage) { - log.info("Will load last backup: " + backupStorage.getFile()); - try { -// byte[] dump = Files.readAllBytes(backupStorage.getFile().toPath()); - DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto(); - createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI())); - - ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - - ObserveSwingDataSource dataSource = dataSourcesManager.newDataSource(dataSourceConfigurationH2, createDto); - - mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource, true); - - //FIXME:BodyContent Review progress model, not linked to ui any more... -// dataSource.setProgressModel(new ProgressModel()); -// dataSource.create(createDto); -// -// mainUI.changeBodyContent(DataSourceEditor.class); -// mainUI.getModel().setMode(ObserveUIMode.DB); - - } catch (Exception e) { - throw new ObserveSwingTechnicalException("Impossible de créer la base locale", e); - } - } - } ===================================== common-service/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java ===================================== @@ -25,10 +25,12 @@ package fr.ird.observe.services.configuration.rest; import com.google.common.base.MoreObjects; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceType; +import io.ultreia.java4all.i18n.I18n; +import org.nuiton.version.Version; + import java.net.URL; import java.nio.file.Path; import java.util.Optional; -import org.nuiton.version.Version; /** * Configuration d'une source de données Rest non connectée. @@ -37,6 +39,7 @@ import org.nuiton.version.Version; * * @author Tony Chemit - dev(a)tchemit.fr */ +@SuppressWarnings("unused") public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { private static final long serialVersionUID = 1L; @@ -75,7 +78,7 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf @Override public String getLabel() { - return label; + return I18n.t(label); } @Override ===================================== common-service/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.services.configuration.topia; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceType; +import io.ultreia.java4all.i18n.I18n; import org.nuiton.version.Version; import java.nio.file.Path; @@ -101,7 +102,7 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse @Override public String getLabel() { - return label; + return I18n.t(label); } public void setLabel(String label) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ccd9702cdf11f53730dfc591… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ccd9702cdf11f53730dfc591… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Move feedback helper to menu Help
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7ee7eb28 by Tony Chemit at 2020-07-10T11:01:52+02:00 Move feedback helper to menu Help - - - - - ad4c3466 by Tony Chemit at 2020-07-10T12:44:31+02:00 Bascule entre langues - Closes #1553 Improve the way to keep data source while reload application - - - - - 7 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-runner/src/main/java/fr/ird/observe/client/RunObserve.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.ObserveServiceMainFactoryApplicationComponent; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.spi.DtoModelHelper; import io.ultreia.java4all.application.context.ApplicationContext; import org.apache.logging.log4j.LogManager; @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ObserveSwingApplicationContext extends ApplicationContext { private static final Logger log = LogManager.getLogger(ObserveSwingApplicationContext.class); - private static ObserveSwingDataSource dataSourceToReload; + private static ObserveDataSourceConfiguration dataSourceConfigurationToReload; public static ObserveSwingApplicationContext init(ClientConfig config) { ClientConfigFinderInstance.config = config; @@ -94,11 +94,11 @@ public class ObserveSwingApplicationContext extends ApplicationContext { } - public static void setDataSourceToReload(ObserveSwingDataSource dataSourceToReload) { - ObserveSwingApplicationContext.dataSourceToReload = dataSourceToReload; + public static void setDataSourceToReload(ObserveDataSourceConfiguration dataSourceToReload) { + ObserveSwingApplicationContext.dataSourceConfigurationToReload = dataSourceToReload; } - public static Optional<ObserveSwingDataSource> getDataSourceToReload() { - return Optional.ofNullable(dataSourceToReload); + public static Optional<ObserveDataSourceConfiguration> getDataSourceToReload() { + return Optional.ofNullable(dataSourceConfigurationToReload); } } ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.client.datasource.api; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; @@ -50,6 +49,7 @@ import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -205,6 +205,10 @@ public class ObserveDataSourcesManager implements Closeable { super.onClosed(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.remove(dataSource); + if (Objects.equals(dataSource, getMainDataSource())) { + log.info(String.format("Remove main data source: %s", dataSource)); + setMainDataSource(null); + } log.info(String.format("Data source closed : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } }); @@ -215,10 +219,6 @@ public class ObserveDataSourcesManager implements Closeable { @Override public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException, DatabaseOpenException { try { - //FIXME:BodyContent Review progress model, not linked to ui any more... - if (getProgressModel() == null) { - setProgressModel(new ProgressModel()); - } create(createDto); } catch (IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new DatabaseOpenException(e, configuration); ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -134,6 +134,8 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple this.servicesProvider = new ObserveDataSourceServicesProvider(this); this.serviceFactory = serviceFactory; this.expired = false; + setProgressModel(new ProgressModel()); + if (isLocal()) { icon = SwingUtil.getUIManagerActionIcon("db-local"); } else if (isRemote()) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -97,7 +97,6 @@ public void destroy() { <JMenu id='menuFile'> <JMenuItem id='reloadApplication'/> - <JMenuItem id='openLastFeedBack'/> <JMenuItem id='closeApplication'/> </JMenu> <JMenu id='menuConfiguration'> @@ -116,6 +115,7 @@ public void destroy() { <JMenu id='menuHelp'> <JMenuItem id='gotoSite'/> <JMenuItem id='showAbout'/> + <JMenuItem id='openLastFeedBack'/> <JSeparator/> <JMenuItem id='translate'/> </JMenu> ===================================== client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.main.body.NoBodyContentComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner; @@ -57,15 +58,17 @@ public class ReloadApplicationAction extends CloseApplicationAction { ObserveSwingDataSource mainDataSource = getObserveDataSourcesManager().getMainDataSource(); if (mainDataSource != null) { + ObserveDataSourceConfiguration mainDataSourceConfiguration = mainDataSource.getConfiguration(); if (mainDataSource.isOpen()) { try { mainDataSource.close(); } catch (Exception e) { UIHelper.handlingError("Can't close data source", e); - mainDataSource = null; + // In this case, won't try to reopen it + mainDataSourceConfiguration = null; } } - ObserveSwingApplicationContext.setDataSourceToReload(mainDataSource); + ObserveSwingApplicationContext.setDataSourceToReload(mainDataSourceConfiguration); } ApplicationRunner.getRunner().setReload(true); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -160,8 +160,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie * doBackup est active. */ protected File backupFile = new File(""); - /** un drapeau pour savoir s'il faut sauver la configuration à distante */ - protected boolean storeRemoteConfig; /** le storage precedemment utilise */ protected ObserveDataSourceConfiguration previousDataSourceConfiguration; protected ConnexionStatus connexionStatus; @@ -1217,10 +1215,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie validate(); } - public boolean isStoreRemoteConfig() { - return storeRemoteConfig; - } - public File getBackupFile() { return backupFile; } ===================================== client-runner/src/main/java/fr/ird/observe/client/RunObserve.java ===================================== @@ -40,9 +40,9 @@ import fr.ird.observe.client.datasource.h2.backup.WithLocalDatabaseBackupTimer; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.util.FloatConverter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import io.ultreia.java4all.application.context.ApplicationContext; @@ -272,7 +272,7 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // // return; // } - Optional<ObserveSwingDataSource> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); + Optional<ObserveDataSourceConfiguration> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); ObserveSwingApplicationContext.setDataSourceToReload(null); if (!config.isLoadLocalStorage() && !dataSourceToReload.isPresent()) { @@ -368,19 +368,19 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, //FIXME Need to have a unified API and only one //FIXME first try to open specified ds (here local ds) //FIXME if can not load local ds, then feedback it and propose to load automatic backup, or to create a new local ds - private void initStorage(ClientConfig config, JFrame ui, ObserveSwingDataSource previousDataSource) { + private void initStorage(ClientConfig config, JFrame ui, ObserveDataSourceConfiguration previousDataSourceConfiguration) { ObserveMainUI mainUI = (ObserveMainUI) ui; ObserveDataSourcesManager dataSourcesManager = getObserveDataSourcesManager(); BackupsManager backupsManager = getBackupsManager(); - if (previousDataSource != null) { + if (previousDataSourceConfiguration != null) { // reuse previous data source - previousDataSource.setProgressModel(new ProgressModel()); + ObserveSwingDataSource previousDataSource = dataSourcesManager.newDataSource(previousDataSourceConfiguration); mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, previousDataSource, true); - } else if (config.isLoadLocalStorage()){ + } else if (config.isLoadLocalStorage()) { boolean askToCreate = true; BackupStorage lastAutomaticBackup = backupsManager.getAutomaticBackups().stream().findFirst().orElse(null); @@ -390,7 +390,6 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // une base locale existe, on l'ouvre ObserveSwingDataSource dataSource = dataSourcesManager.newLocalDataSource(); - dataSource.setProgressModel(new ProgressModel()); try { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcea594dfa7657079cceb68f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcea594dfa7657079cceb68f… 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 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 058c40e3 by 166231 at 2020-07-09T07:07:57+00:00 Site checkin for project ObServe :: Pom - - - - - 7 changed files: - administration-web.html - architecture-logicielle.html - img/architecture.svg - index.html - install-serverPG.html - install.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> @@ -102,7 +102,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.6.3.log # logs de l'application + | `-- observeweb-7.6.4.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> ===================================== img/architecture.svg ===================================== @@ -9,12 +9,10 @@ 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>. ===================================== index.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> ===================================== install-serverPG.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> ===================================== install.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> ===================================== synchro-referential.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -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>»</li> <li class="active ">Synchronisation avancée du référentiel</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <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> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/058c40e3f998194a2d7f18a85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/058c40e3f998194a2d7f18a85… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.4
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT deleted branch release/7.6.4 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.6.4
by Tony CHEMIT 09 Jul '20

09 Jul '20

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

1 0

[Git][ultreiaio/ird-observe][release/7.6.4] [jgitflow-maven-plugin]updating poms for branch'release/7.6.4' with non-snapshot versions[skip ci]
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch release/7.6.4 at ultreiaio / ird-observe Commits: 55522c6d by Tony Chemit at 2020-07-09T08:21:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.4' with non-snapshot versions[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/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 - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.4</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/55522c6d5a400eb7edc53681d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/55522c6d5a400eb7edc53681d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 26 commits: [jgitflow-maven-plugin]updating poms for 7.6.4-SNAPSHOT development[skip ci]
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: d1d3eb1a by Tony Chemit at 2020-06-22T16:56:43+02:00 [jgitflow-maven-plugin]updating poms for 7.6.4-SNAPSHOT development[skip ci] - - - - - ba13c2ae by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - cc6c62b1 by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - ee51e70a by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6d8bef84 by Tony Chemit at 2020-07-01T10:30:35+02:00 Deux comportements étranges sur l'assistant tableaux de synthèse - Closes #1533 - - - - - ce0547c6 by Tony Chemit at 2020-07-01T10:41:29+02:00 Correction des composants graphiques numériques et sélection - Closes #1563 - - - - - b4c3bb68 by Tony Chemit at 2020-07-01T11:13:28+02:00 Requêtes de synthèse PS - Closes #1529 - - - - - b95e3b85 by Tony Chemit at 2020-07-02T11:20:09+02:00 [PS][Observations] Activité : contrôle trop strict - Closes #1552 - - - - - 3ed185fe by Tony Chemit at 2020-07-02T11:20:11+02:00 [7.6.3][PS] Les thonidés sont disponibles dans la liste déroulante du form Espèces accessoires, alors qu'ils ne sont pas dans la display liste correspondante - Closes #1562 - - - - - a17958e2 by Tony Chemit at 2020-07-02T11:20:11+02:00 [LL] Onglet Composition détaillée / Détail avançon / Hameçon et appât non consultable - Closes #1558 - - - - - b5a3eb17 by Tony Chemit at 2020-07-02T12:10:40+02:00 [PS] Pratiques de remise à l'eau, cétacés non trouvés - Closes #1564 - - - - - 82cbd449 by Tony Chemit at 2020-07-03T19:25:23+02:00 le reset reste actif sur les éditeurs de nombres même si ceci ne sont pas actif - Closes #1568 le reset des combo box ne fonctionne pas bien (alors que l'action associée Ctrl+D est ok) - Closes #1569 - - - - - 51e68e52 by Tony Chemit at 2020-07-05T09:40:52+02:00 Deux coquilles dans les validations - Closes #1572 - - - - - cb657363 by Tony Chemit at 2020-07-05T14:36:05+02:00 Problème de traduction sur les validations taille/poids des espèces - Closes #1571 - - - - - 4813a403 by Tony Chemit at 2020-07-05T14:36:06+02:00 Pouvoir changer l'espèce d'un enregistrement - See #1565 Rendre toutes les colonnes modifiables dans les modèles de tableau - - - - - 49b5e36d by Tony Chemit at 2020-07-05T14:36:06+02:00 Pouvoir changer l'espèce d'un enregistrement - See #1565 Rendre toutes les propriétés modifiables dans les formulaires - - - - - 1a6e009b by Tony Chemit at 2020-07-05T14:36:06+02:00 Pouvoir changer l'espèce d'un enregistrement - Close #1565 Bien restituer les listes de données pour modification (et non plus juste la valeur sélectionnée) Revue du focus suite à une modification de ligne dans le tableau - - - - - 1559b16f by Tony Chemit at 2020-07-08T14:44:01+02:00 Amélioration des logs - Closes #1574 - - - - - de252cbe by Tony Chemit at 2020-07-08T14:44:02+02:00 les programmes ne sont pas triés dans le même ordre dans l'arbre de navigation et dans la formulaire liste des marées - Closes #1567 - - - - - 54e060f2 by Tony Chemit at 2020-07-08T14:44:02+02:00 Revoir la gestion des validateurs taille-poids d'espèces - Closes #1573 - - - - - 5b2ae29c by Tony Chemit at 2020-07-08T14:44:02+02:00 Integrates back toolkit since we won't use it anywhere else - - - - - 647b3466 by Tony Chemit at 2020-07-08T14:44:02+02:00 Clean license headers - - - - - 0af7d8e7 by Tony Chemit at 2020-07-08T14:44:02+02:00 [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé si on change d'espèce - Closes #1575 - - - - - d1b521a0 by Tony Chemit at 2020-07-08T14:44:02+02:00 Petite amélioration cosmétique (c kdo) - - - - - 55522c6d by Tony Chemit at 2020-07-09T08:21:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.4' with non-snapshot versions[skip ci] - - - - - d09a4a8e by Tony Chemit at 2020-07-09T08:26:33+02:00 [jgitflow-maven-plugin]merging 'release/7.6.4' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/java/fr/ird/observe/client/package.html - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/ShowUniqueKeysAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePane.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePane.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/CollapseAll.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/ExpandAll.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/ReferentialSelectionTreePaneActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ea5d67523cd3ca464a79ea78… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ea5d67523cd3ca464a79ea78… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.4' with non-snapshot versions[skip ci]
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 55522c6d by Tony Chemit at 2020-07-09T08:21:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.4' with non-snapshot versions[skip ci] - - - - - d09a4a8e by Tony Chemit at 2020-07-09T08:26:33+02:00 [jgitflow-maven-plugin]merging 'release/7.6.4' into 'master-7.x' - - - - - 7aae43f1 by Tony Chemit at 2020-07-09T08:26:34+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 507c2ab9 by Tony Chemit at 2020-07-09T08:26:35+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 11f90bbd by Tony Chemit at 2020-07-09T08:26:35+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c79d49fb2e1005ec38c2f4c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c79d49fb2e1005ec38c2f4c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.5-SNAPSHOT development[skip ci]
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0c79d49f by Tony Chemit at 2020-07-09T08:19:52+02:00 [jgitflow-maven-plugin]updating poms for 7.6.5-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/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 - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.4-SNAPSHOT</version> + <version>7.6.5-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c79d49fb2e1005ec38c2f4c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c79d49fb2e1005ec38c2f4c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.4
by Tony CHEMIT 09 Jul '20

09 Jul '20

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

1 0