[Git][ultreiaio/ird-observe][develop] 2 commits: improve web configuration

10 Apr 2017

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


Commits:
d2e80b06 by Tony CHEMIT at 2017-04-02T08:26:55+02:00
improve web configuration

- - - - -
bb6727d9 by Tony CHEMIT at 2017-04-10T20:31:47+02:00
add contribute guid + update readme

- - - - -


6 changed files:

- + CONTRIBUTING.md
- README.md
- application-web-configuration/src/main/config/ObserveWebApplication.ini
- application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties
- application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties
- application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties


Changes:

=====================================
CONTRIBUTING.md
=====================================

--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,39 @@
+# Release (without stage)
+
+```
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
+```
+
+# Release (with stage)
+
+Create stage
+
+```
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
+```
+
+And to release stage
+
+``` 
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
+```
+
+# Regenerate changelog
+
+``` 
+wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
+```
+
+# Generate site
+
+``` 
+mvn clean verify site -DperformRelease scm-publish:publish-scm
+```
\ No newline at end of file


=====================================
README.md
=====================================
--- a/README.md
+++ b/README.md
@@ -20,37 +20,3 @@
 * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-devel)
 * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-commits)
 * [Contact](mailto:dev@tchemit.fr)
-
-# Release (without stage)
-
-```
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
-```
-
-# Release (with stage)
-
-Create stage
-
-```
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
-```
-
-And to release stage
-
-``` 
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash
-```
-
-# Generate site
-
-``` 
-mvn clean verify site -DperformRelease scm-publish:publish-scm
-```
\ No newline at end of file


=====================================
application-web-configuration/src/main/config/ObserveWebApplication.ini
=====================================
--- a/application-web-configuration/src/main/config/ObserveWebApplication.ini
+++ b/application-web-configuration/src/main/config/ObserveWebApplication.ini
@@ -28,11 +28,18 @@ type = string
 defaultValue = changeme
 final = true
 
+[option host]
+description = observeweb.host.description
+key = observeweb.host
+type = url
+defaultValue = http://localhost:8080
+final = true
+
 [option apiUrl]
 description = observeweb.apiUrl.description
 key = observeweb.apiUrl
 type = url
-defaultValue = http://localhost:8080/observeweb/api/v1
+defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
 final = true
 
 [option modelVersion]


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


=====================================
application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties
=====================================
--- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties
+++ b/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
 observeweb.contextPath.description=Context path \#TODO
 observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases
 observeweb.devMode.description=Modo desarollador
+observeweb.host.description=Application host \#TODO
 observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes) \#TODO
 observeweb.log4jConfigurationFile.description=Ubicación del archivo de configuración de los logs
 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
=====================================
--- a/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties
+++ b/application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties
@@ -9,6 +9,7 @@ observeweb.build.version.description=Version de construction
 observeweb.contextPath.description=Contexte applicatif
 observeweb.databasesConfigurationFile.description=Chemin vers le fichier de configuration des bases
 observeweb.devMode.description=Mode développeur
+observeweb.host.description=Hôte de l'application
 observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes)
 observeweb.log4jConfigurationFile.description=Chemin vers le fichier de configuration des logs
 observeweb.sessionExpirationDelay.description=Temps maximum d'une session (en minutes)



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/53e643b3675da5bf7c4512de2e0...

    

Tony CHEMIT

tags

participants (1)