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

[Git][ultreiaio/ird-observe][develop] review builds init
by Tony CHEMIT 14 Apr '17

14 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c81c4a29 by Tony CHEMIT at 2017-04-14T09:57:53+02:00 review builds init - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,8 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - git config --global user.name $GITLAB_USER_ID - - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - - . ~/env/bin/prepare-env.sh + - . ~/env/bin/prepare-env.sh "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" .before_script_clone: &before_script_clone before_script: @@ -30,10 +28,8 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - git config --global user.name $GITLAB_USER_ID - - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL" .env_test: &env_test environment: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c81c4a29d6fcc2483eba79a2d8e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c81c4a29d6fcc2483eba79a2d8e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update CONTRIBUTING.md [skip ci]
by Tony CHEMIT 13 Apr '17

13 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7341f231 by Tony CHEMIT at 2017-04-13T09:01:54+00:00 Update CONTRIBUTING.md [skip ci] - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Release (without stage) +# Perform full release with no stage ``` wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash @@ -8,9 +8,7 @@ wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash ``` -# Release (with stage) - -Create stage +# Create Release stage ``` wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash @@ -20,12 +18,18 @@ wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-chan wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash ``` -And to release stage +# Release stage ``` wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash ``` +# Drop stage + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash +``` + # Regenerate changelog ``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7341f231a7e3ea5186d1ff53e12… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7341f231a7e3ea5186d1ff53e12… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [UI] Mise en page de la fenêtre d'application (See #753)
by Tony CHEMIT 13 Apr '17

13 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3dd6d9b3 by Tony CHEMIT at 2017-04-13T10:57:21+02:00 [UI] Mise en page de la fenêtre d'application (See #753) - - - - - 5b8d15b6 by Tony CHEMIT at 2017-04-13T10:57:28+02:00 rename pom module - - - - - 21 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -340,7 +340,7 @@ JSplitPane { #splitpane { orientation: {JSplitPane.HORIZONTAL_SPLIT}; - resizeWeight: 1.0; + resizeWeight: 0.2; } #splitpane2 { ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,11 @@ </parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> - <name>ObServe</name> + <name>ObServe :: Pom</name> <description>Projet ObServe</description> <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>pom</artifactId> + <artifactId>ird-observe</artifactId> <version>6.0-RC-3-SNAPSHOT</version> </parent> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1480d830698a59dc01c8f3f80b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1480d830698a59dc01c8f3f80b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: mise à jour des dépendances (Closes #767)
by Tony CHEMIT 13 Apr '17

