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

Commits:

16 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -21,8 +21,10 @@ stages:
    21 21 
         - ssh-add <(echo "$SSH_PRIVATE_KEY")
    22 22 
         - mkdir -p ~/.ssh
    23 23 
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
    24 
    +    - git config --global user.name $GITLAB_USER_ID
    25 
    +    - git config --global user.email $GITLAB_USER_EMAIL
    24 26 
         - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git)
    25 
    -    - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME"
    27 
    +    - . ~/env/bin/prepare-env.sh
    26 28
    27 29 
     .before_script_clone: &before_script_clone
    28 30 
       tags:
    ... ... @@ -34,8 +36,10 @@ stages:
    34 36 
         - ssh-add <(echo "$SSH_PRIVATE_KEY")
    35 37 
         - mkdir -p ~/.ssh
    36 38 
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
    39 
    +    - git config --global user.name $GITLAB_USER_ID
    40 
    +    - git config --global user.email $GITLAB_USER_EMAIL
    37 41 
         - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git)
    38 
    -    - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME"
    42 
    +    - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME"
    39 43
    40 44 
     .env_test: &env_test
    41 45 
       environment:
    ... ... @@ -51,8 +55,7 @@ stages:
    51 55
    52 56 
     .deploy_site: &deploy_site
    53 57 
       script:
    54 
    -    - mvn install -DskipTests
    55 
    -    - mvn site-deploy -DperformRelease
    58 
    +    - mvn clean verify site -DperformRelease scm-publish:publish-scm
    56 59
    57 60 
     .deploy_demo_latest: &deploy_demo_latest
    58 61 
       stage: Test
    ... ... @@ -86,11 +89,11 @@ stage:
    86 89 
       <<: *before_script_clone
    87 90 
       script:
    88 91 
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    89 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash
    90 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash
    91 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
    92 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash
    93 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
    92 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    93 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    94 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
    95 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    96 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
    94 97
    95 98 
     latest-site:
    96 99 
       <<: *env_test
    ... ... @@ -146,13 +149,13 @@ release:
    146 149 
       <<: *staging
    147 150 
       when: manual
    148 151 
       script:
    149 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
    152 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
    150 153
    151 154 
     drop:
    152 155 
       <<: *staging
    153 156 
       when: manual
    154 157 
       script:
    155 
    -    - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash
    158 
    +    - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash
    156 159
    157 160 
     production:
    158 161 
       stage: Production

  • CHANGELOG.md The diff for this file was not included because it is too large.
  • README.md
    1 1 
     # ObServe
    2 2
    3 3 
     [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22fr.ird.observe%22%20AND%20a%3A%22observe%22)
    4 
    -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop/build.svg)
    4 
    +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop/build.svg)
    5 
    +[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)
    5 6
    6 7 
     # Resources
    7 8
    8 
    -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md)
    9 
    -* [Documentation](http://observe.ultreia.io)
    9 
    +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md)
    10 
    +* [Documentation](http://ultreiaio.gitlab.io/ird-observe)
    10 11
    11 12 
     # Demo
    12 13
    13 14 
     * [Demo (latest)](https://demo.ultreia.io/observe-latest)
    14 
    -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2)
    15 
    +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5)
    15 16 
     * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-1)
    16 17
    17 18 
     # Community
    ... ... @@ -19,3 +20,37 @@
    19 20 
     * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-devel)
    20 21 
     * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-commits)
    21 22 
     * [Contact](mailto:dev@tchemit.fr)
    23 
    +
    24 
    +# Release (without stage)
    25 
    +
    26 
    +```
    27 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    28 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    29 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash
    30 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
    31 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    32 
    +```
    33 
    +
    34 
    +# Release (with stage)
    35 
    +
    36 
    +Create stage
    37 
    +
    38 
    +```
    39 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    40 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    41 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
    42 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
    43 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    44 
    +```
    45 
    +
    46 
    +And to release stage
    47 
    +
    48 
    +```
    49 
    +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
    50 
    +```
    51 
    +
    52 
    +# Generate site
    53 
    +
    54 
    +```
    55 
    +mvn clean verify site -DperformRelease scm-publish:publish-scm
    56 
    +```
    \ No newline at end of file

  • application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java
    ... ... @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack
    51 51 
                 return;
    52 52 
             }
    53 53
    54 
    -        boolean mustClose = false;
    55 54 
             ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource();
    56 
    -        if (mainDataSource == null || !mainDataSource.isLocal()) {
    57 
    -
    58 
    -            mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig());
    59 
    -            mustClose = true;
    55 
    +        if (mainDataSource == null) {
    56 
    +            if (log.isInfoEnabled()) {
    57 
    +                log.info("Skip, no database open.");
    58 
    +            }
    59 
    +            return;
    60 60 
             }
    61 
    -
    62 
    -        try {
    63 
    -            File file = doBackup(applicationContext, mainDataSource);
    64 
    -            applicationContext.getBackupsManager().addAutomaticBackup(file.toPath());
    65 
    -        } finally {
    66 
    -
    67 
    -            if (mustClose) {
    68 
    -                mainDataSource.close();
    61 
    +        if (!mainDataSource.isLocal()) {
    62 
    +            if (log.isInfoEnabled()) {
    63 
    +                log.info("Skip, open database is not local.");
    69 64 
                 }
    65 
    +            return;
    70 66 
             }
    71 67
    68 
    +        File file = doBackup(applicationContext, mainDataSource);
    69 
    +        applicationContext.getBackupsManager().addAutomaticBackup(file.toPath());
    72 70
    73 71 
         }
    74 72

  • 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>6.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,12 +222,8 @@
    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>
    225 
    +    <!--gitflow configuration-->
    226 
    +    <scmCommentPrefix>Release  [skip ci]</scmCommentPrefix>
    216 227
    217 228 
         <!-- deploy nothing -->
    218 229 
         <maven.deploy.skip>true</maven.deploy.skip>
    ... ... @@ -775,7 +786,6 @@
    775 786 
         <pluginManagement>
    776 787 
           <plugins>
    777 788
    778 
    -        <!-- plugin site -->
    779 789 
             <plugin>
    780 790 
               <artifactId>maven-site-plugin</artifactId>
    781 791 
               <dependencies>
    ... ... @@ -803,6 +813,24 @@
    803 813 
             </plugin>
    804 814
    805 815 
             <plugin>
    816 
    +          <artifactId>maven-scm-publish-plugin</artifactId>
    817 
    +          <configuration>
    818 
    +            <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl>
    819 
    +            <scmBranch>pages</scmBranch>
    820 
    +            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
    821 
    +          </configuration>
    822 
    +          <executions>
    823 
    +            <execution>
    824 
    +              <id>scm-publish</id>
    825 
    +              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
    826 
    +              <goals>
    827 
    +                <goal>publish-scm</goal>
    828 
    +              </goals>
    829 
    +            </execution>
    830 
    +          </executions>
    831 
    +        </plugin>
    832 
    +
    833 
    +        <plugin>
    806 834 
               <groupId>org.codehaus.gmavenplus</groupId>
    807 835 
               <artifactId>gmavenplus-plugin</artifactId>
    808 836 
               <dependencies>
    ... ... @@ -874,14 +902,6 @@
    874 902
    875 903 
           </plugins>
    876 904 
         </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 905 
       </build>
    886 906
    887 907 
       <reporting>
    ... ... @@ -938,6 +958,7 @@
    938 958 
               <plugin>
    939 959 
                 <artifactId>maven-project-info-reports-plugin</artifactId>
    940 960 
                 <version>${projectInfoReportsPluginVersion}</version>
    961 
    +            <inherited>false</inherited>
    941 962 
                 <reportSets>
    942 963 
                   <reportSet>
    943 964 
                     <reports>
    ... ... @@ -962,29 +983,40 @@
    962 983 
               <plugin>
    963 984 
                 <artifactId>maven-changes-plugin</artifactId>
    964 985 
                 <version>${changesPluginVersion}</version>
    986 
    +            <inherited>false</inherited>
    965 987 
                 <configuration>
    966 988 
                   <issueLinkTemplatePerSystem>
    967 
    -                <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab>
    989 
    +                <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab>
    968 990 
                   </issueLinkTemplatePerSystem>
    969 991 
                   <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath>
    970 992 
                 </configuration>
    993 
    +            <reportSets>
    994 
    +              <reportSet>
    995 
    +                <reports>
    996 
    +                  <report>changes-report</report>
    997 
    +                </reports>
    998 
    +              </reportSet>
    999 
    +            </reportSets>
    971 1000 
               </plugin>
    972 1001
    973 1002 
               <plugin>
    974 1003 
                 <artifactId>maven-changelog-plugin</artifactId>
    975 1004 
                 <version>${changelogPluginVersion}</version>
    1005 
    +            <inherited>false</inherited>
    976 1006 
               </plugin>
    977 1007
    978 1008 
               <plugin>
    979 1009 
                 <groupId>org.codehaus.mojo</groupId>
    980 1010 
                 <artifactId>license-maven-plugin</artifactId>
    981 1011 
                 <version>${licensePluginVersion}</version>
    1012 
    +            <inherited>false</inherited>
    982 1013 
               </plugin>
    983 1014
    984 1015 
               <plugin>
    985 1016 
                 <groupId>org.codehaus.mojo</groupId>
    986 1017 
                 <artifactId>versions-maven-plugin</artifactId>
    987 1018 
                 <version>${versionsPluginVersion}</version>
    1019 
    +            <inherited>false</inherited>
    988 1020 
                 <reportSets>
    989 1021 
                   <reportSet>
    990 1022 
                     <reports>
    ... ... @@ -1044,20 +1076,6 @@
    1044 1076 
                 </executions>
    1045 1077 
               </plugin>
    1046 1078
    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 1079 
             </plugins>
    1062 1080
    1063 1081 
           </build>

  • src/site/resources/images/architecture.png → src/site/resources/img/architecture.png
    No preview for this file type
  • 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
    No preview for this file type
  • src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png
    No preview for this file type
  • src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png
    No preview for this file type
  • src/site/resources/images/logo.png → src/site/resources/img/logo.png
    No preview for this file type
  • src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png
    No preview for this file type
  • src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png
    No preview for this file type
  • src/site/resources/images/logos/topia-logo.png → src/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>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.