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

[Git][ultreiaio/ird-observe][master-7.x] 12 commits: [jgitflow-maven-plugin]updating poms for 7.1.1-SNAPSHOT development[skip ci]
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 9661a66a by tchemit at 2019-08-02T15:42:00Z [jgitflow-maven-plugin]updating poms for 7.1.1-SNAPSHOT development[skip ci] - - - - - d938fdce by tchemit at 2019-08-02T16:24:48Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 356e1218 by tchemit at 2019-08-02T16:24:49Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - a7e1e285 by tchemit at 2019-08-02T16:24:49Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 04c2bdee by tchemit at 2019-09-10T11:54:35Z [SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce - Closes #1374 - - - - - 0adde8dc by tchemit at 2019-09-10T13:01:04Z update pom - - - - - 2949efae by tchemit at 2019-09-11T17:12:57Z let's pass if we could not load backups... this should not break application. - - - - - cb633b5e by tchemit at 2019-09-11T17:13:13Z expose clientconfig for tes and use it - - - - - f6aba918 by tchemit at 2019-09-12T10:45:53Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 548c0023 by tchemit at 2019-09-16T09:52:08Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - e01c2a8a by tchemit at 2019-09-16T15:49:23Z [jgitflow-maven-plugin]updating poms for branch'release/7.1.1' with non-snapshot versions[skip ci] - - - - - 55c178d9 by tchemit at 2019-09-16T15:54:18Z [jgitflow-maven-plugin]merging 'release/7.1.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-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client-runner/pom.xml - client-runner/src/test/java/fr/ird/observe/client/simple/longline/LonglineDetailCompositionValidatorServiceTest.java - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java - test/pom.xml - + 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 - validation/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a3eae48afd4ea285856ef4182b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a3eae48afd4ea285856ef4182b… 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.1.1' with non-snapshot versions[skip ci]
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e01c2a8a by tchemit at 2019-09-16T15:49:23Z [jgitflow-maven-plugin]updating poms for branch'release/7.1.1' with non-snapshot versions[skip ci] - - - - - 55c178d9 by tchemit at 2019-09-16T15:54:18Z [jgitflow-maven-plugin]merging 'release/7.1.1' into 'master-7.x' - - - - - 89541dff by tchemit at 2019-09-16T15:54:20Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7c6d65a8 by tchemit at 2019-09-16T15:54:20Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 5809a548 by tchemit at 2019-09-16T15:54:21Z [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/8076b97c9eeeb0cf375d749fbe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8076b97c9eeeb0cf375d749fbe… 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.1.2-SNAPSHOT development[skip ci]
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8076b97c by tchemit at 2019-09-16T15:38:49Z [jgitflow-maven-plugin]updating poms for 7.1.2-SNAPSHOT development[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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.1.2-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8076b97c9eeeb0cf375d749fbe0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8076b97c9eeeb0cf375d749fbe0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.1.1
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

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

1 0

[Git][ultreiaio/ird-observe][develop] more fixes on admin api
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1f63ebe6 by tchemit at 2019-09-16T12:11:41Z more fixes on admin api - - - - - 7 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/SelectData.java - 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/ConfigUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/Start.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== @@ -61,8 +61,6 @@ public class AdminTabUIHandler<U extends AdminTabUI> { AdminStep step = ui.getStep(); - //FIXME ? ui.addPropertyChangeListener(parentUI); - log.debug(String.format("common for [%s] for main ui %s@%d", step, parentUI.getClass().getName(), System.identityHashCode(ui))); String stepLabel = I18nEnumHelper.getLabel(step); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== @@ -21,6 +21,7 @@ */ package fr.ird.observe.client.ui.admin; +import fr.ird.observe.client.ui.admin.actions.SelectData; import fr.ird.observe.client.ui.admin.config.ConfigUI; import fr.ird.observe.client.ui.admin.config.SelectDataUI; import fr.ird.observe.client.ui.admin.consolidate.ConsolidateUI; @@ -180,32 +181,18 @@ public class AdminUIHandler implements UIHandler<AdminUI> { AdminUIModel model = ui.getModel(); - if (oldStep == null - && newStep == AdminStep.CONFIG - && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) { - - ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); + if (oldStep == null && newStep == AdminStep.CONFIG && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) { model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.left.storage")); model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.right.storage")); -// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel())); -// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); - } - if (oldStep == null - && newStep == AdminStep.CONFIG - && model.containsOperation(AdminStep.EXPORT_DATA)) { - - ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); + if (oldStep == null && newStep == AdminStep.CONFIG && model.containsOperation(AdminStep.EXPORT_DATA)) { model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.exportSource.storage")); model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.exportTarget.storage")); -// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel())); -// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); - } if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) { @@ -238,7 +225,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.ACTIVITY_LONGLINE_PAIRING) == WizardState.PENDING) { ActivityLonglinePairingUI tabUI = (ActivityLonglinePairingUI) ui.getStepUI(AdminStep.ACTIVITY_LONGLINE_PAIRING); - tabUI.getPrepare().doClick(); + SwingUtilities.invokeLater(tabUI.getPrepare()::doClick); } } @@ -256,7 +243,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) { ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE); - tabUI.getStart().doClick(); + SwingUtilities.invokeLater(tabUI.getStart()::doClick); } } @@ -265,7 +252,11 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) { SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); - SwingUtilities.invokeLater(tabUI.getStart()::doClick); + if (tabUI.getStepModel().isLocalSourceNeedSave()) { + SwingUtilities.invokeLater(tabUI.getStart()::doClick); + } else { + SwingUtilities.invokeLater(tabUI.getContinueAction()::doClick); + } } } @@ -304,7 +295,8 @@ public class AdminUIHandler implements UIHandler<AdminUI> { // préparation de l'arbre de sélection SelectDataUI selectDataUI = (SelectDataUI) ui.getStepUI(AdminStep.SELECT_DATA); - selectDataUI.getHandler().onSelectDataOpen(); + SelectData action = SelectData.init(selectDataUI,null, SelectData.class); + action.run(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/SelectData.java ===================================== @@ -0,0 +1,68 @@ +package fr.ird.observe.client.ui.admin.actions; + +/*- + * #%L + * ObServe :: Client core + * %% + * 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% + */ + +import fr.ird.observe.client.db.ObserveSwingDataSource; +import fr.ird.observe.client.ui.admin.config.SelectDataUI; +import fr.ird.observe.client.ui.tree.selection.SelectionTree; + +import javax.swing.SwingUtilities; +import java.awt.event.ActionEvent; + +public class SelectData extends AdminTabUIActionSupport<SelectDataUI> implements Runnable { + + public SelectData() { + super(null, null, null, null); + } + + @Override + protected void doActionPerformed(ActionEvent e, SelectDataUI ui) { + run(); + } + + @Override + public void run() { + getParentUI().getModel().setBusy(true); + try { + SwingUtilities.invokeLater(this::run0); + } finally { + getParentUI().getModel().setBusy(false); + } + } + + private void run0() { + SelectionTree selectTree = ui.getSelectTree(); + selectTree.clearSelection(); + + SwingUtilities.invokeLater(selectTree::grabFocus); + + if (selectTree.getTreeModel().isNotEmpty()) { + + selectTree.setSelectionRow(0); + } + ObserveSwingDataSource localSource = ui.getModel().getConfigModel().getLocalSourceModel().getSafeSource(true); + if (localSource.isLocal()) { + SwingUtilities.invokeLater(selectTree::expandAll); + } + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java ===================================== @@ -96,8 +96,7 @@ public class ConfigModel extends AdminActionModel { @Override public void validate() { super.validate(); - ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid()); - ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep()); + ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep()); } }; @@ -126,8 +125,7 @@ public class ConfigModel extends AdminActionModel { @Override public void validate() { super.validate(); - ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid()); - ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep()); + ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep()); } }; centralSourceModel.setLabelPrefix(n("observe.storage.config.referentiel.storage")); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java ===================================== @@ -46,7 +46,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa UIHelper.setLayerUI(ui.getConfig(), parentUI.getConfigBlockLayerUI()); UIHelper.setLayerUI(ui.getContent(), null); AdminUIModel model = ui.getModel(); - model.addPropertyChangeListener("operations", e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA)); + model.addPropertyChangeListener(AdminUIModel.OPERATIONS_PROPERTY_NAME, e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA)); + ui.getModel().getConfigModel().addPropertyChangeListener(AdminUIModel.VALID_STEP_PROPERTY_NAME, e-> model.validate()); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java ===================================== @@ -27,8 +27,6 @@ import fr.ird.observe.client.ui.tree.selection.SelectionTree; import fr.ird.observe.client.ui.util.UIHelper; import org.nuiton.jaxx.runtime.spi.UIHandler; -import javax.swing.SwingUtilities; - /** * Created on 28/11/16. * @@ -52,21 +50,4 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme // UIHelper.initUI(tabUI.getSelectTreePane(), tree); } - - public void onSelectDataOpen() { - - SelectionTree selectTree = ui.getSelectTree(); - selectTree.clearSelection(); - - SwingUtilities.invokeLater(selectTree::grabFocus); - - if (selectTree.getTreeModel().isNotEmpty()) { - - selectTree.setSelectionRow(0); - } - if (ui.getModel().getConfigModel().getLocalSourceModel().getSafeSource(true).isLocal()) { - SwingUtilities.invokeLater(selectTree::expandAll); - } - - } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/Start.java ===================================== @@ -88,10 +88,12 @@ public class Start extends ExportUIActionSupport { DecoratorService decoratorService = getDecoratorService(); ReferentialReferenceDecorator<ProgramReference> programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramReference.class); - int stepCount = 4 + 2 * tripEntries.size(); + int stepCount = 6 + 2 * tripEntries.size(); ProgressModel progressModel = stepModel.getProgressModel(); progressModel.setStepsCount(stepCount); + progressModel.setCurrentStep(0); + progressModel.incrementsCurrentStep(); try (ObserveSwingDataSource localDataSource = openSource(stepModel.getSource())) { @@ -137,6 +139,7 @@ public class Start extends ExportUIActionSupport { } } + progressModel.incrementsCurrentStep(); sendMessage(t("observe.actions.operation.message.done", new Date())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1f63ebe64752525a37f86c9002e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1f63ebe64752525a37f86c9002e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: use beanType instead of mainDtoType (for open data this is always the same, so...
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 946cc60c by tchemit at 2019-09-16T11:05:56Z use beanType instead of mainDtoType (for open data this is always the same, so no need to add this overlay here) - - - - - de1a175d by tchemit at 2019-09-16T11:23:20Z more fix on admin api - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - 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/ConfigUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Close.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Open.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== @@ -180,32 +180,18 @@ public class AdminUIHandler implements UIHandler<AdminUI> { AdminUIModel model = ui.getModel(); - if (oldStep == null - && newStep == AdminStep.CONFIG - && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) { - - ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); + if (oldStep == null && newStep == AdminStep.CONFIG && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) { model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.left.storage")); model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.right.storage")); -// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel())); -// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); - } - if (oldStep == null - && newStep == AdminStep.CONFIG - && model.containsOperation(AdminStep.EXPORT_DATA)) { - - ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); + if (oldStep == null && newStep == AdminStep.CONFIG && model.containsOperation(AdminStep.EXPORT_DATA)) { model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.exportSource.storage")); model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.exportTarget.storage")); -// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel())); -// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); - } if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) { @@ -238,7 +224,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.ACTIVITY_LONGLINE_PAIRING) == WizardState.PENDING) { ActivityLonglinePairingUI tabUI = (ActivityLonglinePairingUI) ui.getStepUI(AdminStep.ACTIVITY_LONGLINE_PAIRING); - tabUI.getPrepare().doClick(); + SwingUtilities.invokeLater(tabUI.getPrepare()::doClick); } } @@ -256,7 +242,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) { ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE); - tabUI.getStart().doClick(); + SwingUtilities.invokeLater(tabUI.getStart()::doClick); } } @@ -265,7 +251,11 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) { SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); - SwingUtilities.invokeLater(tabUI.getStart()::doClick); + if (tabUI.getStepModel().isLocalSourceNeedSave()) { + SwingUtilities.invokeLater(tabUI.getStart()::doClick); + } else { + SwingUtilities.invokeLater(tabUI.getContinueAction()::doClick); + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java ===================================== @@ -96,8 +96,7 @@ public class ConfigModel extends AdminActionModel { @Override public void validate() { super.validate(); - ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid()); - ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep()); + ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep()); } }; @@ -126,8 +125,7 @@ public class ConfigModel extends AdminActionModel { @Override public void validate() { super.validate(); - ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid()); - ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep()); + ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep()); } }; centralSourceModel.setLabelPrefix(n("observe.storage.config.referentiel.storage")); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java ===================================== @@ -46,7 +46,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa UIHelper.setLayerUI(ui.getConfig(), parentUI.getConfigBlockLayerUI()); UIHelper.setLayerUI(ui.getContent(), null); AdminUIModel model = ui.getModel(); - model.addPropertyChangeListener("operations", e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA)); + model.addPropertyChangeListener(AdminUIModel.OPERATIONS_PROPERTY_NAME, e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA)); + ui.getModel().getConfigModel().addPropertyChangeListener(AdminUIModel.VALID_STEP_PROPERTY_NAME, e-> model.validate()); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Close.java ===================================== @@ -87,7 +87,7 @@ public class Close extends ContentUIActionSupport<ContentOpenableUI> { @Override protected void defaultInit(InputMap inputMap, ActionMap actionMap) { - Class dtoType = getUi().getModel().getMainDtoType(); + Class dtoType = getUi().getModel().getBeanType(); setTooltipText(t("observe.action.close.open.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType))); super.defaultInit(inputMap, actionMap); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Open.java ===================================== @@ -74,7 +74,7 @@ public class Open extends ContentUIActionSupport<ContentOpenableUI> { @Override protected void defaultInit(InputMap inputMap, ActionMap actionMap) { - Class dtoType = getUi().getModel().getMainDtoType(); + Class dtoType = getUi().getModel().getBeanType(); setTooltipText(t("observe.data.Openable.action.reopen.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType))); super.defaultInit(inputMap, actionMap); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1587b283dd6d5d13f9b7590759… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1587b283dd6d5d13f9b7590759… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Une marée provoque un dépassement mémoire et/ou a un souci de...
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1587b283 by tchemit at 2019-09-16T10:38:25Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -160,7 +160,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.17</observeToolkitVersion> + <observeToolkitVersion>4.18</observeToolkitVersion> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1587b283dd6d5d13f9b7590759c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1587b283dd6d5d13f9b7590759c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL] Une marée provoque un dépassement mémoire et/ou a un souci de...
by Tony CHEMIT Sept. 16, 2019

Sept. 16, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 548c0023 by tchemit at 2019-09-16T09:52:08Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.19</observeToolkitVersion> + <observeToolkitVersion>3.7.20</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/548c00233a7c70bc4bd6d57d739… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/548c00233a7c70bc4bd6d57d739… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix a selection node in model
by Tony CHEMIT Sept. 12, 2019

Sept. 12, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c053acc2 by tchemit at 2019-09-12T11:20:14Z fix a selection node in model - - - - - bf65b703 by tchemit at 2019-09-12T11:23:28Z Table actions are enabled even if there is no data in table... - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -128,6 +128,10 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e getModel().addPropertyChangeListener(ContentTableUIModel.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue())); + ui.getSelectFirstTableEntry().setEnabled(false); + ui.getSelectPreviousTableEntry().setEnabled(false); + ui.getSelectNextTableEntry().setEnabled(false); + ui.getSelectLastTableEntry().setEnabled(false); SelectFirst.init(ui, ui.getSelectFirstTableEntry(), SelectFirst.class); SelectPrevious.init(ui, ui.getSelectPreviousTableEntry(), SelectPrevious.class); SelectNext.init(ui, ui.getSelectNextTableEntry(), SelectNext.class); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineUIModel.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.client.ui.content.data.ll.observation; * #L% */ +import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.navigation.model.select.ObserveSelectNode; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -47,6 +49,11 @@ public class BranchlineUIModel extends ContentSimpleUIModel<BranchlineDto> { setAddMessageOnOpen(false); } + @Override + protected ObserveSelectNode<?> computeSelectNode() { + return ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityObsSet(); + } + public BranchlineDto getBranchline() { return branchlineDto; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6d5a1f942734ae9f9680ec6d6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6d5a1f942734ae9f9680ec6d6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT Sept. 12, 2019

Sept. 12, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6d5a1f9 by tchemit at 2019-09-12T10:51:27Z update changelog [skip ci] - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/958566-artifacts.json - .mvn/gitlab-cache/milestones/958566-issues.json - .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/921497-issues.json ===================================== @@ -243,7 +243,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 3, 2019 8:26:36 PM", + "updatedAt": "Aug 5, 2019 11:09:56 PM", "createdAt": "Jul 29, 2019 3:10:40 PM", "closedAt": "Aug 3, 2019 8:26:36 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1370" @@ -430,7 +430,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 31, 2019 2:42:43 PM", + "updatedAt": "Aug 9, 2019 9:05:15 PM", "createdAt": "Jul 18, 2019 3:17:25 PM", "closedAt": "Jul 26, 2019 3:06:43 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1358" @@ -492,7 +492,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 5, 2019 1:16:49 AM", + "updatedAt": "Aug 5, 2019 11:09:54 PM", "createdAt": "Jul 29, 2019 3:17:42 PM", "closedAt": "Aug 5, 2019 1:15:20 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1371" @@ -545,7 +545,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 1, + "userNotesCount": 2, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -554,7 +554,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 4, 2019 4:48:52 PM", + "updatedAt": "Aug 5, 2019 11:09:55 PM", "createdAt": "Jul 29, 2019 1:05:44 PM", "closedAt": "Aug 4, 2019 4:48:52 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1369" @@ -802,7 +802,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 4, 2019 4:21:49 PM", + "updatedAt": "Aug 5, 2019 11:09:55 PM", "createdAt": "Jul 26, 2019 3:50:33 PM", "closedAt": "Aug 4, 2019 4:21:49 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1368" @@ -985,7 +985,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 5, 2019 1:17:09 AM", + "updatedAt": "Aug 9, 2019 9:05:15 PM", "createdAt": "Jun 12, 2019 3:44:04 PM", "closedAt": "Aug 5, 2019 1:17:09 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1332" ===================================== .mvn/gitlab-cache/milestones/958566-artifacts.json ===================================== @@ -1 +1,12 @@ -[] \ No newline at end of file +[ + { + "name": "Application", + "filename": "observe-7.1.1.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.1.1/observe-7.1.1.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.1.1.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.1.1/observe-7.1.1.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566-issues.json ===================================== @@ -1 +1,125 @@ -[] \ No newline at end of file +[ + { + "id": 24314624, + "iid": 1374, + "projectId": 2722779, + "title": "[SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d\u0027une espèce", + "description": "Connecté à 2 bases centrales en mode serveur (même serveur Tomcat, même serveur PG), la seule différence entre ces 2 bases (clone l\u0027une de l\u0027autre) est la mise à jour d\u0027un paramètre sur une espèce (YTL).\n\nEn voulant mettre à jour cette espèce dans la base cible :\n\n```\n30-Aug-2019 10:03:09.879 SEVERE [ajp-nio-8009-exec-26] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [default] in context with path [/observeweb] threw exception\n org.debux.webmotion.server.WebMotionException: Error during invoke method for action fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.ReferentialSynchronizeServiceRestApi on method executeSqlsRequests\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:283)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\tat sun.reflect.GeneratedMethodAccessor205.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processFilter(ExecutorMethodInvokerHandler.java:310)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:222)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler.handle(ExecutorMethodInvokerHandler.java:120)\n\tat org.debux.webmotion.server.WebMotionMainHandler.chainHandlers(WebMotionMainHandler.java:270)\n\tat org.debux.webmotion.server.WebMotionMainHandler.handleExecutors(WebMotionMainHandler.java:260)\n\tat org.debux.webmotion.server.WebMotionMainHandler.handle(WebMotionMainHandler.java:196)\n\tat org.debux.webmotion.server.WebMotionServer.doAction(WebMotionServer.java:159)\n\tat org.debux.webmotion.server.WebMotionServer.doFilter(WebMotionServer.java:136)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:200)\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\n\tat org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:678)\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\n\tat org.apache.coyote.ajp.AjpProcessor.service(AjpProcessor.java:394)\n\tat org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\n\tat org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:836)\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1747)\n\tat org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\n\tat java.lang.Thread.run(Thread.java:748)\nCaused by: java.lang.reflect.InvocationTargetException\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\t... 34 more\nCaused by: org.nuiton.topia.persistence.TopiaException: Could not execute sql code\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:168)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScript(ObserveTopiaPersistenceContext.java:179)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScripts(ObserveTopiaPersistenceContext.java:192)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal.executeSqlsRequests(ReferentialSynchronizeServiceLocal.java:66)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy200.executeSqlsRequests(Unknown Source)\n\tat fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.GeneratedReferentialSynchronizeServiceRestApi.executeSqlsRequests(GeneratedReferentialSynchronizeServiceRestApi.java:45)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\t... 27 more\nCaused by: org.hibernate.exception.SQLGrammarException: error executing work\n\tat org.hibernate.exception.internal.SQLStateConversionDelegate.convert(SQLStateConversionDelegate.java:103)\n\tat org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:325)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2462)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2447)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:166)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScript(ObserveTopiaPersistenceContext.java:179)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScripts(ObserveTopiaPersistenceContext.java:192)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal.executeSqlsRequests(ReferentialSynchronizeServiceLocal.java:66)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy200.executeSqlsRequests(Unknown Source)\n\tat fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.GeneratedReferentialSynchronizeServiceRestApi.executeSqlsRequests(GeneratedReferentialSynchronizeServiceRestApi.java:45)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\tat sun.reflect.GeneratedMethodAccessor205.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\t... 27 more\nCaused by: org.postgresql.util.PSQLException: Unterminated dollar quote started at position 0 in SQL $$_DELETE FROM OBSERVE_COMMON.ocean_species WHERE ocean \u003d \u0027fr.ird.observe.entities.referentiel.Species#1239832684892#0.9272035028442585\u0027;. Expected terminating $$\n\tat org.postgresql.core.Parser.checkParsePosition(Parser.java:1273)\n\tat org.postgresql.core.Parser.parseSql(Parser.java:1173)\n\tat org.postgresql.core.Parser.replaceProcessing(Parser.java:1125)\n\tat org.postgresql.core.CachedQueryCreateAction.create(CachedQueryCreateAction.java:40)\n\tat org.postgresql.core.QueryExecutorBase.createQueryByKey(QueryExecutorBase.java:314)\n\tat org.postgresql.core.QueryExecutorBase.createQuery(QueryExecutorBase.java:325)\n\tat org.postgresql.jdbc.PgConnection.createQuery(PgConnection.java:161)\n\tat org.postgresql.jdbc.PgStatement.addBatch(PgStatement.java:723)\n\tat com.zaxxer.hikari.pool.HikariProxyStatement.addBatch(HikariProxyStatement.java)\n\tat org.nuiton.topia.persistence.script.SqlScriptConsumer.executeByBatch(SqlScriptConsumer.java:198)\n\tat org.nuiton.topia.persistence.script.SqlScriptConsumer.execute(SqlScriptConsumer.java:138)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport$HibernateTopiaSqlWork.execute(HibernateTopiaSqlSupport.java:91)\n\tat org.hibernate.jdbc.WorkExecutor.executeWork(WorkExecutor.java:37)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2443)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2440)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:320)\n\t... 54 more\n\n\n```", + "labels": [ + "Anomalie", + "Immédiat", + "À corriger" + ], + "milestone": { + "id": 958566, + "iid": 148, + "projectId": 2722779, + "groupId": 0, + "title": "7.1.1", + "dueDate": "Sep 12, 2019 2:00:00 AM", + "startDate": "Aug 2, 2019 2:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Sep 12, 2019 12:47:48 PM", + "createdAt": "Aug 30, 2019 10:08:24 AM", + "closedAt": "Sep 12, 2019 12:47:43 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1374" + }, + { + "id": 24172420, + "iid": 1373, + "projectId": 2722779, + "title": "[LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs", + "description": "En mode serveur, cette marée ne peut pas être insérée en base centrale car elle semble provoquer un dépassement mémoire.\n\nMarée : [obstuna-local-2019-06-11--15-28-31-vf.sql.gz](/uploads/3b3498860d332631f3899d508e1786df/obstuna-local-2019-06-11--15-28-31-vf.sql.gz)\n\nLog serveur : [catalina.out](/uploads/8bc861905549457149f82689be503b3b/catalina.out)", + "labels": [ + "Anomalie", + "Haut", + "Palangre" + ], + "milestone": { + "id": 958566, + "iid": 148, + "projectId": 2722779, + "groupId": 0, + "title": "7.1.1", + "dueDate": "Sep 12, 2019 2:00:00 AM", + "startDate": "Aug 2, 2019 2:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": true, + "discussionLocked": true, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Sep 12, 2019 12:48:43 PM", + "createdAt": "Aug 26, 2019 6:00:15 PM", + "closedAt": "Sep 12, 2019 12:19:00 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1373" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566.json ===================================== @@ -4,7 +4,7 @@ "projectId": 2722779, "groupId": 0, "title": "7.1.1", - "dueDate": "Aug 3, 2019 2:00:00 AM", + "dueDate": "Sep 12, 2019 2:00:00 AM", "startDate": "Aug 2, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-08-05 01:18. + * Last generated at 2019-09-12 12:50. ## Version [8.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/146) @@ -222,6 +222,18 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.1.1](https://gitlab.com/ultreiaio/ird-observe/milestones/148) + +**Closed at 2019-09-12.** + +### Download +* [Application (observe-7.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.1.1.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1373]](https://gitlab.com/ultreiaio/ird-observe/issues/1373) **[LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1374]](https://gitlab.com/ultreiaio/ird-observe/issues/1374) **[SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.1.0](https://gitlab.com/ultreiaio/ird-observe/milestones/147) **Closed at 2019-08-03.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6d5a1f942734ae9f9680ec6d60… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6d5a1f942734ae9f9680ec6d60… You're receiving this email because of your account on gitlab.com.

1 0