Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe
Commits:
-
cfa55417
by Tony Chemit at 2021-12-19T16:18:23+01:00
-
17033d65
by Tony Chemit at 2021-12-19T16:32:32+01:00
-
f3b439be
by Tony Chemit at 2021-12-19T16:32:32+01:00
-
e4ae8ce0
by Tony Chemit at 2021-12-19T16:32:33+01:00
-
878afa91
by Tony Chemit at 2021-12-21T08:29:29+01:00
-
4a35893f
by Tony Chemit at 2021-12-24T00:03:17+01:00
-
ce8ca5b8
by Tony Chemit at 2021-12-24T00:09:12+01:00
29 changed files:
- client-configuration/pom.xml
- client-core/pom.xml
- client-runner/pom.xml
- common-dto/pom.xml
- common-persistence/pom.xml
- common-service/pom.xml
- common-validation/pom.xml
- dto/pom.xml
- observe-i18n/pom.xml
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server-configuration/src/main/config/Server.ini
- server-configuration/src/main/i18n/getters/config.getter
- server-core/pom.xml
- server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java
- server-runner/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- src/site/markdown/administration-web.md.vm
- templates/pom.xml
- test/pom.xml
- toolbox-maven-plugin/pom.xml
- validation/pom.xml
Changes:
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>client-configuration</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>client-core</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>client-runner</artifactId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>dto</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>observe-i18n</artifactId>
|
| ... | ... | @@ -2336,7 +2336,6 @@ observe.view.server=Local database in server mode |
| 2336 | 2336 |
observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java.
|
| 2337 | 2337 |
observe.warning.no.ui=No gui environment found
|
| 2338 | 2338 |
observeweb.adminApiKey.description=API Key to use the admin mode (You should change it).
|
| 2339 |
-observeweb.apiUrl.description=REST API end point
|
|
| 2340 | 2339 |
observeweb.baseDirectory.description=Base directory
|
| 2341 | 2340 |
observeweb.build.date.description=Build date
|
| 2342 | 2341 |
observeweb.build.number.description=Build number
|
| ... | ... | @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Build major version |
| 2345 | 2344 |
observeweb.contextPath.description=Context path
|
| 2346 | 2345 |
observeweb.databasesConfigurationFile.description=Path to databases configuration file
|
| 2347 | 2346 |
observeweb.devMode.description=Dev mode
|
| 2348 |
-observeweb.host.description=Application host
|
|
| 2349 | 2347 |
observeweb.httpTimeout.description=Http timeout in milli seconds
|
| 2350 | 2348 |
observeweb.log4jConfigurationFile.description=Path to log configuration file
|
| 2351 | 2349 |
observeweb.sessionExpirationDelay.description=Session expiration deplay (in minutes)
|
| ... | ... | @@ -2336,7 +2336,6 @@ observe.view.server=Base local en modo servidor |
| 2336 | 2336 |
observe.warning.nimbus.landf=El look and Feel Nimbus no fue encontrado, se necesita como mínimo la versión 1.6 ó 10 de java.
|
| 2337 | 2337 |
observe.warning.no.ui=Ninguno entorno gráfico fue detectado
|
| 2338 | 2338 |
observeweb.adminApiKey.description=Llave API Admin (Cambiar).
|
| 2339 |
-observeweb.apiUrl.description=Url de la api rest
|
|
| 2340 | 2339 |
observeweb.baseDirectory.description=Directorio de la aplicación
|
| 2341 | 2340 |
observeweb.build.date.description=Fecha de construcción
|
| 2342 | 2341 |
observeweb.build.number.description=Número de construcción
|
| ... | ... | @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Majore Versión de construcción |
| 2345 | 2344 |
observeweb.contextPath.description=Contexto de aplicación
|
| 2346 | 2345 |
observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases
|
| 2347 | 2346 |
observeweb.devMode.description=Modo desarollador
|
| 2348 |
-observeweb.host.description=Administrador de la aplicación
|
|
| 2349 | 2347 |
observeweb.httpTimeout.description=Tiempo máximo de intento de conexión http (en milisegundos)
|
| 2350 | 2348 |
observeweb.log4jConfigurationFile.description=Ubicación del archivo de configuración de los logs
|
| 2351 | 2349 |
observeweb.sessionExpirationDelay.description=Duración máxima de una sesión (en minutos)
|
| ... | ... | @@ -2336,7 +2336,6 @@ observe.view.server=Base locale en mode serveur |
| 2336 | 2336 |
observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java.
|
| 2337 | 2337 |
observe.warning.no.ui=Aucun environnement graphique détecté
|
| 2338 | 2338 |
observeweb.adminApiKey.description=Clé API Admin (À changer)
|
| 2339 |
-observeweb.apiUrl.description=Url de l'api rest
|
|
| 2340 | 2339 |
observeweb.baseDirectory.description=Répertoire de l'application
|
| 2341 | 2340 |
observeweb.build.date.description=Date de construction
|
| 2342 | 2341 |
observeweb.build.number.description=Numéro de construction
|
| ... | ... | @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Version majeure |
| 2345 | 2344 |
observeweb.contextPath.description=Contexte applicatif
|
| 2346 | 2345 |
observeweb.databasesConfigurationFile.description=Chemin vers le fichier de configuration des bases
|
| 2347 | 2346 |
observeweb.devMode.description=Mode développeur
|
| 2348 |
-observeweb.host.description=Hôte de l'application
|
|
| 2349 | 2347 |
observeweb.httpTimeout.description=Temps maximum de tentative de connection http (en millisecondes)
|
| 2350 | 2348 |
observeweb.log4jConfigurationFile.description=Chemin vers le fichier de configuration des logs
|
| 2351 | 2349 |
observeweb.sessionExpirationDelay.description=Temps maximum d'une session (en minutes)
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>observe</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>persistence</artifactId>
|
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.observe</groupId>
|
| 31 | 31 |
<artifactId>ird-observe</artifactId>
|
| 32 |
- <version>7.6.9</version>
|
|
| 32 |
+ <version>7.6.10</version>
|
|
| 33 | 33 |
<packaging>pom</packaging>
|
| 34 | 34 |
|
| 35 | 35 |
<name>ObServe :: Pom</name>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>server-configuration</artifactId>
|
| ... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 |
<dependency>
|
| 119 | 119 |
<groupId>fr.ird.observe</groupId>
|
| 120 | 120 |
<artifactId>services</artifactId>
|
| 121 |
- <version>7.6.9</version>
|
|
| 121 |
+ <version>7.6.10</version>
|
|
| 122 | 122 |
<scope>compile</scope>
|
| 123 | 123 |
</dependency>
|
| 124 | 124 |
|
| ... | ... | @@ -35,20 +35,6 @@ type = string |
| 35 | 35 |
defaultValue = changeme
|
| 36 | 36 |
final = true
|
| 37 | 37 |
|
| 38 |
-[option host]
|
|
| 39 |
-description = observeweb.host.description
|
|
| 40 |
-key = observeweb.host
|
|
| 41 |
-type = url
|
|
| 42 |
-defaultValue = http://localhost:8080
|
|
| 43 |
-final = true
|
|
| 44 |
- |
|
| 45 |
-[option apiUrl]
|
|
| 46 |
-description = observeweb.apiUrl.description
|
|
| 47 |
-key = observeweb.apiUrl
|
|
| 48 |
-type = url
|
|
| 49 |
-defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
|
|
| 50 |
-final = true
|
|
| 51 |
- |
|
| 52 | 38 |
[option modelVersion]
|
| 53 | 39 |
description = observe.model.version
|
| 54 | 40 |
key = build.version.persistence
|
| ... | ... | @@ -2,7 +2,6 @@ ObserveWebApplicationConfig.description |
| 2 | 2 |
observe.config.temporaryFilesTimeout.description
|
| 3 | 3 |
observe.model.version
|
| 4 | 4 |
observeweb.adminApiKey.description
|
| 5 |
-observeweb.apiUrl.description
|
|
| 6 | 5 |
observeweb.baseDirectory.description
|
| 7 | 6 |
observeweb.build.date.description
|
| 8 | 7 |
observeweb.build.number.description
|
| ... | ... | @@ -11,7 +10,6 @@ observeweb.build.version.major.description |
| 11 | 10 |
observeweb.contextPath.description
|
| 12 | 11 |
observeweb.databasesConfigurationFile.description
|
| 13 | 12 |
observeweb.devMode.description
|
| 14 |
-observeweb.host.description
|
|
| 15 | 13 |
observeweb.httpTimeout.description
|
| 16 | 14 |
observeweb.log4jConfigurationFile.description
|
| 17 | 15 |
observeweb.sessionExpirationDelay.description
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>server-core</artifactId>
|
| ... | ... | @@ -71,7 +71,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi |
| 71 | 71 |
ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration);
|
| 72 | 72 |
|
| 73 | 73 |
String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
|
| 74 |
- return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
|
|
| 74 |
+ return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken);
|
|
| 75 | 75 |
|
| 76 | 76 |
}
|
| 77 | 77 |
|
| ... | ... | @@ -83,7 +83,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi |
| 83 | 83 |
ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia);
|
| 84 | 84 |
|
| 85 | 85 |
String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
|
| 86 |
- return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
|
|
| 86 |
+ return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken);
|
|
| 87 | 87 |
|
| 88 | 88 |
}
|
| 89 | 89 |
|
| ... | ... | @@ -155,10 +155,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi |
| 155 | 155 |
|
| 156 | 156 |
}
|
| 157 | 157 |
|
| 158 |
- protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
|
|
| 158 |
+ protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConfigurationRest dataSourceConfigurationTopia, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
|
|
| 159 | 159 |
|
| 160 | 160 |
return new ObserveDataSourceConnectionRest(
|
| 161 |
- getApplicationConfiguration().getApiUrl(),
|
|
| 161 |
+ dataSourceConfigurationTopia.getServerUrl(),
|
|
| 162 | 162 |
authenticationToken,
|
| 163 | 163 |
observeDataSourceConnection.canReadReferential(),
|
| 164 | 164 |
observeDataSourceConnection.canWriteReferential(),
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>server-runner</artifactId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>services-client</artifactId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>services-local</artifactId>
|
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 |
<parent>
|
| 26 | 26 |
<groupId>fr.ird.observe</groupId>
|
| 27 | 27 |
<artifactId>ird-observe</artifactId>
|
| 28 |
- <version>7.6.9</version>
|
|
| 28 |
+ <version>7.6.10</version>
|
|
| 29 | 29 |
</parent>
|
| 30 | 30 |
|
| 31 | 31 |
<artifactId>services</artifactId>
|
| ... | ... | @@ -12,10 +12,9 @@ La configuration de l'application web est regroupé dans un seul fichier à plac |
| 12 | 12 |
|
| 13 | 13 |
La configuration de l'application possède des valeurs par défaut pour toutes les options, si vous utiliser ces valeurs par défaut, un minimum de configuration est requise.
|
| 14 | 14 |
|
| 15 |
-Deux options doivent être modifiées :
|
|
| 15 |
+Une option doit être modifiée :
|
|
| 16 | 16 |
|
| 17 | 17 |
- **observeweb.adminApiKey** : la clef à utiliser pour accéder aux services d'administration
|
| 18 |
- - **observeweb.apiUrl** : l'url publique d'accès aux services web
|
|
| 19 | 18 |
|
| 20 | 19 |
Consulter la [page des configurations](./config-report.html#detail_observeWeb) pour connaitre l'ensemble des options de cette configuration.
|
| 21 | 20 |
|
| ... | ... | @@ -47,7 +46,6 @@ Par exemple : |
| 47 | 46 |
|
| 48 | 47 |
```
|
| 49 | 48 |
observeweb.adminApiKey=a
|
| 50 |
- observeweb.apiUrl=http://localhost:8080/observeweb/api/v1
|
|
| 51 | 49 |
observeweb.baseDirectory=C:\\var\\local\\observe-server
|
| 52 | 50 |
observeweb.sessionExpirationDelay=90
|
| 53 | 51 |
```
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>test</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.observe</groupId>
|
| 26 | 26 |
<artifactId>ird-observe</artifactId>
|
| 27 |
- <version>7.6.9</version>
|
|
| 27 |
+ <version>7.6.10</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>validation</artifactId>
|