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

Commits:

6 changed files:

Changes:

  • CONTRIBUTING.md
    1 
    +# Release (without stage)
    2 
    +
    3 
    +```
    4 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    5 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    6 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash
    7 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
    8 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    9 
    +```
    10 
    +
    11 
    +# Release (with stage)
    12 
    +
    13 
    +Create stage
    14 
    +
    15 
    +```
    16 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    17 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    18 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
    19 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
    20 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    21 
    +```
    22 
    +
    23 
    +And to release stage
    24 
    +
    25 
    +```
    26 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
    27 
    +```
    28 
    +
    29 
    +# Regenerate changelog
    30 
    +
    31 
    +```
    32 
    +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
    33 
    +```
    34 
    +
    35 
    +# Generate site
    36 
    +
    37 
    +```
    38 
    +mvn clean verify site -DperformRelease scm-publish:publish-scm
    39 
    +```
    \ No newline at end of file

  • README.md
    ... ... @@ -20,37 +20,3 @@
    20 20 
     * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-devel)
    21 21 
     * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-commits)
    22 22 
     * [Contact](mailto:dev@tchemit.fr)
    23 
    -
    24 
    -# Release (without stage)
    25 
    -
    26 
    -```
    27 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    28 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    29 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash
    30 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
    31 
    -wget -q -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 -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
    40 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
    41 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
    42 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
    43 
    -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
    44 
    -```
    45 
    -
    46 
    -And to release stage
    47 
    -
    48 
    -```
    49 
    -wget -q -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-web-configuration/src/main/config/ObserveWebApplication.ini
    ... ... @@ -28,11 +28,18 @@ type = string
    28 28 
     defaultValue = changeme
    29 29 
     final = true
    30 30
    31 
    +[option host]
    32 
    +description = observeweb.host.description
    33 
    +key = observeweb.host
    34 
    +type = url
    35 
    +defaultValue = http://localhost:8080
    36 
    +final = true
    37 
    +
    31 38 
     [option apiUrl]
    32 39 
     description = observeweb.apiUrl.description
    33 40 
     key = observeweb.apiUrl
    34 41 
     type = url
    35 
    -defaultValue = http://localhost:8080/observeweb/api/v1
    42 
    +defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
    36 43 
     final = true
    37 44
    38 45 
     [option modelVersion]

  • application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties
    ... ... @@ -9,6 +9,7 @@ observeweb.build.version.description=Build version
    9 9 
     observeweb.contextPath.description=Context path
    10 10 
     observeweb.databasesConfigurationFile.description=Path to databases configuration file
    11 11 
     observeweb.devMode.description=Dev mode
    12 
    +observeweb.host.description=Application host
    12 13 
     observeweb.httpTimeout.description=Http timeout in milli seconds
    13 14 
     observeweb.log4jConfigurationFile.description=Path to log configuration file
    14 15 
     observeweb.sessionExpirationDelay.description=Session expiration deplay (in minutes)

  • application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties
    ... ... @@ -9,6 +9,7 @@ observeweb.build.version.description=Versión de construcción
    9 9 
     observeweb.contextPath.description=Context path \#TODO
    10 10 
     observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases
    11 11 
     observeweb.devMode.description=Modo desarollador
    12 
    +observeweb.host.description=Application host \#TODO
    12 13 
     observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes) \#TODO
    13 14 
     observeweb.log4jConfigurationFile.description=Ubicación del archivo de configuración de los logs
    14 15 
     observeweb.sessionExpirationDelay.description=Duración máxima de una sesión (en minutos)

  • application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties
    ... ... @@ -9,6 +9,7 @@ observeweb.build.version.description=Version de construction
    9 9 
     observeweb.contextPath.description=Contexte applicatif
    10 10 
     observeweb.databasesConfigurationFile.description=Chemin vers le fichier de configuration des bases
    11 11 
     observeweb.devMode.description=Mode développeur
    12 
    +observeweb.host.description=Hôte de l'application
    12 13 
     observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes)
    13 14 
     observeweb.log4jConfigurationFile.description=Chemin vers le fichier de configuration des logs
    14 15 
     observeweb.sessionExpirationDelay.description=Temps maximum d'une session (en minutes)

    • —
    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.