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

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: Les messages d'erreur sur référentiels désactivés rendent difficile l'édition…
by Tony CHEMIT Oct. 21, 2018

Oct. 21, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ea630890 by Tony CHEMIT at 2018-10-20T23:39:40Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (gros nettoyage des validateurs) - - - - - 47cd1be2 by Tony CHEMIT at 2018-10-20T23:39:42Z [PS] Lorsque l'on enregistre le formulaire FOB depuis le 2d onglet, le focus revient sur le 1er onglet - Closes #1158 - - - - - 648fdcc1 by Tony CHEMIT at 2018-10-20T23:39:42Z UI de traduction : recherche de libellé - Closes #1156 - - - - - 2a7b2ef4 by Tony CHEMIT at 2018-10-21T10:51:39Z update pom + fix a focus problem - - - - - 30 changed files: - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java - dto/pom.xml - dto/src/main/java/fr/ird/observe/binder/referential/common/CountryDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/DataQualityDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/FpaZoneDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearCaracteristicDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearCaracteristicTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/HarbourDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/OceanDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/OrganismDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/ProgramDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SexDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/ShipOwnerDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SizeMeasureTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesGroupDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesGroupReleaseModeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesListDtoReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d293972c9f0282bfca0f7681fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d293972c9f0282bfca0f7681fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Lorsque l'on enregistre le formulaire FOB depuis le 2d onglet, le focus…
by Tony CHEMIT Oct. 20, 2018

Oct. 20, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d293972c by Tony CHEMIT at 2018-10-20T08:29:27Z [PS] Lorsque l'on enregistre le formulaire FOB depuis le 2d onglet, le focus revient sur le 1er onglet - Closes #1158 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== @@ -1196,7 +1196,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return getModel().getBean(); } - void openedUI() { + protected void openedUI() { SwingUtilities.invokeLater(this::forceGrabFocusOnForm); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -8,12 +8,12 @@ * 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>. @@ -27,6 +27,7 @@ import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.content.ContentMode; +import fr.ird.observe.client.ui.content.ContentUI; import fr.ird.observe.client.ui.content.ContentUIHandler; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.client.ui.content.ObserveLayoutFocusTraversalPolicy; @@ -193,8 +194,12 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, if (mode != ContentMode.READ) { getUi().startEdit(null); } + } + @Override + protected void openedUI() { SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); + super.openedUI(); } @Override @@ -213,14 +218,14 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getUi().getValidator().setContext(contextName); if (create) { addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(FloatingObjectDto.class), - t("observe.common.FloatingObjectDto.message.creating")); + NuitonValidatorScope.INFO, + getTypeI18nKey(FloatingObjectDto.class), + t("observe.common.FloatingObjectDto.message.creating")); } else { addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(FloatingObjectDto.class), - t("observe.common.FloatingObjectDto.message.updating")); + NuitonValidatorScope.INFO, + getTypeI18nKey(FloatingObjectDto.class), + t("observe.common.FloatingObjectDto.message.updating")); } super.startEditUI(FloatingObjectUI.BINDING_COMMENT_MODEL); contentUIModel.setModified(create); @@ -263,11 +268,19 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, FloatingObjectReference reference = DtoModelHelper.fromDataDto(FloatingObjectDto.class).toReference(getDecoratorService().getReferentialLocale(), bean); node = treeHelper.addFloatingObject(parentNode, reference); stopEditUI(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); if (refresh) { - treeHelper.selectSafeNode(node); + try { + treeHelper.selectSafeNode(node); + } finally { + if (selectedIndex > 0) { + // use new ui! + FloatingObjectUI content = ObserveSwingApplicationContext.get().getContentUIManager().getContent(); + SwingUtilities.invokeLater(() -> content.getMainTabbedPane().setSelectedIndex(selectedIndex)); + } + } } } else { - treeHelper.refreshSelectedNode(); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d293972c9f0282bfca0f7681fde… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d293972c9f0282bfca0f7681fde… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Les messages d'erreur sur référentiels désactivés rendent difficile l'édition…
by Tony CHEMIT Oct. 19, 2018

