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

[Git][ultreiaio/ird-observe][develop] Gestion des objets flottants de référence (See #787)
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab94677a by Tony CHEMIT at 2017-06-30T23:50:07+02:00 Gestion des objets flottants de référence (See #787) - - - - - 30 changed files: - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUIMode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowFloatingObjectReferencesAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ab94677a3f93af196dae7c84c56… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ab94677a3f93af196dae7c84c56… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix site build
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f6b80c70 by Tony CHEMIT at 2017-06-30T14:46:53+02:00 fix site build - - - - - c1fae2b3 by Tony CHEMIT at 2017-06-30T16:55:13+02:00 L'application reste en espagnol après redémarrage (See #710) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java - − src/site/markdown/model.md - src/site/site_fr.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -571,9 +571,7 @@ public abstract class ObserveRunner extends ApplicationRunner { ObserveMainUI ui = ObserveMainUIInitializer.initUI(context, config); - UIHelper.setMainUIVisible(ui); - - context.getSwingSessionHelper().addComponent(ui, false); + ObserveMainUIInitializer.setMainUIVisible(context,ui, false); return ui; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -42,6 +42,29 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigatio import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import java.awt.Component; +import java.awt.Container; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.JTree; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.border.Border; +import javax.swing.border.LineBorder; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; @@ -50,17 +73,6 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; -import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.LineBorder; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.tree.TreePath; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Objects; import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static org.nuiton.i18n.I18n.t; @@ -81,11 +93,11 @@ public class ObserveMainUIInitializer { private final ObserveMainUI ui; - public ObserveMainUIInitializer(ObserveMainUI ui) { + ObserveMainUIInitializer(ObserveMainUI ui) { this.ui = ui; } - public void changeNavigationNode(TreeSelectionEvent event) { + private void changeNavigationNode(TreeSelectionEvent event) { ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); if (source == null || !source.isOpen()) { @@ -150,7 +162,7 @@ public class ObserveMainUIInitializer { } } - public void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) { + private void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) { ContentUIManager manager = ui.getContentUIManager(); @@ -367,10 +379,23 @@ public class ObserveMainUIInitializer { } // show ui - UIHelper.setMainUIVisible(ui); + setMainUIVisible(rootContext, ui, true); + } + + public static void setMainUIVisible(ObserveSwingApplicationContext rootContext, ObserveMainUI ui, boolean replace) { + + // force le redimensionnement du splitpane + ui.getSplitpane().revalidate(); + + // force le redimensionnement du splitpane2 + ui.getSplitpane2().revalidate(); + + // affichage de l'interface graphique + SwingUtilities.invokeLater(() -> ui.setVisible(true)); + rootContext.getSwingSessionHelper().addComponent(ui, replace); } - protected void initialize() { + void initialize() { ObserveActionMap actionMap = ui.getObserveActionMap(); @@ -483,14 +508,14 @@ public class ObserveMainUIInitializer { private Border focusBorder; private Border noFocusBorder; - public Border getFocusBorder() { + private Border getFocusBorder() { if (focusBorder == null) { focusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getFocusBorderColor(), 3, true); } return focusBorder; } - public Border getNoFocusBorder() { + private Border getNoFocusBorder() { if (noFocusBorder == null) { noFocusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getNoFocusBorderColor(), 3, true); } @@ -513,7 +538,7 @@ public class ObserveMainUIInitializer { } } - protected void updateBusyState(boolean busy) { + private void updateBusyState(boolean busy) { if (busy) { // ui bloquee if (log.isDebugEnabled()) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java @@ -63,6 +63,7 @@ public abstract class ChangeApplicationLanguageActionSupport extends AbstractUIA // sauvegarde de la nouvelle locale config.setLocale(newLocale); + config.saveForUser(); ObserveUICallback.ui.run(); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java @@ -66,6 +66,7 @@ public abstract class ChangeDbLanguageActionSupport extends AbstractUIAction { // sauvegarde de la nouvelle locale config.setDbLocale(newLocale.getLocale()); + config.saveForUser(); ObserveUICallback.ui.run(); } ===================================== src/site/markdown/model.md deleted ===================================== --- a/src/site/markdown/model.md +++ /dev/null @@ -1,19 +0,0 @@ -# ObServe - model - -Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence. - -Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*. - -## Version 5 - -* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… -* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… -* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… -* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… - -## Version 7 - -* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… -* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… -* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… -* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -80,10 +80,13 @@ </menu> <menu name="Modélisation"> - <item name="Fichier argoUML (commun)" href="model/observe-common.zargo"/> - <item name="Fichier argoUML (Seine)" href="model/observe-seine.zargo"/> - <item name="Fichier argoUML (Palangre)" href="model/observe-longline.zargo"/> - <item name="Modèle physique" href="model/observe_mpd.pdf"/> + <item name="Fichier argoUML (commun) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Seine) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Palangre) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (commun) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Seine) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Fichier argoUML (Palangre) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…"/> + <item name="Modèle physique" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…"/> </menu> <menu ref="reports"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/79713d64d7780515a210014152… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/79713d64d7780515a210014152… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: d52d2216 by Tony CHEMIT at 2017-06-30T14:24:32+02:00 Site checkin for project ObServe :: Pom - - - - - 29 changed files: - administration-web.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - − model.html - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - sitemap.html - source-repository.html - team-list.html - third-party-report.html Changes: ===================================== administration-web.html ===================================== --- a/administration-web.html +++ b/administration-web.html @@ -47,10 +47,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> ===================================== architecture-logicielle.html ===================================== --- a/architecture-logicielle.html +++ b/architecture-logicielle.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== changes-report.html ===================================== --- a/changes-report.html +++ b/changes-report.html @@ -47,10 +47,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> @@ -207,15 +210,15 @@ <td>2015-08-27</td> <td>*(from redmine: created on 2015-08-27)*</td></tr> <tr class="a"> +<td><a href="#a4.0.2">4.0.2</a></td> +<td>2015-08-27</td> +<td>*(from redmine: created on 2015-08-11)*</td></tr> +<tr class="b"> <td><a href="#a4.0-2">4.0-2</a></td> <td>2015-06-08</td> <td>Contrat "Armateurs" *(from redmine: created on 2014-01-30)*</td></tr> -<tr class="b"> -<td><a href="#a4.0.2">4.0.2</a></td> -<td>2015-08-27</td> -<td>*(from redmine: created on 2015-08-11)*</td></tr> <tr class="a"> <td><a href="#a4.0.1.1">4.0.1.1</a></td> <td>2015-08-14</td> @@ -1984,7 +1987,7 @@ <td>Souci sur une fonction SQL de la migration 4.0.2 avec PostgreSQL 8. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/433">433</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> <div class="section"> -<h3 id="a4.0-2">Release 4.0-2 – 2015-06-08</h3> +<h3 id="a4.0.2">Release 4.0.2 – 2015-08-27</h3> <table border="0" class="table table-striped"> <tr class="a"> <th>Type</th> @@ -1992,58 +1995,58 @@ <th>Par</th></tr> <tr class="b"> <td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> -<td>[Synchro Référentiel] L'association species.ocean n'est pas synchronisée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/103">103</a>. Grâce â .</td> +<td>La migration 4.0->4.0.1.1 plante sur PostgreSQL 8. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/428">428</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="a"> -<td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Réallocation du programme d'une marée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/85">85</a>. Grâce â .</td> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>[PS] Question calculs taille/poids. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/410">410</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> +<div class="section"> +<h3 id="a4.0-2">Release 4.0-2 – 2015-06-08</h3> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Type</th> +<th>Changements</th> +<th>Par</th></tr> +<tr class="a"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>[Synchro Référentiel] L'association species.ocean n'est pas synchronisée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/103">103</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="b"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Rendre le formulaire calée pleinement visible sur petits écrans. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/109">109</a>. Grâce â .</td> +<td>Réallocation du programme d'une marée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/85">85</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="a"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Amélioration de performances. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/111">111</a>. Grâce â .</td> +<td>Rendre le formulaire calée pleinement visible sur petits écrans. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/109">109</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="b"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Tracer une carte de la marée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/113">113</a>. Grâce â .</td> +<td>Amélioration de performances. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/111">111</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="a"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Ajout de caractéristiques bateau sur une marée (et non dans le référentiel). Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/114">114</a>. Grâce â .</td> +<td>Tracer une carte de la marée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/113">113</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="b"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/115">115</a>. Grâce â .</td> +<td>Ajout de caractéristiques bateau sur une marée (et non dans le référentiel). Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/114">114</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="a"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Gestion du pool de balises d'objets flottants exploité par le bateau. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/117">117</a>. Grâce â .</td> +<td>Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/115">115</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="b"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Saisie générique des caractéristiques de l'équipement du bateau & migration senne. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/118">118</a>. Grâce â .</td> +<td>Gestion du pool de balises d'objets flottants exploité par le bateau. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/117">117</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="a"> <td><img src="images/add.gif" alt="Add" title="Add" /></td> -<td>Faire passer le contrôle sur les distances entre activités en warning. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/133">133</a>. Grâce â .</td> -<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> -<div class="section"> -<h3 id="a4.0.2">Release 4.0.2 – 2015-08-27</h3> -<table border="0" class="table table-striped"> -<tr class="b"> -<th>Type</th> -<th>Changements</th> -<th>Par</th></tr> -<tr class="a"> -<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> -<td>La migration 4.0->4.0.1.1 plante sur PostgreSQL 8. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/428">428</a>. Grâce â .</td> +<td>Saisie générique des caractéristiques de l'équipement du bateau & migration senne. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/118">118</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> <tr class="b"> -<td><img src="images/update.gif" alt="Update" title="Update" /></td> -<td>[PS] Question calculs taille/poids. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/410">410</a>. Grâce â .</td> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Faire passer le contrôle sur les distances entre activités en warning. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/133">133</a>. Grâce â .</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> <div class="section"> <h3 id="a4.0.1.1">Release 4.0.1.1 – 2015-08-14</h3> ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> @@ -97,19 +100,223 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> -<td>Configuration d'ObServe</td> -<td>81</td> -<td>9</td></tr> -<tr class="a"> <td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> <td>Observe web Configuration</td> <td>17</td> -<td>0</td></tr></table></div> +<td>0</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> +<td>Configuration d'ObServe</td> +<td>81</td> +<td>9</td></tr></table></div> <div class="section"> <h2><a name="Dtail_des_configurations"></a>Détail des configurations</h2><br /> <p>On détaille ici une par une les configurations définies pour le projet</p> <div class="section"> +<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> +<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> +<p>Description : <b>Observe web Configuration</b></p> +<div class="section"> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Clef</th> +<th>Description</th> +<th>Valeur par défaut</th> +<th>Option modifiable</th> +<th>Option sauvegardable</th> +<th>Type</th></tr> +<tr class="a"> +<td>observeweb.build.version</td> +<td>Version de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.build.date</td> +<td>Date de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.build.number</td> +<td>Numéro de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.adminApiKey</td> +<td>Clé API Admin (À changer)</td> +<td> +<div> +<pre style="monospaced">changeme</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.host</td> +<td>Hôte de l'application</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="b"> +<td>observeweb.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="a"> +<td>observeweb.model.version</td> +<td>Version du modèle</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.devMode</td> +<td>Mode développeur</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">boolean</pre></div></td></tr> +<tr class="a"> +<td>observeweb.contextPath</td> +<td>Contexte applicatif</td> +<td> +<div> +<pre style="monospaced">observe</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.baseDirectory</td> +<td>Répertoire de l'application</td> +<td> +<div> +<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.temporaryDirectory</td> +<td>Chemin vers le répertoire temporaire</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.log4jConfigurationFile</td> +<td>Chemin vers le fichier de configuration des logs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.databasesConfigurationFile</td> +<td>Chemin vers le fichier de configuration des bases</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.usersConfigurationFile</td> +<td>Chemin vers le fichier de configuration des utilisateurs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.sessionExpirationDelay</td> +<td>Temps maximum d'une session (en minutes)</td> +<td> +<div> +<pre style="monospaced">60</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="b"> +<td>observeweb.sessionMaximumSize</td> +<td>Taille maximum de session</td> +<td> +<div> +<pre style="monospaced">10000</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>observeweb.httpTimeout</td> +<td>Temps maximum de tentative de connection http (en millisecondes)</td> +<td> +<div> +<pre style="monospaced">30000</pre></div></td> +<td>Oui</td> +<td>Oui</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr></table></div> +<div class="section"> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> +<p><b>Aucune action définie pour cette configuration</b></p></div></div> +<div class="section"> <h3><a name="Configuration___ObserveSwingApplicationConfig"></a><a name="detail_ObserveSwingApplicationConfig">Configuration ObserveSwingApplicationConfig</a></h3> <p>Nom de la configuration : <b>ObserveSwingApplicationConfig</b></p> <p>Description : <b>Configuration d'ObServe</b></p> @@ -1059,211 +1266,7 @@ Deux paramètres sont nécessaires: Le FQN de la classe Le nombre d'id à générer.</td> <td>--create-id</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div> -<div class="section"> -<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> -<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> -<p>Description : <b>Observe web Configuration</b></p> -<div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> -<table border="0" class="table table-striped"> -<tr class="b"> -<th>Clef</th> -<th>Description</th> -<th>Valeur par défaut</th> -<th>Option modifiable</th> -<th>Option sauvegardable</th> -<th>Type</th></tr> -<tr class="a"> -<td>observeweb.build.version</td> -<td>Version de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.build.date</td> -<td>Date de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.build.number</td> -<td>Numéro de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.adminApiKey</td> -<td>Clé API Admin (À changer)</td> -<td> -<div> -<pre style="monospaced">changeme</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.host</td> -<td>Hôte de l'application</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="b"> -<td>observeweb.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="a"> -<td>observeweb.model.version</td> -<td>Version du modèle</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.devMode</td> -<td>Mode développeur</td> -<td> -<div> -<pre style="monospaced">true</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">boolean</pre></div></td></tr> -<tr class="a"> -<td>observeweb.contextPath</td> -<td>Contexte applicatif</td> -<td> -<div> -<pre style="monospaced">observe</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.baseDirectory</td> -<td>Répertoire de l'application</td> -<td> -<div> -<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.temporaryDirectory</td> -<td>Chemin vers le répertoire temporaire</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.log4jConfigurationFile</td> -<td>Chemin vers le fichier de configuration des logs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.databasesConfigurationFile</td> -<td>Chemin vers le fichier de configuration des bases</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.usersConfigurationFile</td> -<td>Chemin vers le fichier de configuration des utilisateurs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.sessionExpirationDelay</td> -<td>Temps maximum d'une session (en minutes)</td> -<td> -<div> -<pre style="monospaced">60</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="b"> -<td>observeweb.sessionMaximumSize</td> -<td>Taille maximum de session</td> -<td> -<div> -<pre style="monospaced">10000</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="a"> -<td>observeweb.httpTimeout</td> -<td>Temps maximum de tentative de connection http (en millisecondes)</td> -<td> -<div> -<pre style="monospaced">30000</pre></div></td> -<td>Oui</td> -<td>Oui</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr></table></div> -<div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> -<p><b>Aucune action définie pour cette configuration</b></p></div></div></div> +<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div></div> </div> </div> </div> ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== dependency-info.html ===================================== --- a/dependency-info.html +++ b/dependency-info.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== dependency-management.html ===================================== --- a/dependency-management.html +++ b/dependency-management.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> @@ -90,7 +93,7 @@ <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2017-05-31_and_2017-07-01"></a>Changes between 2017-05-31 and 2017-07-01</h3> -<p>Total commits: 70<br />Total number of files changed: 866</p> +<p>Total commits: 69<br />Total number of files changed: 866</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -98,7 +101,7 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>70</td> +<td>69</td> <td>866</td></tr></table></div></div> </div> </div> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. ===================================== index.html ===================================== --- a/index.html +++ b/index.html @@ -47,10 +47,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> ===================================== install-serverPG.html ===================================== --- a/install-serverPG.html +++ b/install-serverPG.html @@ -47,10 +47,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> ===================================== install.html ===================================== --- a/install.html +++ b/install.html @@ -47,10 +47,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> ===================================== integration.html ===================================== --- a/integration.html +++ b/integration.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== issue-tracking.html ===================================== --- a/issue-tracking.html +++ b/issue-tracking.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== license.html ===================================== --- a/license.html +++ b/license.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== model.html deleted ===================================== --- a/model.html +++ /dev/null @@ -1,119 +0,0 @@ -<!DOCTYPE html> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> - <head> - <meta charset="UTF-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170630" /> - <meta http-equiv="Content-Language" content="fr" /> - <title>ObServe :: Pom – ObServe - model</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> - <link rel="stylesheet" href="./css/site.css" /> - <link rel="stylesheet" href="./css/print.css" media="print" /> - <script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script> - </head> - <body class="topBarDisabled"> - <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> - - <div id="breadcrumbs"> - <ul class="breadcrumb"> - <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> - <li class="active ">ObServe - model</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-06-30</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2-SNAPSHOT</li> - <li class="pull-right"><span class="divider">|</span> -<a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> - <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> - </ul> - </div> - <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> -<ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> - <li><a href="index.html" title="Accueil"><span class="none"></span>Accueil</a> </li> - <li><a href="install.html" title="Installation"><span class="none"></span>Installation</a> </li> - <li><a href="install-serverPG.html" title="Administration Obstuna"><span class="none"></span>Administration Obstuna</a> </li> - <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a> </li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> - <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> - <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> - <li class="nav-header">Documentation sur le projet</li> - <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> - <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> - </ul> -<form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> - <input class="search-query" name="q" id="query" type="text" /> -</form> -<script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> - <hr /> - <div id="poweredBy"> - <div class="clear"></div> - <div class="clear"></div> - <div class="clear"></div> - <div class="clear"></div> - <a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> -<a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> -<a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> -<a href="https://www.jetbrains.com/idea" title="IntelliJ" class="builtBy"><img class="builtBy" alt="IntelliJ" src="./img/logo_IntelliJIDEA.png" /></a> - </div> - </div> - </div> - <div id="bodyColumn" class="span10" > -<h1>ObServe - model</h1> -<p>Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence.</p> -<p>Nous maintenons pour le moment deux versions de ce modèle sur le format <i>zargo</i>.</p> -<div class="section"> -<h2><a name="Version_5"></a>Version 5</h2> - -<ul> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model commun</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model senne</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model palangre</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model properties</a></li> -</ul></div> -<div class="section"> -<h2><a name="Version_7"></a>Version 7</h2> - -<ul> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model commun</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model senne</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model palangre</a></li> - -<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zarg…">model properties</a></li> -</ul></div> - </div> - </div> - </div> - <hr/> - <footer> - <div class="container-fluid"> - <div class="row-fluid"> - <p>Copyright ©2008–2017 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> - </div> - </div> - </footer> - </body> -</html> \ No newline at end of file ===================================== plugin-management.html ===================================== --- a/plugin-management.html +++ b/plugin-management.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== plugin-updates-report.html ===================================== --- a/plugin-updates-report.html +++ b/plugin-updates-report.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> @@ -93,7 +96,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># of plugins using the latest version available</td> -<td>48</td></tr> +<td>58</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is smaller than an incremental version update</td> @@ -101,15 +104,15 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is an incremental version update</td> -<td>4</td></tr> +<td>0</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a minor version update</td> -<td>6</td></tr> +<td>1</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a major version update</td> -<td>1</td></tr> +<td>0</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where a dependencies section containes a dependency with an updated version</td> @@ -128,12 +131,12 @@ <th>Next Major</th> <th>Dependency status</th></tr> <tr class="b"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>com.akathist.maven.plugins.launch4j</td> <td>launch4j-maven-plugin</td> -<td>1.7.16</td> +<td><b>1.7.16</b></td> +<td></td> <td></td> -<td><b>1.7.17</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -228,12 +231,12 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-dependency-plugin</td> -<td>3.0.0</td> +<td><b>3.0.0</b></td> +<td></td> <td></td> -<td><b>3.0.1</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -298,14 +301,14 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-invoker-plugin</td> -<td>2.0.0</td> +<td><b>2.0.0</b></td> +<td></td> <td></td> <td></td> <td></td> -<td><b>3.0.0</b></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> @@ -348,13 +351,13 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-pmd-plugin</td> -<td>3.7</td> +<td><b>3.7</b></td> +<td></td> <td></td> <td></td> -<td><b>3.8</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> @@ -428,23 +431,23 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-surefire-plugin</td> -<td>2.19.1</td> +<td><b>2.19.1</b></td> +<td></td> <td></td> <td></td> -<td><b>2.20</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-war-plugin</td> -<td>3.0.0</td> +<td><b>3.0.0</b></td> +<td></td> <td></td> <td></td> -<td><b>3.1.0</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> @@ -558,13 +561,13 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.codehaus.mojo</td> <td>sonar-maven-plugin</td> -<td>3.2</td> +<td><b>3.2</b></td> +<td></td> <td></td> <td></td> -<td><b>3.3.0.603</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> @@ -578,13 +581,13 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.codehaus.mojo</td> <td>versions-maven-plugin</td> -<td>2.3</td> +<td><b>2.3</b></td> +<td></td> <td></td> <td></td> -<td><b>2.4</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> @@ -618,22 +621,22 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.eclipse.jetty</td> <td>jetty-jspc-maven-plugin</td> -<td>9.4.2.v20170220</td> +<td><b>9.4.2.v20170220</b></td> +<td></td> <td></td> -<td><b>9.4.3.v20170317</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_warning_sml.gif" alt="" /></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>org.eclipse.jetty</td> <td>jetty-maven-plugin</td> -<td>9.4.2.v20170220</td> +<td><b>9.4.2.v20170220</b></td> +<td></td> <td></td> -<td><b>9.4.3.v20170317</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -738,7 +741,7 @@ <table border="0" class="table table-striped"> <tr class="b"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="a"> <th width="80%">Group Id</th> <td>com.akathist.maven.plugins.launch4j</td></tr> @@ -747,10 +750,7 @@ <td>launch4j-maven-plugin</td></tr> <tr class="a"> <th width="80%">Current Version</th> -<td>1.7.16</td></tr> -<tr class="b"> -<th width="80%">Newer versions</th> -<td><b>1.7.17</b> <i>Next Incremental</i><br /><b>1.7.18</b> <i>Latest Incremental</i></td></tr></table></div> +<td>1.7.16</td></tr></table></div> <div class="section"> <h3><a name="Plugin_com.jayway.maven.plugins.android.generation2:maven-android-plugin"></a>Plugin com.jayway.maven.plugins.android.generation2:maven-android-plugin</h3> <table border="0" class="table table-striped"> @@ -948,7 +948,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -957,10 +957,7 @@ <td>maven-dependency-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0.0</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>3.0.1</b> <i>Next Incremental</i></td></tr></table></div> +<td>3.0.0</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-deploy-plugin"></a>Plugin org.apache.maven.plugins:maven-deploy-plugin</h3> <table border="0" class="table table-striped"> @@ -1056,7 +1053,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer major version available. Major updates are rarely passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1065,10 +1062,7 @@ <td>maven-invoker-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>2.0.0</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>3.0.0</b> <i>Next Major</i></td></tr></table></div> +<td>2.0.0</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-jar-plugin"></a>Plugin org.apache.maven.plugins:maven-jar-plugin</h3> <table border="0" class="table table-striped"> @@ -1134,7 +1128,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1143,10 +1137,7 @@ <td>maven-pmd-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.7</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>3.8</b> <i>Next Minor</i></td></tr></table></div> +<td>3.7</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-release-plugin"></a>Plugin org.apache.maven.plugins:maven-release-plugin</h3> <table border="0" class="table table-striped"> @@ -1410,7 +1401,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1419,16 +1410,13 @@ <td>maven-surefire-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>2.19.1</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>2.20</b> <i>Next Minor</i></td></tr></table></div> +<td>2.19.1</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-war-plugin"></a>Plugin org.apache.maven.plugins:maven-war-plugin</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1437,10 +1425,7 @@ <td>maven-war-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0.0</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>3.1.0</b> <i>Next Minor</i></td></tr></table></div> +<td>3.0.0</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.tomcat.maven:tomcat6-maven-plugin"></a>Plugin org.apache.tomcat.maven:tomcat6-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -1706,7 +1691,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.codehaus.mojo</td></tr> @@ -1715,10 +1700,7 @@ <td>sonar-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.2</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>3.3.0.603</b> <i>Next Minor</i></td></tr></table></div> +<td>3.2</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.codehaus.mojo:tidy-maven-plugin"></a>Plugin org.codehaus.mojo:tidy-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -1739,7 +1721,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.codehaus.mojo</td></tr> @@ -1748,10 +1730,7 @@ <td>versions-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>2.3</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>2.4</b> <i>Next Minor</i></td></tr></table></div> +<td>2.3</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.codehaus.mojo:wagon-maven-plugin"></a>Plugin org.codehaus.mojo:wagon-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -1802,7 +1781,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.eclipse.jetty</td></tr> @@ -1811,16 +1790,13 @@ <td>jetty-jspc-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>9.4.2.v20170220</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>9.4.3.v20170317</b> <i>Next Incremental</i><br />9.4.4.v20170414<br />9.4.5.v20170502<br /><b>9.4.6.v20170531</b> <i>Latest Incremental</i></td></tr></table></div> +<td>9.4.2.v20170220</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.eclipse.jetty:jetty-maven-plugin"></a>Plugin org.eclipse.jetty:jetty-maven-plugin</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.eclipse.jetty</td></tr> @@ -1829,10 +1805,7 @@ <td>jetty-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>9.4.2.v20170220</td></tr> -<tr class="a"> -<th width="80%">Newer versions</th> -<td><b>9.4.3.v20170317</b> <i>Next Incremental</i><br />9.4.4.v20170414<br />9.4.5.v20170502<br /><b>9.4.6.v20170531</b> <i>Latest Incremental</i></td></tr></table></div> +<td>9.4.2.v20170220</td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.nuiton:helper-maven-plugin"></a>Plugin org.nuiton:helper-maven-plugin</h3> <table border="0" class="table table-striped"> ===================================== plugins.html ===================================== --- a/plugins.html +++ b/plugins.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== project-info.html ===================================== --- a/project-info.html +++ b/project-info.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li class="active"><a href="#"><span class="icon-chevron-down"></span>Info Projet</a> ===================================== project-reports.html ===================================== --- a/project-reports.html +++ b/project-reports.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li class="active"><a href="#"><span class="icon-chevron-down"></span>Rapports Projet</a> ===================================== project-summary.html ===================================== --- a/project-summary.html +++ b/project-summary.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== property-updates-report.html ===================================== --- a/property-updates-report.html +++ b/property-updates-report.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> ===================================== sitemap.html ===================================== --- a/sitemap.html +++ b/sitemap.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> @@ -101,13 +104,19 @@ <ul> -<li><a href="model/observe-common.zargo">Fichier argoUML (commun)</a></li> +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (commun) v7</a></li> -<li><a href="model/observe-seine.zargo">Fichier argoUML (Seine)</a></li> +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (Seine) v7</a></li> -<li><a href="model/observe-longline.zargo">Fichier argoUML (Palangre)</a></li> +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (Palangre) v7</a></li> -<li><a href="model/observe_mpd.pdf">Modèle physique</a></li></ul> +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (commun) v5</a></li> + +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (Seine) v5</a></li> + +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…">Fichier argoUML (Palangre) v5</a></li> + +<li><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…">Modèle physique</a></li></ul> </div> <div class="section"> <h4><a name="Documentation_sur_le_projet"></a>Documentation sur le projet</h4><hr /> ===================================== source-repository.html ===================================== --- a/source-repository.html +++ b/source-repository.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== team-list.html ===================================== --- a/team-list.html +++ b/team-list.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> <ul class="nav nav-list"> ===================================== third-party-report.html ===================================== --- a/third-party-report.html +++ b/third-party-report.html @@ -46,10 +46,13 @@ <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a> </li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a> </li> <li class="nav-header">Modélisation</li> - <li><a href="model/observe-common.zargo" title="Fichier argoUML (commun)"><span class="none"></span>Fichier argoUML (commun)</a> </li> - <li><a href="model/observe-seine.zargo" title="Fichier argoUML (Seine)"><span class="none"></span>Fichier argoUML (Seine)</a> </li> - <li><a href="model/observe-longline.zargo" title="Fichier argoUML (Palangre)"><span class="none"></span>Fichier argoUML (Palangre)</a> </li> - <li><a href="model/observe_mpd.pdf" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a> </li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a> </li> <li class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a> </li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-down"></span>Rapports Projet</a> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d52d22162a0b0b85ec431cce49d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d52d22162a0b0b85ec431cce49d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 0a6268ff by 166231 at 2017-06-30T12:09:12+00:00 Site checkin for project ObServe :: Pom - - - - - 23 changed files: - administration-web.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - + model.html - − model/observe-common.zargo - − model/observe-longline.zargo - − model/observe-seine.zargo - − model/observe_mpd.pdf - plugin-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0a6268ffaf38b66099d34266994… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0a6268ffaf38b66099d34266994… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix site build
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 79713d64 by Tony CHEMIT at 2017-06-30T13:38:53+02:00 fix site build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,8 @@ stages: .deploy_site: &deploy_site script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install site -DperformRelease scm-publish:publish-scm/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/site -DperformRelease scm-publish:publish-scm/' | bash .deploy_demo_latest: &deploy_demo_latest stage: Test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/79713d64d7780515a2100141529… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/79713d64d7780515a2100141529… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix site build
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26848a2a by Tony CHEMIT at 2017-06-30T13:17:27+02:00 fix site build - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -1038,32 +1038,6 @@ <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>Copy files to site</id> - <phase>pre-site</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" todir="${project.reporting.outputDirectory}/model"> - <fileset dir="doc/modelisation"> - <include name="**/*.pdf" /> - </fileset> - <fileset dir="persistence/src/main/xmi"> - <include name="**/*.zargo" /> - </fileset> - </copy> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>io.ultreia.maven</groupId> <artifactId>gitlab-maven-plugin</artifactId> <inherited>false</inherited> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26848a2ac5dbd533535887a3575… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26848a2ac5dbd533535887a3575… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Utilisation d'un modèle textuel pour le developpement (See #786)
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5650eb0a by Tony CHEMIT at 2017-06-30T12:14:39+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) - - - - - 75e8d559 by Tony CHEMIT at 2017-06-30T12:14:45+02:00 use last pom version + clean poms - - - - - 7ab57f8f by Tony CHEMIT at 2017-06-30T12:14:45+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) (mise en documentation des modèles zargo) - - - - - 30 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - + doc/modelisation/zargo/v5/observe-common.zargo - + doc/modelisation/zargo/v5/observe-longline.zargo - + doc/modelisation/zargo/v5/observe-seine.zargo - + doc/modelisation/zargo/v5/observe.ini - persistence/src/main/xmi/observe-common.zargo → doc/modelisation/zargo/v7/observe-common.zargo - persistence/src/main/xmi/observe-longline.zargo → doc/modelisation/zargo/v7/observe-longline.zargo - persistence/src/main/xmi/observe-seine.zargo → doc/modelisation/zargo/v7/observe-seine.zargo - persistence/src/main/xmi/observe.ini → doc/modelisation/zargo/v7/observe.ini - observe/pom.xml - persistence/pom.xml - + persistence/src/main/models/Observe.model - 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 - + services/src/main/models/Observe.model - − services/src/main/xmi/observe-services-dto-common.zargo - − services/src/main/xmi/observe-services-dto-longline.zargo - − services/src/main/xmi/observe-services-dto-seine.zargo - − services/src/main/xmi/observe-services-dto.ini The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b747830861637b4d2d3de33c0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b747830861637b4d2d3de33c0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Utilisation d'un modèle textuel pour le developpement (See #786) (mise en…
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bb5030cb by Tony CHEMIT at 2017-06-30T12:19:42+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) (mise en documentation des modèles zargo) - - - - - 15 changed files: - + doc/modelisation/zargo/v5/observe-common.zargo - + doc/modelisation/zargo/v5/observe-longline.zargo - + doc/modelisation/zargo/v5/observe-seine.zargo - + doc/modelisation/zargo/v5/observe.ini - persistence/src/main/xmi/observe-common.zargo → doc/modelisation/zargo/v7/observe-common.zargo - persistence/src/main/xmi/observe-longline.zargo → doc/modelisation/zargo/v7/observe-longline.zargo - persistence/src/main/xmi/observe-seine.zargo → doc/modelisation/zargo/v7/observe-seine.zargo - persistence/src/main/xmi/observe.ini → doc/modelisation/zargo/v7/observe.ini - persistence/src/main/models/Observe.friendmodel → persistence/src/main/models/Observe.model - services/src/main/models/Observe.friendmodel → services/src/main/models/Observe.model - − services/src/main/xmi/observe-services-dto-common.zargo - − services/src/main/xmi/observe-services-dto-longline.zargo - − services/src/main/xmi/observe-services-dto-seine.zargo - − services/src/main/xmi/observe-services-dto.ini - + src/site/markdown/model.md Changes: ===================================== doc/modelisation/zargo/v5/observe-common.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-common.zargo differ ===================================== doc/modelisation/zargo/v5/observe-longline.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-longline.zargo differ ===================================== doc/modelisation/zargo/v5/observe-seine.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-seine.zargo differ ===================================== doc/modelisation/zargo/v5/observe.ini ===================================== --- /dev/null +++ b/doc/modelisation/zargo/v5/observe.ini @@ -0,0 +1,295 @@ +[model] +attributeType.Boolean = java.lang.Boolean +attributeType.Float = java.lang.Float +attributeType.Integer = java.lang.Integer +attributeType.Long = java.lang.Long +attributeType.String = java.lang.String +generateForeignKeyNames = true +generateOperatorForDAOHelper = true +generatePropertyChangeSupport = true +indexForeignKeys = true +notGenerateToString = true +useEnumerationName = false +version = @observe.model.version@ + +[package fr.ird.observe.entities] +dbSchema = OBSERVE_COMMON + +[package fr.ird.observe.entities.longline] +dbSchema = OBSERVE_LONGLINE + +[package fr.ird.observe.entities.referentiel] +dbSchema = OBSERVE_COMMON + +[package fr.ird.observe.entities.referentiel.longline] +dbSchema = OBSERVE_LONGLINE + +[package fr.ird.observe.entities.referentiel.seine] +dbSchema = OBSERVE_SEINE + +[package fr.ird.observe.entities.seine] +dbSchema = OBSERVE_SEINE + +[class fr.ird.observe.entities.CommentableEntity] +comment.hibernateAttributeType = text + +[class fr.ird.observe.entities.ObserveEntity] +lastUpdateDate.notNull = true + +[class fr.ird.observe.entities.longline.ActivityLongline] +dbName = Activity +encounter.reverseDbName = activity +sensorUsed.reverseDbName = activity +setLongline.dbName = set +vesselActivityLongline.dbName = vesselActivity +vesselActivityLongline.lazy = false + +[class fr.ird.observe.entities.longline.Basket] +branchline.orderBy = settingIdentifier +branchline.unique = true +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.Branchline] +branchlineLength.sqlType = numeric +catchLongline.dbName = catch +hookSize.sqlType = numeric +settingIdentifier.notNull = true +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tracelineLength.sqlType = numeric + +[class fr.ird.observe.entities.longline.BranchlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.CatchLongline] +dbName = Catch +beatDiameter.sqlType = numeric +catchFateLongline.dbName = catchFate +gonadeWeight.sqlType = numeric +predator.manyToManyTableName = catch_predator +predator.reverseDbName = catch +sizeMeasure.reverseDbName = catch +totalWeight.sqlType = numeric +weightMeasure.reverseDbName = catch + +[class fr.ird.observe.entities.longline.Encounter] +distance.sqlType = numeric + +[class fr.ird.observe.entities.longline.FloatlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.GearUseFeaturesLongline] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures +gearUseFeaturesMeasurement.unique = true + +[class fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.longline.HooksComposition] +hookSize.sqlType = numeric + +[class fr.ird.observe.entities.longline.Section] +basket.orderBy = settingIdentifier +basket.unique = true +setLongline.dbName = set +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.SetLongline] +dbName = Set +baitsComposition.reverseDbName = set +branchlinesComposition.reverseDbName = set +catchLongline.reverseDbName = set +catchLongline.unique = true +floatlinesComposition.reverseDbName = set +haulingEndLatitude.sqlType = numeric +haulingEndLongitude.sqlType = numeric +haulingStartLatitude.sqlType = numeric +haulingStartLongitude.sqlType = numeric +hooksComposition.reverseDbName = set +mitigationType.manyToManyTableName = mitigationtype_set +mitigationType.reverseDbName = set +section.orderBy = settingIdentifier +section.reverseDbName = set +section.unique = true +settingEndLatitude.sqlType = numeric +settingEndLongitude.sqlType = numeric +settingStartLatitude.sqlType = numeric +settingStartLongitude.sqlType = numeric +settingVesselSpeed.sqlType = numeric +shooterSpeed.sqlType = numeric +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tdr.reverseDbName = set + +[class fr.ird.observe.entities.longline.SizeMeasure] +size.sqlType = numeric + +[class fr.ird.observe.entities.longline.Tdr] +floatline1Length.sqlType = numeric +floatline2Length.sqlType = numeric + +[class fr.ird.observe.entities.longline.TdrRecord] +depth.sqlType = numeric +temperature.sqlType = numeric + +[class fr.ird.observe.entities.longline.TripLongline] +dbName = Trip +activityLongline.reverseDbName = trip +activityLongline.unique = true +gearUseFeaturesLongline.orderBy = topiaCreateDate +gearUseFeaturesLongline.reverseDbName = trip +gearUseFeaturesLongline.unique = true + +[class fr.ird.observe.entities.longline.WeightMeasure] +weight.sqlType = numeric + +[class fr.ird.observe.entities.referentiel.Gear] +gearCaracteristic.lazy = false + +[class fr.ird.observe.entities.referentiel.GearCaracteristic] +gearCaracteristicType.lazy = false + +[class fr.ird.observe.entities.referentiel.LengthWeightParameter] +ocean.lazy = false +ocean.notNull = true +sex.lazy = false +sex.notNull = true +species.lazy = false +species.notNull = true + +[class fr.ird.observe.entities.referentiel.Organism] +country.lazy = false + +[class fr.ird.observe.entities.referentiel.Program] +comment.hibernateAttributeType = text +organism.lazy = false + +[class fr.ird.observe.entities.referentiel.Species] +maxLength.sqlType = numeric +maxWeight.sqlType = numeric +minLength.sqlType = numeric +minWeight.sqlType = numeric +ocean.lazy = false +speciesGroup.lazy = false + +[class fr.ird.observe.entities.referentiel.SpeciesList] +species.lazy = false + +[class fr.ird.observe.entities.referentiel.Vessel] +capacity.sqlType = numeric +comment.hibernateAttributeType = text +flagCountry.lazy = false +length.sqlType = numeric +searchMaximum.sqlType = numeric +vesselSizeCategory.lazy = false +vesselType.lazy = false + +[class fr.ird.observe.entities.referentiel.longline.CatchFateLongline] +dbName = CatchFate + +[class fr.ird.observe.entities.referentiel.longline.VesselActivityLongline] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.VesselActivitySeine] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.WeightCategory] +species.lazy = false + +[class fr.ird.observe.entities.seine.ActivitySeine] +dbName = Activity +floatingObject.reverseDbName = activity +floatingObject.unique = true +latitude.sqlType = numeric +longitude.sqlType = numeric +observedSystem.manyToManyTableName = activity_observedSystem +observedSystem.reverseDbName = activity +observedSystem.unique = true +observedSystemDistance.sqlType = numeric +seaSurfaceTemperature.sqlType = numeric +setSeine.dbName = set +time.hibernateAttributeType.java.util.Date = time +vesselActivitySeine.dbName = vesselActivity +vesselSpeed.sqlType = numeric + +[class fr.ird.observe.entities.seine.FloatingObject] +transmittingBuoy.unique = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesSeine] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures + +[class fr.ird.observe.entities.seine.NonTargetCatch] +catchWeight.sqlType = numeric +meanLength.sqlType = numeric +meanWeight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetLength] +length.sqlType = numeric +sex.lazy = false +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetSample] +nonTargetLength.unique = true + +[class fr.ird.observe.entities.seine.Route] +activitySeine.orderBy = time +activitySeine.unique = true +date.hibernateAttributeType.java.util.Date = date +endLogValue.sqlType = numeric +startLogValue.sqlType = numeric + +[class fr.ird.observe.entities.seine.SchoolEstimate] +naturalIdMutable = true +setSeine.dbName = set +setSeine.naturalId = true +species.naturalId = true + +[class fr.ird.observe.entities.seine.SetSeine] +dbName = Set +currentSpeed.sqlType = numeric +nonTargetCatch.reverseDbName = set +nonTargetSample.reverseDbName = set +nonTargetSample.unique = true +schoolEstimate.reverseDbName = set +startTime.hibernateAttributeType.java.util.Date = time +targetCatch.reverseDbName = set +targetSample.reverseDbName = set +targetSample.unique = true + +[class fr.ird.observe.entities.seine.TargetCatch] +naturalIdMutable = true +catchWeight.sqlType = numeric +discarded.naturalId = true +reasonForDiscard.naturalId = true +reasonForDiscard.notNull = false +setSeine.dbName = set +setSeine.naturalId = true +weightCategory.naturalId = true +well.naturalId = true +well.notNull = false + +[class fr.ird.observe.entities.seine.TargetLength] +length.sqlType = numeric +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.TargetSample] +targetLength.unique = true + +[class fr.ird.observe.entities.seine.TripSeine] +dbName = Trip +endDate.hibernateAttributeType.java.util.Date = date +gearUseFeaturesSeine.orderBy = topiaCreateDate +gearUseFeaturesSeine.reverseDbName = trip +route.orderBy = date +route.reverseDbName = trip +route.unique = true +startDate.hibernateAttributeType.java.util.Date = date ===================================== persistence/src/main/xmi/observe-common.zargo → doc/modelisation/zargo/v7/observe-common.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-common.zargo and b/doc/modelisation/zargo/v7/observe-common.zargo differ ===================================== persistence/src/main/xmi/observe-longline.zargo → doc/modelisation/zargo/v7/observe-longline.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-longline.zargo and b/doc/modelisation/zargo/v7/observe-longline.zargo differ ===================================== persistence/src/main/xmi/observe-seine.zargo → doc/modelisation/zargo/v7/observe-seine.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/doc/modelisation/zargo/v7/observe-seine.zargo differ ===================================== persistence/src/main/xmi/observe.ini → doc/modelisation/zargo/v7/observe.ini ===================================== ===================================== persistence/src/main/models/Observe.friendmodel → persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.friendmodel +++ b/persistence/src/main/models/Observe.model @@ -1,4 +1,5 @@ -model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String defaultPackage=fr.ird.observe.entities useEnumerationName=false version=6.901 +model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String useEnumerationName=false +model Observe | defaultPackage=fr.ird.observe.entities version=@observe.model.version@ package fr.ird.observe.common | skip package fr.ird.observe.entities | dbSchema=OBSERVE_COMMON ===================================== services/src/main/models/Observe.friendmodel → services/src/main/models/Observe.model ===================================== --- a/services/src/main/models/Observe.friendmodel +++ b/services/src/main/models/Observe.model @@ -1,4 +1,5 @@ -model Observe | java8 classNameSuffix=Dto defaultPackage=fr.ird.observe.services.dto superClass=fr.ird.observe.services.dto.AbstractObserveDto version=@observe.model.version@ +model Observe | java8 classNameSuffix=Dto superClass=fr.ird.observe.services.dto.AbstractObserveDto +model Observe | defaultPackage=fr.ird.observe.services.dto version=@observe.model.version@ package fr.ird.observe.common | skip package fr.ird.observe.services.dto | bean ===================================== services/src/main/xmi/observe-services-dto-common.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-common.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto-longline.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-longline.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto-seine.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto.ini deleted ===================================== --- a/services/src/main/xmi/observe-services-dto.ini +++ /dev/null @@ -1,309 +0,0 @@ -[model] -java8 = true -classNameSuffix = Dto -superClass = fr.ird.observe.services.dto.AbstractObserveDto -version = @observe.model.version@ -defaultPackage=fr.ird.observe.services.dto - -[package fr.ird.observe.common] -skip= true - -[package fr.ird.observe.services.dto] -bean = true - -[class fr.ird.observe.services.dto.TripMap] -points.ordered = true -points.unique = true - -[class fr.ird.observe.services.dto.longline.ActivityLongline] -fpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -setLongline.attributeGeneric = fr.ird.observe.services.dto.longline.SetLonglineDto -vesselActivityLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto - -[class fr.ird.observe.services.dto.longline.BaitsComposition] -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto - -[class fr.ird.observe.services.dto.longline.Basket] -branchline.ordered = true -branchline.unique = true - -[class fr.ird.observe.services.dto.longline.Branchline] -baitHaulingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.BranchlinesComposition] -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.CatchLongline] -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -catchFateLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto -catchHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto -discardHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto -hookPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookPositionDto -maturityStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MaturityStatusDto -predator.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -speciesCatch.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -stomacFullness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.StomacFullnessDto - -[class fr.ird.observe.services.dto.longline.Encounter] -encounterType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.EncounterTypeDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.longline.FloatlinesComposition] -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.GearUseFeaturesLongline] -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto -gearUseFeaturesMeasurement.ordered = true -gearUseFeaturesMeasurement.unique = true - -[class fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto - -[class fr.ird.observe.services.dto.longline.HooksComposition] -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto - -[class fr.ird.observe.services.dto.longline.Section] -basket.ordered = true -basket.unique = true - -[class fr.ird.observe.services.dto.longline.SensorUsed] -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto -sensorDataFormat.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto -sensorType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorTypeDto - -[class fr.ird.observe.services.dto.longline.SetLongline] -lightsticksColor.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksColorDto -lightsticksType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -settingShape.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SettingShapeDto - -[class fr.ird.observe.services.dto.longline.SetLonglineCatch] -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -catchLongline.ordered = true - -[class fr.ird.observe.services.dto.longline.SetLonglineDetailComposition] -section.ordered = true -section.unique = true - -[class fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition] -mitigationType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MitigationTypeDto - -[class fr.ird.observe.services.dto.longline.SetLonglineStub] -activityLongline.attributeGeneric = fr.ird.observe.services.dto.longline.ActivityLonglineDto -activityLongline.unique = true - -[class fr.ird.observe.services.dto.longline.SetLonglineTdr] -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto - -[class fr.ird.observe.services.dto.longline.SizeMeasure] -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto - -[class fr.ird.observe.services.dto.longline.Tdr] -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -itemHorizontalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto -itemVerticalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.longline.TripLongline] -activityLongline.ordered = true -activityLongline.unique = true -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto -tripType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.TripTypeDto -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto - -[class fr.ird.observe.services.dto.longline.TripLonglineGearUse] -gearUseFeaturesLongline.ordered = true -gearUseFeaturesLongline.unique = true - -[class fr.ird.observe.services.dto.longline.WeightMeasure] -weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.WeightMeasureTypeDto - -[class fr.ird.observe.services.dto.referential.Gear] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic -gearCaracteristic.ordered = true - -[class fr.ird.observe.services.dto.referential.GearCaracteristic] -gearCaracteristicType.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicType - -[class fr.ird.observe.services.dto.referential.Harbour] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.LengthLengthParameter] -inpuSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType -outputSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.LengthWeightParameter] -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.Organism] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Person] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Program] -organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism - -[class fr.ird.observe.services.dto.referential.ShipOwner] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Species] -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean -ocean.ordered = true -speciesGroup.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroup -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.SpeciesGroup] -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseMode -speciesGroupReleaseMode.ordered = true -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatus -speciesGroupReleaseStatus.ordered = true - -[class fr.ird.observe.services.dto.referential.SpeciesList] -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -species.ordered = true - -[class fr.ird.observe.services.dto.referential.Vessel] -flagCountry.attributeGeneric = fr.ird.observe.services.dto.referential.Country -vesselSizeCategory.attributeGeneric = fr.ird.observe.services.dto.referential.VesselSizeCategory -vesselType.attributeGeneric = fr.ird.observe.services.dto.referential.VesselType -shipOwner.attributeGeneric = fr.ird.observe.services.dto.referential.ShipOwner - -[class fr.ird.observe.services.dto.referential.seine.WeightCategory] -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species - -[class fr.ird.observe.services.dto.seine.ActivitySeine] -currentFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -detectionMode.attributeGeneric = fr.ird.observe.services.dto.referential.seine.DetectionModeDto -nextFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto -previousFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -reasonForNoFishing.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto -setSeine.attributeGeneric = fr.ird.observe.services.dto.seine.SetSeineDto -surroundingActivity.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto -vesselActivitySeine.attributeGeneric = fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto -wind.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WindDto - -[class fr.ird.observe.services.dto.seine.FloatingObject] -objectOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectOperationDto -objectType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectTypeDto - -[class fr.ird.observe.services.dto.referential.seine.ObjectMaterial] -parent.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto - -[class fr.ird.observe.services.dto.seine.FloatingObjectPart] -objectMaterial.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto - -[class fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto - -[class fr.ird.observe.services.dto.seine.GearUseFeaturesSeine] -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto -gearUseFeaturesMeasurement.unique = true - -[class fr.ird.observe.services.dto.seine.NonTargetCatch] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto - -[class fr.ird.observe.services.dto.seine.NonTargetCatchRelease] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseModeDto -nonTargetCatchReleaseStatus.ordered = true - -[class fr.ird.observe.services.dto.seine.NonTargetCatchReleaseStatus] -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatusDto - -[class fr.ird.observe.services.dto.seine.NonTargetLength] -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFate -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.seine.NonTargetSample] -nonTargetLength.unique = true -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto - -[class fr.ird.observe.services.dto.seine.ObjectObservedSpecies] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -speciesStatus.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto - -[class fr.ird.observe.services.dto.seine.ObjectSchoolEstimate] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.seine.Route] -activitySeine.ordered = true -activitySeine.unique = true - -[class fr.ird.observe.services.dto.seine.SchoolEstimate] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.seine.SetSeine] -reasonForNullSet.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto - -[class fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchRelease] -nonTargetCatchRelease.ordered = true - -[class fr.ird.observe.services.dto.seine.TargetCatch] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WeightCategoryDto - -[class fr.ird.observe.services.dto.seine.TargetLength] -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto - -[class fr.ird.observe.services.dto.seine.TargetSample] -targetLength.unique = true - -[class fr.ird.observe.services.dto.seine.TransmittingBuoy] -country.attributeGeneric = fr.ird.observe.services.dto.referential.CountryDto -transmittingBuoyOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto -transmittingBuoyType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto - -[class fr.ird.observe.services.dto.seine.TripSeine] -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto -route.ordered = true -route.unique = true -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto - -[class fr.ird.observe.services.dto.seine.TripSeineGearUse] -gearUseFeaturesSeine.ordered = true -gearUseFeaturesSeine.unique = true ===================================== src/site/markdown/model.md ===================================== --- /dev/null +++ b/src/site/markdown/model.md @@ -0,0 +1,19 @@ +# ObServe - model + +Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence. + +Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*. + +## Version 5 + +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… + +## Version 7 + +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisat… +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisati… +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelis… +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/model… View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb5030cbea78041d713f63b9deb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb5030cbea78041d713f63b9deb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom version + clean poms
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b747830 by Tony CHEMIT at 2017-06-30T11:29:13+02:00 use last pom version + clean poms - - - - - 12 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - persistence/pom.xml - pom.xml - services-rest/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - topia-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -99,22 +99,6 @@ <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> <plugin> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -34,10 +34,6 @@ <name>ObServe :: Application Swing Validation</name> <description>ObServe Application Swing Validation</description> - <properties> - - </properties> - <dependencies>  ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -598,21 +598,6 @@ <finalName>${applicationName}-${project.version}</finalName> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <pluginManagement> <plugins> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -102,21 +102,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -164,16 +164,6 @@ <finalName>${applicationName}-${project.version}</finalName> - <resources> - <resource> - <directory>${project.basedir}/src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - - </resources> <plugins> <plugin> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -144,20 +144,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>${project.build.directory}/xmi</directory> - <includes> - <include>*.objectmodel-ext</include> - </includes> - </resource> - <resource> - <directory>${project.basedir}/src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <pluginManagement> @@ -239,7 +225,6 @@ <configuration> <defaultPackage>fr.ird.observe.persistence</defaultPackage> <fullPackagePath>fr.ird.observe</fullPackagePath> -  <inputs> <input>friend</input> </inputs> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>10</version> + <version>13</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -124,41 +124,4 @@ </dependencies> - - <build> - - <plugins> - - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <scripts> - <script><![CDATA[ - new org.reflections.Reflections("fr.ird.observe.services.rest") - .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") - ]]></script> - </scripts> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - - </build> - </project> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -172,28 +172,6 @@ <plugins> <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <id>generate-reflections.xml</id> - <phase>process-classes</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <scripts> - <script><![CDATA[ - new org.reflections.Reflections("fr.ird.observe.services.topia") - .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") - ]]></script> - </scripts> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -120,20 +120,7 @@ </dependencies> <build> - <resources> - <resource> - <directory>${project.build.directory}/generated-sources/resources/</directory> - <includes> - <include>objectmodel/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -173,12 +160,10 @@ <inputs> <input>friend</input> </inputs> -  <templates>org.nuiton.eugene.java.BeanTransformer</templates> <failIfUnsafe>true</failIfUnsafe> <defaultPackage>fr.ird.observe.services.dto</defaultPackage> <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> -  </configuration> <goals> <goal>generate</goal> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -67,23 +67,4 @@ </dependencies> - <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - - </build> - </project> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -84,12 +84,6 @@ <artifactId>HikariCP</artifactId> </dependency> -  -  <dependency> <groupId>junit</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8b747830861637b4d2d3de33c0b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8b747830861637b4d2d3de33c0b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom version
by Tony CHEMIT 30 Jun '17

30 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 52a1d233 by Tony CHEMIT at 2017-06-30T11:09:38+02:00 use last pom version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>10</version> + <version>13</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/52a1d2335d879d1774bfdf8ee34… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/52a1d2335d879d1774bfdf8ee34… You're receiving this email because of your account on gitlab.com.

1 0