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

Commits:

12 changed files:

Changes:

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>io.ultreia.maven</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5</version>
    
    29
    +    <version>9</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -36,7 +36,7 @@
    36 36
     
    
    37 37
       <name>ObServe</name>
    
    38 38
       <description>Projet ObServe</description>
    
    39
    -  <url>http://observe.ultreia.io</url>
    
    39
    +  <url>https://ultreiaio.gitlab.io/ird-observe</url>
    
    40 40
       <inceptionYear>2008</inceptionYear>
    
    41 41
       <organization>
    
    42 42
         <name>IRD</name>
    
    ... ... @@ -109,6 +109,11 @@
    109 109
         </developer>
    
    110 110
       </developers>
    
    111 111
     
    
    112
    +  <issueManagement>
    
    113
    +    <system>gitlab</system>
    
    114
    +    <url>https://gitlab.com/ultreia.io/ird-observe</url>
    
    115
    +  </issueManagement>
    
    116
    +
    
    112 117
       <modules>
    
    113 118
         <module>toolbox-maven-plugin</module>
    
    114 119
         <module>topia-extension</module>
    
    ... ... @@ -148,18 +153,34 @@
    148 153
       </scm>
    
    149 154
     
    
    150 155
       <distributionManagement>
    
    151
    -    <site>
    
    152
    -      <id>doc.ultreia.io</id>
    
    156
    +     <site>
    
    157
    +      <id>gitlab.com</id>
    
    158
    +      <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url>
    
    153 159
         </site>
    
    154 160
       </distributionManagement>
    
    155 161
     
    
    156 162
       <properties>
    
    157 163
     
    
    158
    -    <organizationId>ultreia.io</organizationId>
    
    164
    +    <organizationId>ultreiaio</organizationId>
    
    159 165
         <projectId>ird-observe</projectId>
    
    160 166
     
    
    167
    +    <!-- dev version (for develop purpose -->
    
    168
    +    <devMode>true</devMode>
    
    169
    +
    
    170
    +    <!--Modèle version-->
    
    171
    +    <observe.model.version>5.0</observe.model.version>
    
    172
    +
    
    173
    +    <!-- build timestamp configuration -->
    
    174
    +    <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    
    175
    +    <buildDate>${maven.build.timestamp}</buildDate>
    
    176
    +
    
    177
    +    <mavenVersion>3.3.9</mavenVersion>
    
    178
    +
    
    179
    +    <gitlabPluginVersion>1.0.7</gitlabPluginVersion>
    
    161 180
         <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
    
    162 181
         <processorPluginVersion>1.3</processorPluginVersion>
    
    182
    +    <licensePluginVersion>1.9</licensePluginVersion>
    
    183
    +
    
    163 184
         <jaxxVersion>3.0-alpha-6</jaxxVersion>
    
    164 185
         <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
    
    165 186
         <nuitonConfigVersion>3.2</nuitonConfigVersion>
    
    ... ... @@ -173,14 +194,9 @@
    173 194
         <sl4jVersion>1.7.23</sl4jVersion>
    
    174 195
         <swingXVersion>1.6.5-1</swingXVersion>
    
    175 196
         <reflectionsVersion>0.9.10</reflectionsVersion>
    
    176
    -
    
    177 197
         <webmotionVersion>2.5.1</webmotionVersion>
    
    178 198
         <httpComponentsVersion>4.5.3</httpComponentsVersion>
    
    179 199
     
    
    180
    -    <licensePluginVersion>1.9</licensePluginVersion>
    
    181
    -
    
    182
    -    <mavenVersion>3.3.9</mavenVersion>
    
    183
    -
    
    184 200
         <!-- license header configuration -->
    
    185 201
         <license.licenseName>gpl_v3</license.licenseName>
    
    186 202
         <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
    
    ... ... @@ -199,7 +215,6 @@
    199 215
         <locales>fr</locales>
    
    200 216
         <generateSitemap>true</generateSitemap>
    
    201 217
         <relativizeDecorationLinks>false</relativizeDecorationLinks>
    
    202
    -    <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>
    
    203 218
     
    
    204 219
         <!--Gitlab configuration-->
    
    205 220
         <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle>
    
    ... ... @@ -207,13 +222,6 @@
    207 222
         <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail>
    
    208 223
         <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers>
    
    209 224
     
    
    210
    -    <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    
    211
    -    <buildDate>${maven.build.timestamp}</buildDate>
    
    212
    -    <devMode>true</devMode>
    
    213
    -
    
    214
    -    <!--Modèle version-->
    
    215
    -    <observe.model.version>6.0</observe.model.version>
    
    216
    -
    
    217 225
         <!-- deploy nothing -->
    
    218 226
         <maven.deploy.skip>true</maven.deploy.skip>
    
    219 227
     
    
    ... ... @@ -775,7 +783,6 @@
    775 783
         <pluginManagement>
    
    776 784
           <plugins>
    
    777 785
     
    
    778
    -        <!-- plugin site -->
    
    779 786
             <plugin>
    
    780 787
               <artifactId>maven-site-plugin</artifactId>
    
    781 788
               <dependencies>
    
    ... ... @@ -803,6 +810,24 @@
    803 810
             </plugin>
    
    804 811
     
    
    805 812
             <plugin>
    
    813
    +          <artifactId>maven-scm-publish-plugin</artifactId>
    
    814
    +          <configuration>
    
    815
    +            <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl>
    
    816
    +            <scmBranch>pages</scmBranch>
    
    817
    +            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
    
    818
    +          </configuration>
    
    819
    +          <executions>
    
    820
    +            <execution>
    
    821
    +              <id>scm-publish</id>
    
    822
    +              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
    
    823
    +              <goals>
    
    824
    +                <goal>publish-scm</goal>
    
    825
    +              </goals>
    
    826
    +            </execution>
    
    827
    +          </executions>
    
    828
    +        </plugin>
    
    829
    +
    
    830
    +        <plugin>
    
    806 831
               <groupId>org.codehaus.gmavenplus</groupId>
    
    807 832
               <artifactId>gmavenplus-plugin</artifactId>
    
    808 833
               <dependencies>
    
    ... ... @@ -874,14 +899,6 @@
    874 899
     
    
    875 900
           </plugins>
    
    876 901
         </pluginManagement>
    
    877
    -    <extensions>
    
    878
    -      <!-- Enabling the use of scpexe with maven 3.0 -->
    
    879
    -      <extension>
    
    880
    -        <groupId>org.apache.maven.wagon</groupId>
    
    881
    -        <artifactId>wagon-ssh-external</artifactId>
    
    882
    -        <version>1.0</version>
    
    883
    -      </extension>
    
    884
    -    </extensions>
    
    885 902
       </build>
    
    886 903
     
    
    887 904
       <reporting>
    
    ... ... @@ -938,6 +955,7 @@
    938 955
               <plugin>
    
    939 956
                 <artifactId>maven-project-info-reports-plugin</artifactId>
    
    940 957
                 <version>${projectInfoReportsPluginVersion}</version>
    
    958
    +            <inherited>false</inherited>
    
    941 959
                 <reportSets>
    
    942 960
                   <reportSet>
    
    943 961
                     <reports>
    
    ... ... @@ -962,29 +980,40 @@
    962 980
               <plugin>
    
    963 981
                 <artifactId>maven-changes-plugin</artifactId>
    
    964 982
                 <version>${changesPluginVersion}</version>
    
    983
    +            <inherited>false</inherited>
    
    965 984
                 <configuration>
    
    966 985
                   <issueLinkTemplatePerSystem>
    
    967
    -                <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab>
    
    986
    +                <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab>
    
    968 987
                   </issueLinkTemplatePerSystem>
    
    969 988
                   <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath>
    
    970 989
                 </configuration>
    
    990
    +            <reportSets>
    
    991
    +              <reportSet>
    
    992
    +                <reports>
    
    993
    +                  <report>changes-report</report>
    
    994
    +                </reports>
    
    995
    +              </reportSet>
    
    996
    +            </reportSets>
    
    971 997
               </plugin>
    
    972 998
     
    
    973 999
               <plugin>
    
    974 1000
                 <artifactId>maven-changelog-plugin</artifactId>
    
    975 1001
                 <version>${changelogPluginVersion}</version>
    
    1002
    +            <inherited>false</inherited>
    
    976 1003
               </plugin>
    
    977 1004
     
    
    978 1005
               <plugin>
    
    979 1006
                 <groupId>org.codehaus.mojo</groupId>
    
    980 1007
                 <artifactId>license-maven-plugin</artifactId>
    
    981 1008
                 <version>${licensePluginVersion}</version>
    
    1009
    +            <inherited>false</inherited>
    
    982 1010
               </plugin>
    
    983 1011
     
    
    984 1012
               <plugin>
    
    985 1013
                 <groupId>org.codehaus.mojo</groupId>
    
    986 1014
                 <artifactId>versions-maven-plugin</artifactId>
    
    987 1015
                 <version>${versionsPluginVersion}</version>
    
    1016
    +            <inherited>false</inherited>
    
    988 1017
                 <reportSets>
    
    989 1018
                   <reportSet>
    
    990 1019
                     <reports>
    
    ... ... @@ -1044,20 +1073,6 @@
    1044 1073
                 </executions>
    
    1045 1074
               </plugin>
    
    1046 1075
     
    
    1047
    -          <plugin>
    
    1048
    -            <groupId>org.nuiton</groupId>
    
    1049
    -            <artifactId>helper-maven-plugin</artifactId>
    
    1050
    -            <executions>
    
    1051
    -              <execution>
    
    1052
    -                <id>compute-distribution-site-url</id>
    
    1053
    -                <goals>
    
    1054
    -                  <goal>compute-distribution-site-url</goal>
    
    1055
    -                </goals>
    
    1056
    -                <phase>pre-site</phase>
    
    1057
    -              </execution>
    
    1058
    -            </executions>
    
    1059
    -          </plugin>
    
    1060
    -
    
    1061 1076
             </plugins>
    
    1062 1077
     
    
    1063 1078
           </build>
    

  • src/site/resources/images/architecture.pngsrc/site/resources/img/architecture.png
    No preview for this file type
  • src/site/resources/images/architecture.svgsrc/site/resources/img/architecture.svg

  • src/site/resources/images/logos/argouml-logo.pngsrc/site/resources/img/argouml-logo.png
    No preview for this file type
  • src/site/resources/images/logos/jaxx-logo.pngsrc/site/resources/img/jaxx-logo.png
    No preview for this file type
  • src/site/resources/images/logo-small.pngsrc/site/resources/img/logo-small.png
    No preview for this file type
  • src/site/resources/images/logo.pngsrc/site/resources/img/logo.png
    No preview for this file type
  • src/site/resources/images/logos/logo_IntelliJIDEA.pngsrc/site/resources/img/logo_IntelliJIDEA.png
    No preview for this file type
  • src/site/resources/images/logo_ird.pngsrc/site/resources/img/logo_ird.png
    No preview for this file type
  • src/site/resources/images/logos/topia-logo.pngsrc/site/resources/img/topia-logo.png
    No preview for this file type
  • src/site/resources/site.js deleted
    1
    -/*-
    
    2
    - * #%L
    
    3
    - * ObServe
    
    4
    - * %%
    
    5
    - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    
    6
    - * %%
    
    7
    - * This program is free software: you can redistribute it and/or modify
    
    8
    - * it under the terms of the GNU General Public License as
    
    9
    - * published by the Free Software Foundation, either version 3 of the
    
    10
    - * License, or (at your option) any later version.
    
    11
    - * 
    
    12
    - * This program is distributed in the hope that it will be useful,
    
    13
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    - * GNU General Public License for more details.
    
    16
    - * 
    
    17
    - * You should have received a copy of the GNU General Public
    
    18
    - * License along with this program.  If not, see
    
    19
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    - * #L%
    
    21
    - */
    
    22
    -$(document).ready(function () {
    
    23
    -
    
    24
    -    var metas = $('#mavenProjectProperties');
    
    25
    -
    
    26
    -    if (metas.length == 0) {
    
    27
    -        return;
    
    28
    -    }
    
    29
    -
    
    30
    -    $.debugOn = function () {
    
    31
    -        $('#mavenProjectProperties').attr('DEBUG', true);
    
    32
    -    };
    
    33
    -
    
    34
    -    $.debugOff = function () {
    
    35
    -        $('#mavenProjectProperties').attr('DEBUG', null);
    
    36
    -    };
    
    37
    -
    
    38
    -    var debug = function (metas) {
    
    39
    -        return metas.attr('DEBUG');
    
    40
    -    };
    
    41
    -
    
    42
    -    var urlParameters = decodeURIComponent(window.location.search.slice(1))
    
    43
    -        .split('&')
    
    44
    -        .reduce(function _reduce(a, b) {
    
    45
    -            b = b.split('=');
    
    46
    -            a[b[0]] = b[1];
    
    47
    -            return a;
    
    48
    -        }, {});
    
    49
    -
    
    50
    -    if (urlParameters.debug) {
    
    51
    -        $.debugOn();
    
    52
    -    }
    
    53
    -
    
    54
    -    var projectId = metas.attr('projectId');
    
    55
    -    var version = metas.attr('version');
    
    56
    -    var locale = metas.attr('locale');
    
    57
    -
    
    58
    -    var rootUrl= 'http://' + window.location.hostname ;
    
    59
    -    var useDocUrl = false;
    
    60
    -    var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1;
    
    61
    -
    
    62
    -    var DEBUG = debug(metas);
    
    63
    -
    
    64
    -    if (DEBUG) {
    
    65
    -        console.info("localeInPath: " + localeInPath);
    
    66
    -    }
    
    67
    -
    
    68
    -    var addVersion = function (metas) {
    
    69
    -
    
    70
    -        var DEBUG = debug(metas);
    
    71
    -
    
    72
    -        var versionsUrl = rootUrl + '/versions';
    
    73
    -
    
    74
    -        $.get(versionsUrl)
    
    75
    -            .fail(function () {
    
    76
    -                console.error("can't load url: " + versionsUrl);
    
    77
    -            })
    
    78
    -            .done(function (allVersions) {
    
    79
    -
    
    80
    -                if (DEBUG) {
    
    81
    -                    console.info("Versions url: " + versionsUrl);
    
    82
    -                    console.info("All versions: " + allVersions);
    
    83
    -                }
    
    84
    -
    
    85
    -                var labels;
    
    86
    -                if ('en' == locale) {
    
    87
    -                    labels = {develop: 'in progress', latest: 'latest release'};
    
    88
    -                } else {
    
    89
    -                    labels = {develop: 'en cours', latest: 'dernière stable'};
    
    90
    -                }
    
    91
    -                var versions = allVersions.split(' ');
    
    92
    -                if (DEBUG) {
    
    93
    -                    console.info("Versions : " + versions);
    
    94
    -                    console.info("version  : " + version);
    
    95
    -                }
    
    96
    -                var versionsHtml = "<select id='versions' class='versions pull-left'>";
    
    97
    -                $(versions).each(function (index, value) {
    
    98
    -                    value = value.trim();
    
    99
    -                    var label;
    
    100
    -                    if ('develop' == value || 'latest' == value) {
    
    101
    -                        label = labels[value];
    
    102
    -                    } else {
    
    103
    -                        label = value;
    
    104
    -                    }
    
    105
    -
    
    106
    -                    if (DEBUG) {
    
    107
    -                        console.info("Version to add " + label + " (" + value + ")");
    
    108
    -                    }
    
    109
    -                    versionsHtml += "<option value='" + value + "'";
    
    110
    -                    if (version == value) {
    
    111
    -                        versionsHtml += " selected='selected'";
    
    112
    -                    }
    
    113
    -                    versionsHtml += ">Version " + label + "</option>";
    
    114
    -                });
    
    115
    -                versionsHtml += "</select><span class='divider'>»</span>";
    
    116
    -
    
    117
    -                $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml);
    
    118
    -                $('#versions').change(function () {
    
    119
    -                    var DEBUG = debug(metas);
    
    120
    -                    var newVersion = $(this).val();
    
    121
    -                    var newUrl = rootUrl + '/' + newVersion;
    
    122
    -                    if (localeInPath) {
    
    123
    -                        newUrl += "/" + locale;
    
    124
    -                    }
    
    125
    -                    if (DEBUG) {
    
    126
    -                        console.info("Change to version: " + newUrl);
    
    127
    -                    }
    
    128
    -                    window.location = newUrl;
    
    129
    -                });
    
    130
    -
    
    131
    -            });
    
    132
    -
    
    133
    -    };
    
    134
    -
    
    135
    -    var addScmwebeditor = function (metas) {
    
    136
    -
    
    137
    -        var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action';
    
    138
    -
    
    139
    -        if ('develop' != version) {
    
    140
    -            return;
    
    141
    -        }
    
    142
    -
    
    143
    -        var skipDefaultFiles = [
    
    144
    -            "project-info.html",
    
    145
    -            "team-list.html",
    
    146
    -            "mail-lists.html",
    
    147
    -            "integration.html",
    
    148
    -            "issue-tracking.html",
    
    149
    -            "license.html",
    
    150
    -            "source-repository.html",
    
    151
    -            "dependencies.html",
    
    152
    -            "dependency-info.html",
    
    153
    -            "dependency-convergence.html",
    
    154
    -            "plugin-management.html",
    
    155
    -            "plugins.html",
    
    156
    -            "dependency-management.html",
    
    157
    -            "project-summary.html",
    
    158
    -            "project-reports.html",
    
    159
    -            "dev-activity.html",
    
    160
    -            "file-activity.html",
    
    161
    -            "changelog.html",
    
    162
    -            "surefire-report.html",
    
    163
    -            "third-party-report.html",
    
    164
    -            "sonar.html",
    
    165
    -            "dependency-updates-report.html",
    
    166
    -            "plugin-updates-report.html",
    
    167
    -            "property-updates-report.html",
    
    168
    -            "changes-report.html",
    
    169
    -            "redmine-report.html",
    
    170
    -            "application-config-report.html"
    
    171
    -        ];
    
    172
    -
    
    173
    -        var DEBUG = debug(metas);
    
    174
    -
    
    175
    -        var scm = 'https://gitlab.com/ultreia.io/observe.git';
    
    176
    -
    
    177
    -        if (DEBUG) {
    
    178
    -            console.info('scm: ' + scm);
    
    179
    -        }
    
    180
    -
    
    181
    -        var sourcesType = metas.attr('sourcesType');
    
    182
    -
    
    183
    -        var pathname = document.location.pathname;
    
    184
    -
    
    185
    -        // remove prefix
    
    186
    -        if (useDocUrl) {
    
    187
    -            pathname = pathname.replace('/' + projectId + '/develop', '');
    
    188
    -        } else {
    
    189
    -            pathname = pathname.replace('/develop', '');
    
    190
    -        }
    
    191
    -
    
    192
    -        if (DEBUG) {
    
    193
    -            console.info('pathname: ' + pathname);
    
    194
    -        }
    
    195
    -
    
    196
    -        var path;
    
    197
    -        if (pathname.indexOf('target/site') > 0) {
    
    198
    -            path = pathname.substr(pathname.indexOf('/site')). replace('/site/', '');
    
    199
    -        } else {
    
    200
    -            if (pathname == '/' || pathname == '') {
    
    201
    -                // on / page
    
    202
    -                path = 'index.html';
    
    203
    -            } else {
    
    204
    -                path = pathname;
    
    205
    -            }
    
    206
    -        }
    
    207
    -
    
    208
    -        if (localeInPath) {
    
    209
    -
    
    210
    -            // locale detected in path (means not default locale)
    
    211
    -            // remove locale from path
    
    212
    -            path = path.substr(('/' + locale).length);
    
    213
    -        }
    
    214
    -
    
    215
    -        if (DEBUG) {
    
    216
    -            console.info('path: ' + path);
    
    217
    -        }
    
    218
    -        if ($.inArray(path, skipDefaultFiles) > -1) {
    
    219
    -            // skip this file
    
    220
    -            if (DEBUG) {
    
    221
    -                console.info('skipDefaultFiles: ' + path);
    
    222
    -            }
    
    223
    -            return;
    
    224
    -        }
    
    225
    -
    
    226
    -        var skipFiles = metas.attr('scmwebeditor_skipFiles');
    
    227
    -        if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) {
    
    228
    -            // skip this file
    
    229
    -            if (DEBUG) {
    
    230
    -                console.info('skipFiles: ' + path);
    
    231
    -            }
    
    232
    -            return;
    
    233
    -        }
    
    234
    -
    
    235
    -        path = path.replace('.html', '');
    
    236
    -        if (path.indexOf('/') == 0) {
    
    237
    -            path = path.substr(1);
    
    238
    -        }
    
    239
    -
    
    240
    -        var vmFiles = metas.attr('scmwebeditor_vmFiles');
    
    241
    -
    
    242
    -        // add vm on vmFiles
    
    243
    -        if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) {
    
    244
    -            if (DEBUG) {
    
    245
    -                console.info("Found vm file: " + path);
    
    246
    -            }
    
    247
    -            path += '.' + sourcesType + '.vm';
    
    248
    -        } else {
    
    249
    -            if (DEBUG) {
    
    250
    -                console.info("Not found vm file: " + path);
    
    251
    -            }
    
    252
    -            path += '.' + sourcesType;
    
    253
    -        }
    
    254
    -
    
    255
    -        if (DEBUG) {
    
    256
    -            console.info('final path: ' + path);
    
    257
    -        }
    
    258
    -
    
    259
    -        var address = scm + "/src/site";
    
    260
    -        if (localeInPath) {
    
    261
    -            address += '/' + locale;
    
    262
    -        }
    
    263
    -        address += '/' + sourcesType + '/' + path;
    
    264
    -        if (DEBUG) {
    
    265
    -            console.info('address: ' + address);
    
    266
    -        }
    
    267
    -        var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address;
    
    268
    -
    
    269
    -        if (DEBUG) {
    
    270
    -            console.info('edit url: ' + url);
    
    271
    -        }
    
    272
    -
    
    273
    -        $('#publishDate').prepend(
    
    274
    -            "<li class='pull-right'><a target='edit' href='" + url +
    
    275
    -            "'>Éditer la page</a></li>" +
    
    276
    -            "<li class='divider pull-right'>|</li>"
    
    277
    -        );
    
    278
    -
    
    279
    -    };
    
    280
    -
    
    281
    -    addScmwebeditor(metas);
    
    282
    -
    
    283
    -    addVersion(metas);
    
    284
    -
    
    285
    -});
    \ No newline at end of file

  • src/site/site_fr.xml
    ... ... @@ -48,35 +48,26 @@
    48 48
     
    
    49 49
       <bannerLeft>
    
    50 50
         <name>${project.name}</name>
    
    51
    -    <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src>
    
    51
    +    <src>./img/logo-small.png</src>
    
    52 52
         <href>index.html</href>
    
    53 53
       </bannerLeft>
    
    54 54
     
    
    55 55
       <poweredBy>
    
    56
    -
    
    57
    -    <logo href="http://jaxx.nuiton.org" name="JAXX" width="120"
    
    58
    -          img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/>
    
    59
    -    <logo href="http://topia.nuiton.org" name="ToPIA" width="120"
    
    60
    -          img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/>
    
    61
    -    <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120"
    
    62
    -          img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/>
    
    63
    -    <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120"
    
    64
    -          img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/>
    
    65
    -
    
    56
    +    <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/>
    
    57
    +    <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/>
    
    58
    +    <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/>
    
    59
    +    <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/>
    
    66 60
       </poweredBy>
    
    67 61
     
    
    68 62
       <body>
    
    69 63
     
    
    70
    -    <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>
    
    71
    -
    
    72 64
         <links>
    
    73
    -      <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/>
    
    65
    +      <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/>
    
    74 66
           <item name="Ultreia.io" href="http://ultreia.io"/>
    
    75 67
         </links>
    
    76 68
     
    
    77 69
         <breadcrumbs>
    
    78 70
           <item name="${project.name}" href="${project.url}/index.html"/>
    
    79
    -      <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/>
    
    80 71
         </breadcrumbs>
    
    81 72
     
    
    82 73
         <menu name="Utilisateur">
    
    ... ... @@ -84,8 +75,7 @@
    84 75
           <item name="Installation" href="install.html"/>
    
    85 76
           <item name="Administration Obstuna" href="install-serverPG.html"/>
    
    86 77
           <item name="Administration Web" href="administration-web.html"/>
    
    87
    -      <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/>
    
    88
    -      <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/>
    
    78
    +      <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/>
    
    89 79
           <item name="Configuration" href="./config-report.html"/>
    
    90 80
         </menu>
    
    91 81
     
    
    ... ... @@ -98,7 +88,5 @@
    98 88
     
    
    99 89
         <menu ref="reports"/>
    
    100 90
     
    
    101
    -    <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer>
    
    102
    -
    
    103 91
       </body>
    
    104 92
     </project>