Oct. 19, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1e608253 by Tony CHEMIT at 2018-10-19T14:23:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (gros nettoyage des validateurs) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUI.jaxx - client/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java - dto/pom.xml - dto/src/main/java/fr/ird/observe/binder/referential/common/CountryDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/DataQualityDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/FpaZoneDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearCaracteristicDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearCaracteristicTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/GearDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/HarbourDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/OceanDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/OrganismDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/ProgramDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SexDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/ShipOwnerDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SizeMeasureTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesGroupDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesGroupReleaseModeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesListDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/VesselDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/VesselSizeCategoryDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/VesselTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/WeightMeasureTypeDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/longline/BaitHaulingStatusDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/longline/BaitSettingStatusDtoReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e608253db37bc1ca06bf9b9fd2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e608253db37bc1ca06bf9b9fd2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 9 commits: [PS] Place du formulaire libération dans l'arbre - Closes #1154
by Tony CHEMIT Oct. 19, 2018

Oct. 19, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1f23b7d6 by Tony CHEMIT at 2018-10-19T01:19:58Z [PS] Place du formulaire libération dans l'arbre - Closes #1154 - - - - - 43f47606 by Tony CHEMIT at 2018-10-19T01:20:00Z Script update-obstuna.* pourrait être renommé...- Closes #1146 - - - - - e2f051c1 by Tony CHEMIT at 2018-10-19T01:20:00Z Nom du script de lancement .exe - Closes #1147 - - - - - 5287fbfe by Tony CHEMIT at 2018-10-19T01:20:01Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (mise en place de nouveaux validateurs générés \o/) - - - - - 158d4dad by Tony CHEMIT at 2018-10-19T01:20:01Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (nettoyage des validateurs) - - - - - 80c09dba by Tony CHEMIT at 2018-10-19T01:20:01Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation new jaxx api + move some package validation and gson) - - - - - 00519297 by Tony CHEMIT at 2018-10-19T01:20:01Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation du nouveau validateru généré pour le champs commentaire) - - - - - 642ca91a by Tony CHEMIT at 2018-10-19T01:20:02Z rename stash - - - - - 519ebdef by Tony CHEMIT at 2018-10-19T01:20:02Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation nouvelle api i18n dans jaxx) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/go.bat - client/src/main/assembly/dist/go.sh - − client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/create-server.bat - − client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/drop-server.bat - − client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/update-security-server.bat - − client/src/main/assembly/dist/obstuna-admin/update-server.bat - client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt - client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh - + client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - + client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fc326d1f431e0d1dcb69987ca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fc326d1f431e0d1dcb69987ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 8 commits: Script update-obstuna.* pourrait être renommé...- Closes #1146
by Tony CHEMIT Oct. 19, 2018

Oct. 19, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2986d0bb by Tony CHEMIT at 2018-10-19T01:13:09Z Script update-obstuna.* pourrait être renommé...- Closes #1146 - - - - - 3ab42faf by Tony CHEMIT at 2018-10-19T01:15:16Z Nom du script de lancement .exe - Closes #1147 - - - - - 4a4fb1d3 by Tony CHEMIT at 2018-10-19T01:15:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (mise en place de nouveaux validateurs générés \o/) - - - - - 851e7ee0 by Tony CHEMIT at 2018-10-19T01:15:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (nettoyage des validateurs) - - - - - 25b3069b by Tony CHEMIT at 2018-10-19T01:15:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation new jaxx api + move some package validation and gson) - - - - - aa56bbdb by Tony CHEMIT at 2018-10-19T01:15:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation du nouveau validateru généré pour le champs commentaire) - - - - - 92acb6e8 by Tony CHEMIT at 2018-10-19T01:15:19Z rename stash - - - - - 1fc326d1 by Tony CHEMIT at 2018-10-19T01:15:19Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation nouvelle api i18n dans jaxx) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/go.bat - client/src/main/assembly/dist/go.sh - − client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/create-server.bat - − client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/drop-server.bat - − client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat - − client/src/main/assembly/dist/obstuna-admin/update-security-server.bat - − client/src/main/assembly/dist/obstuna-admin/update-server.bat - client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt - client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh - + client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - + client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04ef5afb130b1cc69f1c3b4a49… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04ef5afb130b1cc69f1c3b4a49… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: Les messages d'erreur sur référentiels désactivés rendent difficile l'édition…
by Tony CHEMIT Oct. 19, 2018