13 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1e58ee6f by Tony CHEMIT at 2017-04-13T10:16:10+02:00 mise à jour des dépendances (Closes #767) - - - - - 35bb63fb by Tony CHEMIT at 2017-04-13T10:43:00+02:00 Mode de connexion par défaut (See #765) - - - - - 1480d830 by Tony CHEMIT at 2017-04-13T10:43:58+02:00 Dans les UI proposant le mode de connexion, faire remonter le mode service web au dessus de connexion directe (See #766) - - - - - 7 changed files: - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx - pom.xml Changes: ===================================== application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java ===================================== --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java @@ -32,8 +32,8 @@ public enum DbMode { USE_LOCAL, /** Pour creer une base locale */ CREATE_LOCAL, - /** Pour utiliser une base distante */ - USE_REMOTE, /** Pour utiliser une base via un serveur web distant */ - USE_SERVER + USE_SERVER, + /** Pour utiliser une base distante */ + USE_REMOTE } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java @@ -441,7 +441,7 @@ public class ConfigModel extends AdminActionModel { return; } - // par default, on tente d'utiliser la base distance + // par default, on tente d'utiliser le serveur distance centralSourceModel.init(ui, null); centralSourceModel.setCanCreateLocalService(false); boolean canUseLocalSource = uiModel.getOperations().contains(AdminStep.DATA_SYNCHRONIZE) @@ -450,7 +450,7 @@ public class ConfigModel extends AdminActionModel { centralSourceModel.setCanUseLocalService(canUseLocalSource); centralSourceModel.setCanUseRemoteService(true); centralSourceModel.setCanUseServerService(true); - centralSourceModel.start(USE_REMOTE); + centralSourceModel.start(USE_SERVER); if (log.isDebugEnabled()) { centralSourceModel.removePropertyChangeListener(LOG_PROPERTY_CHANGE_LISTENER); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -123,7 +123,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> { case USE_LOCAL: focusOwner = ui.getCHOOSE_DB_MODE().getUseLocalMode(); if (!focusOwner.isEnabled()) { - focusOwner = ui.getCHOOSE_DB_MODE().getUseRemoteMode(); + focusOwner = ui.getCHOOSE_DB_MODE().getUseServerMode(); } break; case CREATE_LOCAL: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -55,16 +55,6 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.PingService; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.JAXXContext; -import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; -import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; -import org.nuiton.version.Version; - import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; @@ -77,6 +67,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Set; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; +import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; +import org.nuiton.version.Version; + import static fr.ird.observe.application.swing.ui.admin.AdminUIModel.LOG_PROPERTY_CHANGE_LISTENER; import static org.nuiton.i18n.I18n.t; @@ -161,7 +161,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { /** * Un drapeau pour savoir si l'utilisateur a demandé une sauvegarde de la * base locale. - * + * <p> * Cette option n'est active uniquement si le drapeau localStorageExist est * à true. */ @@ -571,10 +571,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { mode = null; } else if (isCanCreateLocalService()) { mode = CreationMode.IMPORT_EXTERNAL_DUMP; - } else if (isCanUseRemoteService()) { - mode = CreationMode.IMPORT_REMOTE_STORAGE; } else if (isCanUseServerService()) { mode = CreationMode.IMPORT_SERVER_STORAGE; + } else if (isCanUseRemoteService()) { + mode = CreationMode.IMPORT_REMOTE_STORAGE; } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -68,8 +68,8 @@ protected String updateCreationModeContent(DbMode mode) { <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> <JPanel id='dbModeContent' constraints='BorderLayout.NORTH'> <JRadioButton id="useLocalMode" styleClass='dbMode'/> - <JRadioButton id="useRemoteMode" styleClass='dbMode'/> <JRadioButton id="useServerMode" styleClass='dbMode'/> + <JRadioButton id="useRemoteMode" styleClass='dbMode'/> <JRadioButton id="createLocalMode" styleClass='dbMode'/> </JPanel> @@ -79,8 +79,8 @@ protected String updateCreationModeContent(DbMode mode) { <JRadioButton id="importInternalDumpMode" styleClass='creationMode'/> <JRadioButton id="importExternalDumpMode" styleClass='creationMode'/> <JRadioButton id="importLocalStorageMode" styleClass='creationMode'/> - <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/> <JRadioButton id="importServerStorageMode" styleClass='creationMode'/> + <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/> </JPanel> <JLabel id='noCreateMode' constraints='"noCreateMode"'/> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx @@ -71,45 +71,44 @@ </row> </Table> -  - <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'> +  + <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'> <row> <cell> - <JLabel text='observe.storage.importRemoteStorage.config'/> + <JLabel text='observe.storage.importServerStorage.config'/> </cell> </row> <row> <cell weighty='1' weightx='1'> - <JPanel id='IMPORT_REMOTE_STORAGE_content'/> + <JPanel id='IMPORT_SERVER_STORAGE_content'/> </cell> </row> - </Table> -  - <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'> +  + <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'> <row> <cell> - <JLabel text='observe.storage.importServerStorage.config'/> + <JLabel text='observe.storage.importRemoteStorage.config'/> </cell> </row> <row> <cell weighty='1' weightx='1'> - <JPanel id='IMPORT_SERVER_STORAGE_content'/> + <JPanel id='IMPORT_REMOTE_STORAGE_content'/> </cell> </row> </Table> -  - <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'> +  + <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'> <row> <cell> <JPanel layout="{new BorderLayout()}"> - <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/> - <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'> - <JMenu id='remoteMenu'> - <JMenuItem id="saveRemoteConfiguration"/> + <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/> + <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'> + <JMenu id='serverMenu'> + <JMenuItem id="saveServerConfiguration"/> <JSeparator/> </JMenu> </JMenuBar> @@ -118,20 +117,20 @@ </row> <row> <cell weighty='1' weightx='1'> - <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/> + <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/> </cell> </row> </Table> -  - <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'> +  + <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'> <row> <cell> <JPanel layout="{new BorderLayout()}"> - <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/> - <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'> - <JMenu id='serverMenu'> - <JMenuItem id="saveServerConfiguration"/> + <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/> + <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'> + <JMenu id='remoteMenu'> + <JMenuItem id="saveRemoteConfiguration"/> <JSeparator/> </JMenu> </JMenuBar> @@ -140,7 +139,7 @@ </row> <row> <cell weighty='1' weightx='1'> - <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/> + <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/> </cell> </row> </Table> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>9</version> + <version>10</version> </parent> <groupId>fr.ird.observe</groupId> @@ -169,11 +169,11 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <mavenVersion>3.3.9</mavenVersion> + <mavenVersion>3.5.0</mavenVersion> - <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> +  <licensePluginVersion>1.9</licensePluginVersion> <jaxxVersion>3.0-alpha-6</jaxxVersion> @@ -184,12 +184,13 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <xworkVersion>2.3.31</xworkVersion> - <hibernateVersion>5.1.3.Final</hibernateVersion> - <sl4jVersion>1.7.23</sl4jVersion> + <xworkVersion>2.3.32</xworkVersion> + <flexmarkVersion>0.18.9</flexmarkVersion> + <hibernateVersion>5.1.5.Final</hibernateVersion> + <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> - <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> + <reflectionsVersion>0.9.11</reflectionsVersion> + <webmotionVersion>2.5.3</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion>  @@ -571,7 +572,7 @@ <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> <dependency> @@ -623,7 +624,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b02</version> + <version>4.0.0-b05</version> <scope>provided</scope> </dependency> @@ -736,12 +737,12 @@ <dependency> <groupId>com.vladsch.flexmark</groupId> <artifactId>flexmark</artifactId> - <version>0.15.4</version> + <version>${flexmarkVersion}</version> </dependency> <dependency> <groupId>com.vladsch.flexmark</groupId> <artifactId>flexmark-util</artifactId> - <version>0.15.4</version> + <version>${flexmarkVersion}</version> </dependency> <dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb6727d9c3148ca839961af94f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb6727d9c3148ca839961af94f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: improve web configuration
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d2e80b06 by Tony CHEMIT at 2017-04-02T08:26:55+02:00 improve web configuration - - - - - bb6727d9 by Tony CHEMIT at 2017-04-10T20:31:47+02:00 add contribute guid + update readme - - - - - 6 changed files: - + CONTRIBUTING.md - README.md - application-web-configuration/src/main/config/ObserveWebApplication.ini - application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties - application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties - application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties Changes: ===================================== CONTRIBUTING.md ===================================== --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +# Release (without stage) + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +# Release (with stage) + +Create stage + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +And to release stage + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +``` + +# Regenerate changelog + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash +``` + +# Generate site + +``` +mvn clean verify site -DperformRelease scm-publish:publish-scm +``` \ No newline at end of file ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -20,37 +20,3 @@ * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) - -# Release (without stage) - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -# Release (with stage) - -Create stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -And to release stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash -``` - -# Generate site - -``` -mvn clean verify site -DperformRelease scm-publish:publish-scm -``` \ No newline at end of file ===================================== application-web-configuration/src/main/config/ObserveWebApplication.ini ===================================== --- a/application-web-configuration/src/main/config/ObserveWebApplication.ini +++ b/application-web-configuration/src/main/config/ObserveWebApplication.ini @@ -28,11 +28,18 @@ type = string defaultValue = changeme final = true +[option host] +description = observeweb.host.description +key = observeweb.host +type = url +defaultValue = http://localhost:8080 +final = true + [option apiUrl] description = observeweb.apiUrl.description key = observeweb.apiUrl type = url -defaultValue = http://localhost:8080/observeweb/api/v1 +defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 final = true [option modelVersion] ===================================== application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties ===================================== --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties @@ -9,6 +9,7 @@ observeweb.build.version.description=Build version observeweb.contextPath.description=Context path observeweb.databasesConfigurationFile.description=Path to databases configuration file observeweb.devMode.description=Dev mode +observeweb.host.description=Application host observeweb.httpTimeout.description=Http timeout in milli seconds observeweb.log4jConfigurationFile.description=Path to log configuration file observeweb.sessionExpirationDelay.description=Session expiration deplay (in minutes) ===================================== application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties ===================================== --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties @@ -9,6 +9,7 @@ observeweb.build.version.description=Versión de construcción observeweb.contextPath.description=Context path \#TODO observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases observeweb.devMode.description=Modo desarollador +observeweb.host.description=Application host \#TODO observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes) \#TODO observeweb.log4jConfigurationFile.description=Ubicación del archivo de configuración de los logs observeweb.sessionExpirationDelay.description=Duración máxima de una sesión (en minutos) ===================================== application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties ===================================== --- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties +++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties @@ -9,6 +9,7 @@ observeweb.build.version.description=Version de construction observeweb.contextPath.description=Contexte applicatif observeweb.databasesConfigurationFile.description=Chemin vers le fichier de configuration des bases observeweb.devMode.description=Mode développeur +observeweb.host.description=Hôte de l'application observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes) observeweb.log4jConfigurationFile.description=Chemin vers le fichier de configuration des logs observeweb.sessionExpirationDelay.description=Temps maximum d'une session (en minutes) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/53e643b3675da5bf7c4512de2e…

1 0