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

[Git][ultreiaio/ird-observe][develop] [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT 22 Mar '17

22 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ece95278 by Tony CHEMIT at 2017-03-22T07:58:15+01:00 [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -97,12 +97,6 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); - addScript("02", "add-foreign-key-indexes", queries); - } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -147,7 +147,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); - addScript("01", "add-foreign-key-indexes", queries); + addScript("03", "add-foreign-key-indexes", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ece95278628e9d31d61bb116588…

1 0

[Git][ultreiaio/ird-observe][develop] [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT 22 Mar '17

22 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ece95278 by Tony CHEMIT at 2017-03-22T07:58:15+01:00 [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -97,12 +97,6 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); - addScript("02", "add-foreign-key-indexes", queries); - } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -147,7 +147,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); - addScript("01", "add-foreign-key-indexes", queries); + addScript("03", "add-foreign-key-indexes", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ece95278628e9d31d61bb116588…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT 22 Mar '17

22 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 86cf473d by Tony CHEMIT at 2017-03-22T07:55:44+01:00 La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 1 changed file: - entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql Changes: ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86cf473db976ca6c715bf2f056a…

1 0

[Git][ultreiaio/ird-observe][develop] add build for site
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 18065729 by Tony CHEMIT at 2017-03-20T14:52:25+01:00 add build for site - - - - - 1 changed file: - + src/site/resources/.gitlab-ci.yml Changes: ===================================== src/site/resources/.gitlab-ci.yml ===================================== --- /dev/null +++ b/src/site/resources/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/18065729921aff29af11062b7a7…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: af150cfb by Tony CHEMIT at 2017-03-20T14:51:47+01:00 Site checkin for project ObServe - - - - - 2 changed files: - + .gitlab-ci.yml - config-report.html Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -97,226 +97,33 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> -<td>Observe web Configuration</td> -<td>16</td> -<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> +<td>9</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> +<td>Observe web Configuration</td> +<td>16</td> +<td>0</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.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080/observeweb/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="b"> -<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="a"> -<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="b"> -<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="a"> -<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="b"> -<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="a"> -<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="b"> -<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="a"> -<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="b"> -<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="a"> -<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="b"> -<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> <div class="section"> <h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveSwingApplicationConfig">Options de la configuration</a></h4><br /> <table border="0" class="table table-striped"> -<tr class="a"> +<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="b"> +<tr class="a"> <td>config.file</td> <td>Le nom du fichier de configuration</td> <td> @@ -327,7 +134,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.devMode</td> <td>Mode développeur</td> <td> @@ -338,7 +145,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observe.model.version</td> <td>Version du modèle</td> <td> @@ -349,7 +156,7 @@ <td> <div> <pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.build.version</td> <td>Numéro de version</td> <td> @@ -360,7 +167,7 @@ <td> <div> <pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observe.build.date</td> <td>Date de version</td> <td> @@ -371,7 +178,7 @@ <td> <div> <pre style="monospaced">java.util.Date</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.build.number</td> <td>Numéro de build</td> <td> @@ -382,7 +189,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>data.directory</td> <td>Répertoire par défaut des ressources utilisateurs de l'application</td> <td> @@ -393,7 +200,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>db.directory</td> <td>Le répertoire où est stockée la base locale.</td> <td> @@ -404,7 +211,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>initial.db.dump</td> <td>La base embarquée créée lors de le premier import d'une base distante.</td> <td> @@ -415,7 +222,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.directory</td> <td>Répertoire par défaut où sauvegarder les bases locales</td> <td> @@ -426,7 +233,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>backup.file</td> <td>Fichier des informations des sauvegardes</td> <td> @@ -437,7 +244,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>import.directory</td> <td>Répertoire où chercher les imports</td> <td> @@ -448,7 +255,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>resources.directory</td> <td>Le répertoire où sont stockées les ressources de l'utilisateur comme les traductions ou les requêtes de rapports.</td> <td> @@ -459,7 +266,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>i18n.directory</td> <td>Répertoire par défaut des ressources de traduction de l'application</td> <td> @@ -470,7 +277,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>report.directory</td> <td>Répertoire par défaut des rapports de l'application</td> <td> @@ -481,7 +288,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.directory</td> <td>Le répertoire où sont stockées les cartes.</td> <td> @@ -492,7 +299,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.report.directory</td> <td>Le répertoire par défaut où sont stockés les rapports de validation</td> <td> @@ -503,7 +310,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>tmp.directory</td> <td>Le répertoire temporaire par défaut</td> <td> @@ -514,7 +321,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>logConfigurationFile</td> <td>Fichier de configuration des logs</td> <td> @@ -525,7 +332,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>swingSessionFile</td> <td>Fichier de sauvegarde des états des UI.</td> <td> @@ -536,7 +343,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>h2.username</td> <td>L'identifiant H2</td> <td> @@ -547,7 +354,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>h2.password</td> <td>Le mot de passe H2</td> <td> @@ -558,7 +365,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>h2.canMigrate</td> <td>Autoriser la mise à jour des bases locales (H2)</td> <td> @@ -569,7 +376,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>h2.serverPort</td> <td>Port du serveur H2</td> <td> @@ -580,7 +387,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>remoteDataSourceConfigurations</td> <td>connexions à des sources distantes</td> <td> @@ -591,7 +398,7 @@ <td> <div> <pre style="monospaced">[Lfr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration;</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>serverDataSourceConfigurations</td> <td>connexions à des serveursdistantes</td> <td> @@ -602,7 +409,7 @@ <td> <div> <pre style="monospaced">[Lfr.ird.observe.services.dto.presets.ServerDataSourceConfiguration;</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>pg.canMigrate</td> <td>Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base)</td> <td> @@ -613,7 +420,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>defaultDbMode</td> <td>Le mode de connexion a créer par défaut</td> <td> @@ -624,7 +431,7 @@ <td> <div> <pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.DbMode</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>defaultCreationMode</td> <td>Le mode de création de base locale par défaut</td> <td> @@ -635,7 +442,7 @@ <td> <div> <pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.CreationMode</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.storeRemoteStorage</td> <td>Pour activer la sauvegarde de la configuration de la source distante</td> <td> @@ -646,7 +453,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.loadLocalStorage</td> <td>Charger la base locale au démarrage de l'application</td> <td> @@ -657,7 +464,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>showMigrationProgression</td> <td>Afficher dans les logs la progression de la mise à jour d'une base</td> <td> @@ -668,7 +475,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>showMigrationSql</td> <td>Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base</td> <td> @@ -679,7 +486,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>showSql</td> <td>Afficher dans les logs toutes les requêtes sql executées</td> <td> @@ -690,7 +497,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.changeSynchroSrc</td> <td>Pour autoriser la sélection de la base source dans les opérations sur base</td> <td> @@ -701,7 +508,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showNumberEditorButton</td> <td>Pour afficher le bouton qui permet d'utiliser l'éditeur numérique à gauche de chaque champs numérique</td> <td> @@ -712,7 +519,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.autoPopupNumberEditor</td> <td>Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre</td> <td> @@ -723,7 +530,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showTimeEditorSlider</td> <td>Pour afficher la réglette d'édition des heures</td> <td> @@ -734,7 +541,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.fullscreen</td> <td>Pour afficher l'application en mode pleine écran</td> <td> @@ -745,7 +552,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.locale</td> <td>Langue utilisée par l'application (fr_FR, en_GB ou es_ES)</td> <td> @@ -756,7 +563,7 @@ <td> <div> <pre style="monospaced">java.util.Locale</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>db.locale</td> <td>La langue du référentiel</td> <td> @@ -767,7 +574,7 @@ <td> <div> <pre style="monospaced">java.util.Locale</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.fauneAssociee</td> <td>Observation des Faunes associées</td> <td> @@ -778,7 +585,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.rejetsThons</td> <td>Observation des rejets thon</td> <td> @@ -789,7 +596,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.mensurations</td> <td>Observation des mensurations</td> <td> @@ -800,7 +607,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.floatingObject</td> <td>Observation des objets flottants</td> <td> @@ -811,7 +618,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.activitysDetaillees</td> <td>Observation des activités détaillées</td> <td> @@ -822,7 +629,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.mammiferes</td> <td>Observation des mammifères</td> <td> @@ -833,7 +640,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.oiseaux</td> <td>Observation des oiseaux</td> <td> @@ -844,7 +651,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.gleure</td> <td>Observation de la gleure</td> <td> @@ -855,7 +662,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.targetCatch</td> <td>Espèces pour les captures cible</td> <td> @@ -866,7 +673,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.seine.schoolEstimate</td> <td>Espèces pour les estimations</td> <td> @@ -877,7 +684,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.objectSchoolEstimate</td> <td>Espèces pour les estimations banc objet</td> <td> @@ -888,7 +695,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.seine.nonTargetCatch</td> <td>Espèces pour les captures non cible</td> <td> @@ -899,7 +706,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.objectObservedSpecies</td> <td>Espèces pour les espèces non cible observées</td> <td> @@ -910,7 +717,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.longline.catch</td> <td>Espèces pour les captures - TDR</td> <td> @@ -921,7 +728,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.longline.encounter</td> <td>Espèces pour les rencontre</td> <td> @@ -932,7 +739,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.longline.depredator</td> <td>Espèces pour les rencontre</td> <td> @@ -943,7 +750,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.background.color</td> <td>Couleur du fond de carte</td> <td> @@ -954,7 +761,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer1.path</td> <td>Fichier (Shape Files) du premier calque de la carte</td> <td> @@ -965,7 +772,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer2.path</td> <td>Fichier (Shape Files) du deuxième calque de la carte</td> <td> @@ -976,7 +783,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer3.path</td> <td>Fichier (Shape Files) du troisième calque de la carte</td> <td> @@ -987,7 +794,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer4.path</td> <td>Fichier (Shape Files) du quatrième calque de la carte</td> <td> @@ -998,7 +805,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer5.path</td> <td>Fichier (Shape Files) du cinquième calque de la carte</td> <td> @@ -1009,7 +816,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer6.path</td> <td>Fichier (Shape Files) du sixième calque de la carte</td> <td> @@ -1020,7 +827,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer7.path</td> <td>Fichier (Shape Files) du septième calque de la carte</td> <td> @@ -1031,7 +838,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer8.path</td> <td>Fichier (Shape Files) du huitième calque de la carte</td> <td> @@ -1042,7 +849,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer9.path</td> <td>Fichier (Shape Files) du neuvième calque de la carte</td> <td> @@ -1053,7 +860,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer10.path</td> <td>Fichier (Shape Files) du dixième calque de la carte</td> <td> @@ -1064,7 +871,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.style.path</td> <td>Fichier des style à appliquer sur les calques de la carte</td> <td> @@ -1075,7 +882,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.treeOpenNodes</td> <td>Nœuds de l'arbre ouverts lors de la dernière fermeture de la base</td> <td> @@ -1086,7 +893,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.speedEnable</td> <td>Forcer la validation des vitesses d'activités</td> <td> @@ -1097,7 +904,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>validation.lengthWeightEnable</td> <td>Forcer la validation des bormes min/max de taille d'espèce</td> <td> @@ -1108,7 +915,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.speedMaxValue</td> <td>Vitesse maximale autorisée dans le contrôle des vitesses d'activités</td> <td> @@ -1119,7 +926,7 @@ <td> <div> <pre style="monospaced">java.lang.Float</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.use</td> <td>Pour activer la sauvegarde automatique</td> <td> @@ -1130,7 +937,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>backup.atClose</td> <td>Effectuer une sauvegarde de la base locale à la fermeture de l'application</td> <td> @@ -1141,7 +948,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.delay</td> <td>Temps en minutes entre chaque sauvegarde de la base locale</td> <td> @@ -1152,7 +959,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.coordinate.format</td> <td>Format des positions (DMD, DD, DMS)</td> <td> @@ -1163,7 +970,7 @@ <td> <div> <pre style="monospaced">org.nuiton.jaxx.widgets.gis.CoordinateFormat</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.focusBorder.color</td> <td>Couleur de la bordure de la zone qui a le focus</td> <td> @@ -1174,7 +981,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.noFocusBorderColor.color</td> <td>Couleur de la bordure de la zone qui n'a pas le focus</td> <td> @@ -1185,7 +992,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showMnemonic</td> <td>Afficher les racourcis clavier</td> <td> @@ -1196,7 +1003,7 @@ <td> <div> <pre style="monospaced">boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>http.timeout</td> <td>Maximum delay in millisecondes to http connections</td> <td> @@ -1210,49 +1017,242 @@ <div class="section"> <h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveSwingApplicationConfig">Actions de la configuration</a></h4><br /> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th>Description</th> <th>Aliases</th> <th>Action</th></tr> -<tr class="b"> +<tr class="a"> <td>Afficher l'aide</td> <td>-h,--help</td> <td>fr.ird.observe.application.swing.ObserveCLAction#help</td></tr> -<tr class="a"> +<tr class="b"> <td>Afficher le manuel utilisateur (mode graphique)</td> <td>--help-ui</td> <td>fr.ird.observe.application.swing.ObserveCLAction#helpUI</td></tr> -<tr class="b"> +<tr class="a"> <td>Ne pas lancer l'interface graphique</td> <td>-n,--no-main</td> <td>fr.ird.observe.application.swing.ObserveCLAction#disableMainUI</td></tr> -<tr class="a"> +<tr class="b"> <td>Configurer l'application</td> <td>--configure</td> <td>fr.ird.observe.application.swing.ObserveCLAction#configure</td></tr> -<tr class="b"> +<tr class="a"> <td>Lancer une opération d'administration</td> <td>-a,--admin</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI</td></tr> -<tr class="a"> +<tr class="b"> <td>Lancer une opération d'administration sur Obstuna</td> <td>--obstuna-admin</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI</td></tr> -<tr class="b"> +<tr class="a"> <td>Lancer ObServe en mode serveur</td> <td>--h2-server</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode</td></tr> -<tr class="a"> +<tr class="b"> <td>Ajouter le support JMX</td> <td>--jmx</td> <td>fr.ird.observe.application.swing.ObserveCLAction#useJMX</td></tr> -<tr class="b"> +<tr class="a"> <td>Générer des topiaIds. 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> +<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.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080/observeweb/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="b"> +<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="a"> +<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="b"> +<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="a"> +<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="b"> +<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="a"> +<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="b"> +<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="a"> +<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="b"> +<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="a"> +<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="b"> +<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> </div> </div> </div> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/af150cfb145f1bf31854e0fb006…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 680ab3d4 by Tony CHEMIT at 2017-03-20T14:42:32+01:00 Site checkin for project ObServe - - - - - 30 changed files: - − .gitlab-ci.yml - 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/observe-common.zargo - model/observe-longline.zargo - model/observe-seine.zargo - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - − site.js - sitemap.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/680ab3d470d67e68a98802b8fe4…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bd0dd9a2 by Tony CHEMIT at 2017-03-20T11:57:30+01:00 update changelog [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ **Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bd0dd9a2362f3cf501b8d5ad0c8…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] 20 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 9f47ba93 by Tony CHEMIT at 2017-03-15T15:07:30+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - cd0ad7a7 by Tony CHEMIT at 2017-03-15T15:13:43+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 0349bd86 by Tony CHEMIT at 2017-03-15T15:13:44+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 618eb890 by Tony CHEMIT at 2017-03-15T15:13:45+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 50d10cea by Tony CHEMIT at 2017-03-20T08:57:40+00:00 Update .gitlab-ci.yml - - - - - f8460ca9 by Tony CHEMIT at 2017-03-20T08:59:51+00:00 Update .gitlab-ci.yml - - - - - 8b948b06 by Tony CHEMIT at 2017-03-20T09:03:16+00:00 Update README.md - - - - - 52c35b8c by Tony CHEMIT at 2017-03-20T10:22:58+01:00 review site - - - - - 8cb5d39b by Tony CHEMIT at 2017-03-20T10:23:07+01:00 review pom - - - - - dd4c4ab8 by Tony CHEMIT at 2017-03-20T10:28:04+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 2523f24e by Tony CHEMIT at 2017-03-20T10:50:12+01:00 update changelog - - - - - 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 7e42bc7e by Tony CHEMIT at 2017-03-20T10:53:04+01:00 rerool 6.0-RC-1 - - - - - f9dfb0a4 by Tony CHEMIT at 2017-03-20T10:55:02+01:00 update color [skip ci] - - - - - 41181596 by Tony CHEMIT at 2017-03-20T10:58:35+01:00 update readme [skip ci] - - - - - 8ae66bc2 by Tony CHEMIT at 2017-03-20T11:36:30+01:00 fix model version - - - - - c8e85e0a by Tony CHEMIT at 2017-03-20T11:40:15+01:00 better gitflow configuration [skip ci] - - - - - 6664279c by Tony CHEMIT at 2017-03-20T11:41:32+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 8d2b2cee by Tony CHEMIT at 2017-03-20T11:47:15+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 16 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - pom.xml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png - src/site/resources/images/logo.png → src/site/resources/img/logo.png - src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - − src/site/resources/site.js - src/site/site_fr.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone tags: @@ -34,8 +36,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" .env_test: &env_test environment: @@ -51,8 +55,7 @@ stages: .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn clean verify site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test @@ -86,11 +89,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -146,13 +149,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,17 +1,18 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop/build.svg) +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop/build.svg) +[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-green.svg)](http://www.gnu.o… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG… -* [Documentation](http://observe.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.… +* [Documentation](http://ultreiaio.gitlab.io/ird-observe) # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-1) # Community @@ -19,3 +20,37 @@ * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) + +# Release (without stage) + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +# Release (with stage) + +Create stage + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +And to release stage + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +``` + +# Generate site + +``` +mvn clean verify site -DperformRelease scm-publish:publish-scm +``` \ No newline at end of file ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack return; } - boolean mustClose = false; ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource(); - if (mainDataSource == null || !mainDataSource.isLocal()) { - - mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig()); - mustClose = true; + if (mainDataSource == null) { + if (log.isInfoEnabled()) { + log.info("Skip, no database open."); + } + return; } - - try { - File file = doBackup(applicationContext, mainDataSource); - applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); - } finally { - - if (mustClose) { - mainDataSource.close(); + if (!mainDataSource.isLocal()) { + if (log.isInfoEnabled()) { + log.info("Skip, open database is not local."); } + return; } + File file = doBackup(applicationContext, mainDataSource); + applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>5</version> + <version>9</version> </parent> <groupId>fr.ird.observe</groupId> @@ -36,7 +36,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.ultreia.io</url> + <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -109,6 +109,11 @@ </developer> </developers> + <issueManagement> + <system>gitlab</system> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + </issueManagement> + <modules> <module>toolbox-maven-plugin</module> <module>topia-extension</module> @@ -148,18 +153,34 @@ </scm> <distributionManagement> - <site> - <id>doc.ultreia.io</id> + <site> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> </site> </distributionManagement> <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> +  + <devMode>true</devMode> + +  + <observe.model.version>6.0</observe.model.version> + +  + <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> + <buildDate>${maven.build.timestamp}</buildDate> + + <mavenVersion>3.3.9</mavenVersion> + + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <licensePluginVersion>1.9</licensePluginVersion> + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -173,14 +194,9 @@ <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> - <licensePluginVersion>1.9</licensePluginVersion> - - <mavenVersion>3.3.9</mavenVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -199,7 +215,6 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> @@ -207,12 +222,8 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> - <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> - <buildDate>${maven.build.timestamp}</buildDate> - <devMode>true</devMode> - -  - <observe.model.version>6.0</observe.model.version> +  + <scmCommentPrefix>Release [skip ci]</scmCommentPrefix>  <maven.deploy.skip>true</maven.deploy.skip> @@ -775,7 +786,6 @@ <pluginManagement> <plugins> -  <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -803,6 +813,24 @@ </plugin> <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <dependencies> @@ -874,14 +902,6 @@ </plugins> </pluginManagement> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> </build> <reporting> @@ -938,6 +958,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -962,29 +983,40 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> <version>${changesPluginVersion}</version> + <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> - <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> </issueLinkTemplatePerSystem> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>${changelogPluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>${licensePluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -1044,20 +1076,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - </plugins> </build> ===================================== src/site/resources/images/architecture.png → src/site/resources/img/architecture.png ===================================== Binary files a/src/site/resources/images/architecture.png and b/src/site/resources/img/architecture.png differ ===================================== src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/images/architecture.svg +++ b/src/site/resources/img/architecture.svg ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png ===================================== Binary files a/src/site/resources/images/logos/jaxx-logo.png and b/src/site/resources/img/jaxx-logo.png differ ===================================== src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png ===================================== Binary files a/src/site/resources/images/logo-small.png and b/src/site/resources/img/logo-small.png differ ===================================== src/site/resources/images/logo.png → src/site/resources/img/logo.png ===================================== Binary files a/src/site/resources/images/logo.png and b/src/site/resources/img/logo.png differ ===================================== src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files a/src/site/resources/images/logos/logo_IntelliJIDEA.png and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/resources/site.js deleted ===================================== --- a/src/site/resources/site.js +++ /dev/null @@ -1,285 +0,0 @@ -/*- - * #%L - * ObServe - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#mavenProjectProperties'); - - if (metas.length == 0) { - return; - } - - $.debugOn = function () { - $('#mavenProjectProperties').attr('DEBUG', true); - }; - - $.debugOff = function () { - $('#mavenProjectProperties').attr('DEBUG', null); - }; - - var debug = function (metas) { - return metas.attr('DEBUG'); - }; - - var urlParameters = decodeURIComponent(window.location.search.slice(1)) - .split('&') - .reduce(function _reduce(a, b) { - b = b.split('='); - a[b[0]] = b[1]; - return a; - }, {}); - - if (urlParameters.debug) { - $.debugOn(); - } - - var projectId = metas.attr('projectId'); - var version = metas.attr('version'); - var locale = metas.attr('locale'); - - var rootUrl= 'http://' + window.location.hostname ; - var useDocUrl = false; - var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1; - - var DEBUG = debug(metas); - - if (DEBUG) { - console.info("localeInPath: " + localeInPath); - } - - var addVersion = function (metas) { - - var DEBUG = debug(metas); - - var versionsUrl = rootUrl + '/versions'; - - $.get(versionsUrl) - .fail(function () { - console.error("can't load url: " + versionsUrl); - }) - .done(function (allVersions) { - - if (DEBUG) { - console.info("Versions url: " + versionsUrl); - console.info("All versions: " + allVersions); - } - - var labels; - if ('en' == locale) { - labels = {develop: 'in progress', latest: 'latest release'}; - } else { - labels = {develop: 'en cours', latest: 'dernière stable'}; - } - var versions = allVersions.split(' '); - if (DEBUG) { - console.info("Versions : " + versions); - console.info("version : " + version); - } - var versionsHtml = "<select id='versions' class='versions pull-left'>"; - $(versions).each(function (index, value) { - value = value.trim(); - var label; - if ('develop' == value || 'latest' == value) { - label = labels[value]; - } else { - label = value; - } - - if (DEBUG) { - console.info("Version to add " + label + " (" + value + ")"); - } - versionsHtml += "<option value='" + value + "'"; - if (version == value) { - versionsHtml += " selected='selected'"; - } - versionsHtml += ">Version " + label + "</option>"; - }); - versionsHtml += "</select><span class='divider'>»</span>"; - - $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml); - $('#versions').change(function () { - var DEBUG = debug(metas); - var newVersion = $(this).val(); - var newUrl = rootUrl + '/' + newVersion; - if (localeInPath) { - newUrl += "/" + locale; - } - if (DEBUG) { - console.info("Change to version: " + newUrl); - } - window.location = newUrl; - }); - - }); - - }; - - var addScmwebeditor = function (metas) { - - var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action'; - - if ('develop' != version) { - return; - } - - var skipDefaultFiles = [ - "project-info.html", - "team-list.html", - "mail-lists.html", - "integration.html", - "issue-tracking.html", - "license.html", - "source-repository.html", - "dependencies.html", - "dependency-info.html", - "dependency-convergence.html", - "plugin-management.html", - "plugins.html", - "dependency-management.html", - "project-summary.html", - "project-reports.html", - "dev-activity.html", - "file-activity.html", - "changelog.html", - "surefire-report.html", - "third-party-report.html", - "sonar.html", - "dependency-updates-report.html", - "plugin-updates-report.html", - "property-updates-report.html", - "changes-report.html", - "redmine-report.html", - "application-config-report.html" - ]; - - var DEBUG = debug(metas); - - var scm = 'https://gitlab.com/ultreia.io/observe.git'; - - if (DEBUG) { - console.info('scm: ' + scm); - } - - var sourcesType = metas.attr('sourcesType'); - - var pathname = document.location.pathname; - - // remove prefix - if (useDocUrl) { - pathname = pathname.replace('/' + projectId + '/develop', ''); - } else { - pathname = pathname.replace('/develop', ''); - } - - if (DEBUG) { - console.info('pathname: ' + pathname); - } - - var path; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). replace('/site/', ''); - } else { - if (pathname == '/' || pathname == '') { - // on / page - path = 'index.html'; - } else { - path = pathname; - } - } - - if (localeInPath) { - - // locale detected in path (means not default locale) - // remove locale from path - path = path.substr(('/' + locale).length); - } - - if (DEBUG) { - console.info('path: ' + path); - } - if ($.inArray(path, skipDefaultFiles) > -1) { - // skip this file - if (DEBUG) { - console.info('skipDefaultFiles: ' + path); - } - return; - } - - var skipFiles = metas.attr('scmwebeditor_skipFiles'); - if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) { - // skip this file - if (DEBUG) { - console.info('skipFiles: ' + path); - } - return; - } - - path = path.replace('.html', ''); - if (path.indexOf('/') == 0) { - path = path.substr(1); - } - - var vmFiles = metas.attr('scmwebeditor_vmFiles'); - - // add vm on vmFiles - if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) { - if (DEBUG) { - console.info("Found vm file: " + path); - } - path += '.' + sourcesType + '.vm'; - } else { - if (DEBUG) { - console.info("Not found vm file: " + path); - } - path += '.' + sourcesType; - } - - if (DEBUG) { - console.info('final path: ' + path); - } - - var address = scm + "/src/site"; - if (localeInPath) { - address += '/' + locale; - } - address += '/' + sourcesType + '/' + path; - if (DEBUG) { - console.info('address: ' + address); - } - var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address; - - if (DEBUG) { - console.info('edit url: ' + url); - } - - $('#publishDate').prepend( - "<li class='pull-right'><a target='edit' href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>" - ); - - }; - - addScmwebeditor(metas); - - addVersion(metas); - -}); \ No newline at end of file ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -48,35 +48,26 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src> + <src>./img/logo-small.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - - <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/> - + <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> <![CDATA[ <script type="text/javascript" src="site.js"> </script><link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>]]> </head> - <links> - <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> + <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -84,8 +75,7 @@ <item name="Installation" href="install.html"/> <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> - <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/> + <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -98,7 +88,5 @@ <menu ref="reports"/> - <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer> - </body> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4a108146f5490d2a887f5de6ce…

1 0