Oct. 19, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 273aa0a4 by Tony CHEMIT at 2018-10-17T02:52:03Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (mise en place de nouveaux validateurs générés \o/) - - - - - 057bbac2 by Tony CHEMIT at 2018-10-17T02:52:30Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (nettoyage des validateurs) - - - - - 034d0317 by Tony CHEMIT at 2018-10-17T22:42:35Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation new jaxx api + move some package validation and gson) - - - - - d3759f61 by Tony CHEMIT at 2018-10-18T07:41:18Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation du nouveau validateru généré pour le champs commentaire) - - - - - 699dca2f by Tony CHEMIT at 2018-10-18T22:36:38Z rename stash - - - - - 04ef5afb by Tony CHEMIT at 2018-10-19T01:07:00Z Les messages d'erreur sur référentiels désactivés rendent difficile l'édition des marées qui en usent - Closes #1153 (utilisation nouvelle api i18n dans jaxx) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionDeleteAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionGenerateAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bed7c052c5a0f7e8bc7b3ac92e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bed7c052c5a0f7e8bc7b3ac92e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Nom du script de lancement .exe - Closes #1147
by Tony CHEMIT Oct. 16, 2018

Oct. 16, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: bed7c052 by Tony CHEMIT at 2018-10-16T22:19:44Z Nom du script de lancement .exe - Closes #1147 - - - - - 22 changed files: - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/go.bat - client/src/main/assembly/dist/go.sh - client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/src/main/assembly/dist/scripts/postgresql/update.bat - client/src/main/assembly/dist/scripts/postgresql/update.sh - client/src/main/assembly/dist/scripts/server/create.bat - client/src/main/assembly/dist/scripts/server/create.sh - client/src/main/assembly/dist/scripts/server/drop.bat - client/src/main/assembly/dist/scripts/server/drop.sh - client/src/main/assembly/dist/scripts/server/update-security.bat - client/src/main/assembly/dist/scripts/server/update-security.sh - client/src/main/assembly/dist/scripts/server/update.bat - client/src/main/assembly/dist/scripts/server/update.sh - client/src/main/assembly/dist/util/generate-id.bat - client/src/main/assembly/dist/util/generate-id.sh Changes: ===================================== client/pom.xml ===================================== @@ -851,6 +851,34 @@ <properties> <devMode>false</devMode> </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> + <executions> + + <execution> + <id>Prepare release files</id> + <phase>integration-test</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/observe.jar"/> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/observe.exe"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> </profile>  ===================================== client/src/main/assembly/bin.xml ===================================== @@ -33,8 +33,8 @@ <outputDirectory/> <fileMode>0755</fileMode> <includes> - <include>${project.build.finalName}.jar</include> - <include>${project.build.finalName}.exe</include> + <include>observe.jar</include> + <include>observe.exe</include> </includes> </fileSet> ===================================== client/src/main/assembly/dist/go.bat ===================================== @@ -1 +1 @@ -java -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file +java -jar observe.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== client/src/main/assembly/dist/go.sh ===================================== @@ -24,4 +24,4 @@ ### #!/bin/sh -java -jar ${project.build.finalName}.jar "$@" \ No newline at end of file +java -jar observe.jar "$@" \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base obstuna (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base server (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id %1 %2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id %1 %2 \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour générer des topia ids -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id $1 $2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id $1 $2 \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bed7c052c5a0f7e8bc7b3ac92ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bed7c052c5a0f7e8bc7b3ac92ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Nom du script de lancement .exe - Closes #1147
by Tony CHEMIT Oct. 16, 2018

