[Git][ultreiaio/ird-observe][develop] 2 commits: review site

20 Mar 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
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

- - - - -


12 changed files:

- 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:

=====================================
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>
 
+    <!-- dev version (for develop purpose -->
+    <devMode>true</devMode>
+
+    <!--Modèle version-->
+    <observe.model.version>5.0</observe.model.version>
+
+    <!-- build timestamp configuration -->
+    <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 header configuration -->
     <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 configuration-->
     <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle>
@@ -207,13 +222,6 @@
     <gitlab.changesAuthorEmail>dev@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>
-
-    <!--Modèle version-->
-    <observe.model.version>6.0</observe.model.version>
-
     <!-- deploy nothing -->
     <maven.deploy.skip>true</maven.deploy.skip>
 
@@ -775,7 +783,6 @@
     <pluginManagement>
       <plugins>
 
-        <!-- plugin site -->
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <dependencies>
@@ -803,6 +810,24 @@
         </plugin>
 
         <plugin>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <configuration>
+            <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl>
+            <scmBranch>pages</scmBranch>
+            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
+          </configuration>
+          <executions>
+            <execution>
+              <id>scm-publish</id>
+              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+              <goals>
+                <goal>publish-scm</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
           <groupId>org.codehaus.gmavenplus</groupId>
           <artifactId>gmavenplus-plugin</artifactId>
           <dependencies>
@@ -874,14 +899,6 @@
 
       </plugins>
     </pluginManagement>
-    <extensions>
-      <!-- Enabling the use of scpexe with maven 3.0 -->
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0</version>
-      </extension>
-    </extensions>
   </build>
 
   <reporting>
@@ -938,6 +955,7 @@
           <plugin>
             <artifactId>maven-project-info-reports-plugin</artifactId>
             <version>${projectInfoReportsPluginVersion}</version>
+            <inherited>false</inherited>
             <reportSets>
               <reportSet>
                 <reports>
@@ -962,29 +980,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 +1073,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/8b948b06956ad1d68e65de589ed...

    

Tony CHEMIT

tags

participants (1)