Oct. 16, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4770b8b4 by Tony CHEMIT at 2018-10-16T22:20:10Z Nom du script de lancement .exe - Closes #1147 - - - - - 22 changed files: - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/go.bat - client/src/main/assembly/dist/go.sh - client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/src/main/assembly/dist/scripts/postgresql/update.bat - client/src/main/assembly/dist/scripts/postgresql/update.sh - client/src/main/assembly/dist/scripts/server/create.bat - client/src/main/assembly/dist/scripts/server/create.sh - client/src/main/assembly/dist/scripts/server/drop.bat - client/src/main/assembly/dist/scripts/server/drop.sh - client/src/main/assembly/dist/scripts/server/update-security.bat - client/src/main/assembly/dist/scripts/server/update-security.sh - client/src/main/assembly/dist/scripts/server/update.bat - client/src/main/assembly/dist/scripts/server/update.sh - client/src/main/assembly/dist/util/generate-id.bat - client/src/main/assembly/dist/util/generate-id.sh Changes: ===================================== client/pom.xml ===================================== @@ -859,6 +859,34 @@ <properties> <devMode>false</devMode> </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> + <executions> + + <execution> + <id>Prepare release files</id> + <phase>integration-test</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/observe.jar"/> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/observe.exe"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> </profile>  ===================================== client/src/main/assembly/bin.xml ===================================== @@ -33,8 +33,8 @@ <outputDirectory/> <fileMode>0755</fileMode> <includes> - <include>${project.build.finalName}.jar</include> - <include>${project.build.finalName}.exe</include> + <include>observe.jar</include> + <include>observe.exe</include> </includes> </fileSet> ===================================== client/src/main/assembly/dist/go.bat ===================================== @@ -1 +1 @@ -java -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file +java -jar observe.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== client/src/main/assembly/dist/go.sh ===================================== @@ -24,4 +24,4 @@ ### #!/bin/sh -java -jar ${project.build.finalName}.jar "$@" \ No newline at end of file +java -jar observe.jar "$@" \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base obstuna (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base server (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id %1 %2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id %1 %2 \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour générer des topia ids -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id $1 $2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id $1 $2 \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4770b8b4b1748d5ffbdd19f8e07… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4770b8b4b1748d5ffbdd19f8e07… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Script update-obstuna.* pourrait être renommé...- Closes #1146
by Tony CHEMIT Oct. 16, 2018

Oct. 16, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a10cdcd8 by Tony CHEMIT at 2018-10-16T22:00:06Z Script update-obstuna.* pourrait être renommé...- Closes #1146 - - - - - 28 changed files: - client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt - client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh - client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql - client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/04_create-postgis-4-activity-longine.sql - client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql → client/src/main/assembly/dist/scripts/postgresql/extra/05_function_enhanced_sets_school_types.sql - client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update.bat - client/src/main/assembly/dist/obstuna-admin/update-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update.sh - + client/src/main/assembly/dist/scripts/server/README.txt - client/src/main/assembly/dist/obstuna-admin/create-server.bat → client/src/main/assembly/dist/scripts/server/create.bat - client/src/main/assembly/dist/obstuna-admin/create-server.sh → client/src/main/assembly/dist/scripts/server/create.sh - client/src/main/assembly/dist/obstuna-admin/drop-server.bat → client/src/main/assembly/dist/scripts/server/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-server.sh → client/src/main/assembly/dist/scripts/server/drop.sh - client/src/main/assembly/dist/obstuna-admin/update-security-server.bat → client/src/main/assembly/dist/scripts/server/update-security.bat - client/src/main/assembly/dist/obstuna-admin/update-security-server.sh → client/src/main/assembly/dist/scripts/server/update-security.sh - client/src/main/assembly/dist/obstuna-admin/update-server.bat → client/src/main/assembly/dist/scripts/server/update.bat - client/src/main/assembly/dist/obstuna-admin/update-server.sh → client/src/main/assembly/dist/scripts/server/update.sh - src/site/markdown/install-serverPG.md Changes: ===================================== client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt ===================================== @@ -8,80 +8,36 @@ Lancer le script (sh) puis -./create-obstuna.sh +./create.sh ou -./create-obstuna.bat +./create.bat Pour mettre à jour une base obstuna v1 vers vXXX ------------------------------------------------ -./update-obstuna.sh +./update.sh ou -./update-obstuna.bat +./update.bat Pour mettre à jour la sécurité sur une base obstuna --------------------------------------------------- -./update-security-obstuna.sh +./update-security.sh ou -./update-security-obstuna.bat +./update-security.bat Pour vider une base obstuna --------------------------- -./drop-obstuna.sh +./drop.sh ou -./drop-obstuna.bat - - -Pour créer une nouvelle base via server ------------------------------------------- - -Lancer le script (sh) - -./createdb/create-ird_obstuna.sh - -puis - -./create-server.sh - -ou - -./create-server.bat - - -Pour mettre à jour une base via serveur ---------------------------------------- - -./update-server.sh - -ou - -./update-server.bat - -Pour mettre à jour la sécurité sur une base via serveur -------------------------------------------------------- - -./update-security-server.sh - -ou - -./update-security-server.bat - -Pour vider une base via serveur -------------------------------- - -./drop-server.sh - -ou - -./drop-server.bat +./drop.bat ===================================== client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh ===================================== @@ -33,4 +33,4 @@ # Usage : # ./create-ird_obstuna.sh -./create-empty-obstuna.sh obstuna admin "adamiano lfloch pcauquil utilisateur referentiel" +create-empty-obstuna.sh obstuna admin "adamiano lfloch pcauquil utilisateur referentiel" ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh ===================================== @@ -33,4 +33,4 @@ # Usage : # ./create-test_obstuna.sh -./create-empty-obstuna.sh obstuna-test admin "technicien1 technicien2 technicien3 utilisateur referentiel" +create-empty-obstuna.sh obstuna-test admin "technicien1 technicien2 technicien3 utilisateur referentiel" ===================================== client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/04_create-postgis-4-activity-longine.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql → client/src/main/assembly/dist/scripts/postgresql/extra/05_function_enhanced_sets_school_types.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== ===================================== client/src/main/assembly/dist/scripts/server/README.txt ===================================== @@ -0,0 +1,26 @@ +Pour mettre à jour une base via serveur +--------------------------------------- + +./update.sh + +ou + +./update.bat + +Pour mettre à jour la sécurité sur une base via serveur +------------------------------------------------------- + +./update-security.sh + +ou + +./update-security.bat + +Pour vider une base via serveur +------------------------------- + +./drop.sh + +ou + +./drop.bat ===================================== client/src/main/assembly/dist/obstuna-admin/create-server.bat → client/src/main/assembly/dist/scripts/server/create.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-server.sh → client/src/main/assembly/dist/scripts/server/create.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-server.bat → client/src/main/assembly/dist/scripts/server/drop.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-server.sh → client/src/main/assembly/dist/scripts/server/drop.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-server.bat → client/src/main/assembly/dist/scripts/server/update-security.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-server.sh → client/src/main/assembly/dist/scripts/server/update-security.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-server.bat → client/src/main/assembly/dist/scripts/server/update.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-server.sh → client/src/main/assembly/dist/scripts/server/update.sh ===================================== ===================================== src/site/markdown/install-serverPG.md ===================================== @@ -41,7 +41,7 @@ Il existe une script qui permet de faire ça en tant qu'utilisateur *postgres*. ``` sudo su postgres - (cd obstuna-admin/createdb ; ./create-ird_obstuna.sh) + (cd scripts/postgresl/createdb ; ./create-ird_obstuna.sh) ``` Ce script va créer : @@ -56,7 +56,7 @@ Ce script a été conçu pour la configuration de l'ird, il ne fait qu'appeler un autre script bash avec les bons paramètres. ``` - obstuna-admin/createdb/create-empty-obstuna.sh + scripts/postgresl/createdb/create-empty.sh ``` Il est donc très facile d'écrire un nouveau script de configuration avec le @@ -71,7 +71,7 @@ Par exemple pour créer une base avec la configuration suivante on lance la commande : ``` - ( cd obstuna-admin/createdb ; ./create-empty-obstuna.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") + ( cd scripts/postgresl/createdb ; ./create-empty.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") ``` ### Phase 1 (base de test) @@ -81,7 +81,7 @@ un autre script : ``` sudo su postgres - (cd obstuna-admin/createdb ; ./create-test_obstuna.sh) + (cd scripts/postgresl/createdb ; ./create-test_obstuna.sh) ``` Cela crée une base avec la configuration suivante : @@ -130,12 +130,12 @@ Il suffit enfin de lancer l'application en mode *création de base obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./create-obstuna.sh) + (cd scripts/postgresl ; ./create.sh) ``` ou ``` - ./obstuna-admin/create-obstuna.bat + ./scripts/postgresl/create.bat ``` Cela va effectuer les opérations suivantes après configuration de la base cible, @@ -146,7 +146,7 @@ de la base d'import de référentiel et des rôles de sécurité : - remplir le référentiel à partir de celui d'une autre base obstuna à jour (topia-service-migration) - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin create** +Note : le script appelle l'application avec l'action **--admin create** ## Mise à jour d'une base obstuna @@ -155,12 +155,12 @@ ObServe, il suffit de lancer l'application en mode *mise à jour obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./update-obstuna.sh) + (cd scripts/postgresl ; ./update.sh) ``` ou ``` - ./obstuna-admin/update-obstuna.bat + ./scripts/postgresl/update.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité : @@ -168,7 +168,7 @@ cible et des rôles de sécurité : - mettre à jour le schéma et les données via le service de migration intégré (topia) - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin update** +Note : le script appelle l'application avec l'action **--admin update** ## Mise à jour de la sécurité @@ -184,19 +184,19 @@ de lancer Observe en mode *mise à jour sécurité obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./update-security-obstuna.sh) + (cd scripts/postgresl ; ./update-security.sh) ``` ou ``` - ./obstuna-admin/update-security-obstuna.bat + ./scripts/postgresl/update-security.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité : - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin security** +Note : le script appelle l'application avec l'action **--admin security** ## Vider une base obstuna @@ -204,19 +204,19 @@ Pour vider une base obstuna (ne vue de la recréer par exemple), il suffit de lancer ObServe en mode *suppression obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./drop-obstuna.sh) + (cd scripts/postgresl ; ./drop.sh) ``` ou ``` - ./obstuna-admin/drop-obstuna.bat + ./scripts/postgresl/drop.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible : - supprimer toutes les tables gérer de la base -Note : le script appelle l'application avec l'action **--obstuna-admin drop** +Note : le script appelle l'application avec l'action **--admin drop** ## Appliquer des scripts sql supplémentaires @@ -225,7 +225,7 @@ Depuis la version 3.0, il est possible de lancer sur la base de scripts sql supp On lance ensuite la commande ``` - (cd obstuna-admin; ./apply-extra.sh) + (cd scripts/postgresl ; ./apply-extra.sh) ``` Le script demande View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a10cdcd815999ebe8fc40892c06… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a10cdcd815999ebe8fc40892c06… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Script update-obstuna.* pourrait être renommé...- Closes #1146
by Tony CHEMIT Oct. 16, 2018

Oct. 16, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 28ed23ea by Tony CHEMIT at 2018-10-16T21:59:29Z Script update-obstuna.* pourrait être renommé...- Closes #1146 - - - - - 28 changed files: - client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt - client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh - client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql - client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/04_create-postgis-4-activity-longine.sql - client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql → client/src/main/assembly/dist/scripts/postgresql/extra/05_function_enhanced_sets_school_types.sql - client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update.bat - client/src/main/assembly/dist/obstuna-admin/update-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update.sh - + client/src/main/assembly/dist/scripts/server/README.txt - client/src/main/assembly/dist/obstuna-admin/create-server.bat → client/src/main/assembly/dist/scripts/server/create.bat - client/src/main/assembly/dist/obstuna-admin/create-server.sh → client/src/main/assembly/dist/scripts/server/create.sh - client/src/main/assembly/dist/obstuna-admin/drop-server.bat → client/src/main/assembly/dist/scripts/server/drop.bat - client/src/main/assembly/dist/obstuna-admin/drop-server.sh → client/src/main/assembly/dist/scripts/server/drop.sh - client/src/main/assembly/dist/obstuna-admin/update-security-server.bat → client/src/main/assembly/dist/scripts/server/update-security.bat - client/src/main/assembly/dist/obstuna-admin/update-security-server.sh → client/src/main/assembly/dist/scripts/server/update-security.sh - client/src/main/assembly/dist/obstuna-admin/update-server.bat → client/src/main/assembly/dist/scripts/server/update.bat - client/src/main/assembly/dist/obstuna-admin/update-server.sh → client/src/main/assembly/dist/scripts/server/update.sh - src/site/markdown/install-serverPG.md Changes: ===================================== client/src/main/assembly/dist/obstuna-admin/README.txt → client/src/main/assembly/dist/scripts/postgresql/README.txt ===================================== @@ -8,80 +8,36 @@ Lancer le script (sh) puis -./create-obstuna.sh +./create.sh ou -./create-obstuna.bat +./create.bat Pour mettre à jour une base obstuna v1 vers vXXX ------------------------------------------------ -./update-obstuna.sh +./update.sh ou -./update-obstuna.bat +./update.bat Pour mettre à jour la sécurité sur une base obstuna --------------------------------------------------- -./update-security-obstuna.sh +./update-security.sh ou -./update-security-obstuna.bat +./update-security.bat Pour vider une base obstuna --------------------------- -./drop-obstuna.sh +./drop.sh ou -./drop-obstuna.bat - - -Pour créer une nouvelle base via server ------------------------------------------- - -Lancer le script (sh) - -./createdb/create-ird_obstuna.sh - -puis - -./create-server.sh - -ou - -./create-server.bat - - -Pour mettre à jour une base via serveur ---------------------------------------- - -./update-server.sh - -ou - -./update-server.bat - -Pour mettre à jour la sécurité sur une base via serveur -------------------------------------------------------- - -./update-security-server.sh - -ou - -./update-security-server.bat - -Pour vider une base via serveur -------------------------------- - -./drop-server.sh - -ou - -./drop-server.bat +./drop.bat ===================================== client/src/main/assembly/dist/obstuna-admin/apply-extra.sh → client/src/main/assembly/dist/scripts/postgresql/apply-extra.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh ===================================== @@ -33,4 +33,4 @@ # Usage : # ./create-ird_obstuna.sh -./create-empty-obstuna.sh obstuna admin "adamiano lfloch pcauquil utilisateur referentiel" +create-empty-obstuna.sh obstuna admin "adamiano lfloch pcauquil utilisateur referentiel" ===================================== client/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh ===================================== @@ -33,4 +33,4 @@ # Usage : # ./create-test_obstuna.sh -./create-empty-obstuna.sh obstuna-test admin "technicien1 technicien2 technicien3 utilisateur referentiel" +create-empty-obstuna.sh obstuna-test admin "technicien1 technicien2 technicien3 utilisateur referentiel" ===================================== client/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql → client/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql → client/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql → client/src/main/assembly/dist/scripts/postgresql/extra/04_create-postgis-4-activity-longine.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql → client/src/main/assembly/dist/scripts/postgresql/extra/05_function_enhanced_sets_school_types.sql ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-obstuna.bat → client/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-obstuna.sh → client/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== ===================================== client/src/main/assembly/dist/scripts/server/README.txt ===================================== @@ -0,0 +1,26 @@ +Pour mettre à jour une base via serveur +--------------------------------------- + +./update.sh + +ou + +./update.bat + +Pour mettre à jour la sécurité sur une base via serveur +------------------------------------------------------- + +./update-security.sh + +ou + +./update-security.bat + +Pour vider une base via serveur +------------------------------- + +./drop.sh + +ou + +./drop.bat ===================================== client/src/main/assembly/dist/obstuna-admin/create-server.bat → client/src/main/assembly/dist/scripts/server/create.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/create-server.sh → client/src/main/assembly/dist/scripts/server/create.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-server.bat → client/src/main/assembly/dist/scripts/server/drop.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/drop-server.sh → client/src/main/assembly/dist/scripts/server/drop.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-server.bat → client/src/main/assembly/dist/scripts/server/update-security.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-security-server.sh → client/src/main/assembly/dist/scripts/server/update-security.sh ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-server.bat → client/src/main/assembly/dist/scripts/server/update.bat ===================================== ===================================== client/src/main/assembly/dist/obstuna-admin/update-server.sh → client/src/main/assembly/dist/scripts/server/update.sh ===================================== ===================================== src/site/markdown/install-serverPG.md ===================================== @@ -41,7 +41,7 @@ Il existe une script qui permet de faire ça en tant qu'utilisateur *postgres*. ``` sudo su postgres - (cd obstuna-admin/createdb ; ./create-ird_obstuna.sh) + (cd scripts/postgresl/createdb ; ./create-ird_obstuna.sh) ``` Ce script va créer : @@ -56,7 +56,7 @@ Ce script a été conçu pour la configuration de l'ird, il ne fait qu'appeler un autre script bash avec les bons paramètres. ``` - obstuna-admin/createdb/create-empty-obstuna.sh + scripts/postgresl/createdb/create-empty.sh ``` Il est donc très facile d'écrire un nouveau script de configuration avec le @@ -71,7 +71,7 @@ Par exemple pour créer une base avec la configuration suivante on lance la commande : ``` - ( cd obstuna-admin/createdb ; ./create-empty-obstuna.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") + ( cd scripts/postgresl/createdb ; ./create-empty.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") ``` ### Phase 1 (base de test) @@ -81,7 +81,7 @@ un autre script : ``` sudo su postgres - (cd obstuna-admin/createdb ; ./create-test_obstuna.sh) + (cd scripts/postgresl/createdb ; ./create-test_obstuna.sh) ``` Cela crée une base avec la configuration suivante : @@ -130,12 +130,12 @@ Il suffit enfin de lancer l'application en mode *création de base obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./create-obstuna.sh) + (cd scripts/postgresl ; ./create.sh) ``` ou ``` - ./obstuna-admin/create-obstuna.bat + ./scripts/postgresl/create.bat ``` Cela va effectuer les opérations suivantes après configuration de la base cible, @@ -146,7 +146,7 @@ de la base d'import de référentiel et des rôles de sécurité : - remplir le référentiel à partir de celui d'une autre base obstuna à jour (topia-service-migration) - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin create** +Note : le script appelle l'application avec l'action **--admin create** ## Mise à jour d'une base obstuna @@ -155,12 +155,12 @@ ObServe, il suffit de lancer l'application en mode *mise à jour obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./update-obstuna.sh) + (cd scripts/postgresl ; ./update.sh) ``` ou ``` - ./obstuna-admin/update-obstuna.bat + ./scripts/postgresl/update.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité : @@ -168,7 +168,7 @@ cible et des rôles de sécurité : - mettre à jour le schéma et les données via le service de migration intégré (topia) - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin update** +Note : le script appelle l'application avec l'action **--admin update** ## Mise à jour de la sécurité @@ -184,19 +184,19 @@ de lancer Observe en mode *mise à jour sécurité obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./update-security-obstuna.sh) + (cd scripts/postgresl ; ./update-security.sh) ``` ou ``` - ./obstuna-admin/update-security-obstuna.bat + ./scripts/postgresl/update-security.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité : - appliquer la sécurité sur les rôles de la base -Note : le script appelle l'application avec l'action **--obstuna-admin security** +Note : le script appelle l'application avec l'action **--admin security** ## Vider une base obstuna @@ -204,19 +204,19 @@ Pour vider une base obstuna (ne vue de la recréer par exemple), il suffit de lancer ObServe en mode *suppression obstuna* via le raccourci suivant : ``` - (cd obstuna-admin ; ./drop-obstuna.sh) + (cd scripts/postgresl ; ./drop.sh) ``` ou ``` - ./obstuna-admin/drop-obstuna.bat + ./scripts/postgresl/drop.bat ``` Ce mode va effectuer les opérations suivantes après configuration de la base cible : - supprimer toutes les tables gérer de la base -Note : le script appelle l'application avec l'action **--obstuna-admin drop** +Note : le script appelle l'application avec l'action **--admin drop** ## Appliquer des scripts sql supplémentaires @@ -225,7 +225,7 @@ Depuis la version 3.0, il est possible de lancer sur la base de scripts sql supp On lance ensuite la commande ``` - (cd obstuna-admin; ./apply-extra.sh) + (cd scripts/postgresl ; ./apply-extra.sh) ``` Le script demande View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28ed23ea5ac4dbcfd598e8aacc1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28ed23ea5ac4dbcfd598e8aacc1… You're receiving this email because of your account on gitlab.com.

1 0