- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][master-7.x] 7 commits: [jgitflow-maven-plugin]updating poms for 7.6.10-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Dec '21

23 Dec '21

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 [jgitflow-maven-plugin]updating poms for 7.6.10-SNAPSHOT development[skip ci] - - - - - 17033d65 by Tony Chemit at 2021-12-19T16:32:32+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f3b439be by Tony Chemit at 2021-12-19T16:32:32+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - e4ae8ce0 by Tony Chemit at 2021-12-19T16:32:33+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 878afa91 by Tony Chemit at 2021-12-21T08:29:29+01:00 Suppression des paramètres de configuration sur le serveur - Closes #2148 - - - - - 4a35893f by Tony Chemit at 2021-12-24T00:03:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.10' with non-snapshot versions[skip ci] - - - - - ce8ca5b8 by Tony Chemit at 2021-12-24T00:09:12+01:00 [jgitflow-maven-plugin]merging 'release/7.6.10' into 'master-7.x' - - - - - 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: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Local database in server mode observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. observe.warning.no.ui=No gui environment found observeweb.adminApiKey.description=API Key to use the admin mode (You should change it). -observeweb.apiUrl.description=REST API end point observeweb.baseDirectory.description=Base directory observeweb.build.date.description=Build date observeweb.build.number.description=Build number @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Build major 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) ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Base local en modo servidor 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. observe.warning.no.ui=Ninguno entorno gráfico fue detectado observeweb.adminApiKey.description=Llave API Admin (Cambiar). -observeweb.apiUrl.description=Url de la api rest observeweb.baseDirectory.description=Directorio de la aplicación observeweb.build.date.description=Fecha de construcción observeweb.build.number.description=Número de construcción @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Majore Versión de construcción observeweb.contextPath.description=Contexto de aplicación observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases observeweb.devMode.description=Modo desarollador -observeweb.host.description=Administrador de la aplicación observeweb.httpTimeout.description=Tiempo máximo de intento de conexión http (en milisegundos) 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) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Base locale en mode serveur observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. observe.warning.no.ui=Aucun environnement graphique détecté observeweb.adminApiKey.description=Clé API Admin (À changer) -observeweb.apiUrl.description=Url de l'api rest observeweb.baseDirectory.description=Répertoire de l'application observeweb.build.date.description=Date de construction observeweb.build.number.description=Numéro de construction @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Version majeure 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) ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> <scope>compile</scope> </dependency> ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -35,20 +35,6 @@ 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 = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = build.version.persistence ===================================== server-configuration/src/main/i18n/getters/config.getter ===================================== @@ -2,7 +2,6 @@ ObserveWebApplicationConfig.description observe.config.temporaryFilesTimeout.description observe.model.version observeweb.adminApiKey.description -observeweb.apiUrl.description observeweb.baseDirectory.description observeweb.build.date.description observeweb.build.number.description @@ -11,7 +10,6 @@ observeweb.build.version.major.description observeweb.contextPath.description observeweb.databasesConfigurationFile.description observeweb.devMode.description -observeweb.host.description observeweb.httpTimeout.description observeweb.log4jConfigurationFile.description observeweb.sessionExpirationDelay.description ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>server-core</artifactId> ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -71,7 +71,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken); } @@ -83,7 +83,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken); } @@ -155,10 +155,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConfigurationRest dataSourceConfigurationTopia, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + dataSourceConfigurationTopia.getServerUrl(), authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>services</artifactId> ===================================== src/site/markdown/administration-web.md.vm ===================================== @@ -12,10 +12,9 @@ La configuration de l'application web est regroupé dans un seul fichier à plac 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. -Deux options doivent être modifiées : +Une option doit être modifiée : - **observeweb.adminApiKey** : la clef à utiliser pour accéder aux services d'administration - - **observeweb.apiUrl** : l'url publique d'accès aux services web Consulter la [page des configurations](./config-report.html#detail_observeWeb) pour connaitre l'ensemble des options de cette configuration. @@ -47,7 +46,6 @@ Par exemple : ``` observeweb.adminApiKey=a - observeweb.apiUrl=http://localhost:8080/observeweb/api/v1 observeweb.baseDirectory=C:\\var\\local\\observe-server observeweb.sessionExpirationDelay=90 ``` ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.9</version> + <version>7.6.10</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e427817c05daba6aead2e257… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e427817c05daba6aead2e257… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.10' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 23 Dec '21

23 Dec '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 4a35893f by Tony Chemit at 2021-12-24T00:03:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.10' with non-snapshot versions[skip ci] - - - - - ce8ca5b8 by Tony Chemit at 2021-12-24T00:09:12+01:00 [jgitflow-maven-plugin]merging 'release/7.6.10' into 'master-7.x' - - - - - ee77d9d4 by Tony Chemit at 2021-12-24T00:09:14+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de45eedd by Tony Chemit at 2021-12-24T00:09:14+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 893b8b1d by Tony Chemit at 2021-12-24T00:09:14+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9a51926691d42f578c60e8ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9a51926691d42f578c60e8ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.11-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Dec '21

23 Dec '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9a519266 by Tony Chemit at 2021-12-24T00:02:24+01:00 [jgitflow-maven-plugin]updating poms for 7.6.11-SNAPSHOT development[skip ci] - - - - - 22 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/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.10-SNAPSHOT</version> + <version>7.6.11-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9a51926691d42f578c60e8ee0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9a51926691d42f578c60e8ee0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.10
by Tony CHEMIT (＠tchemit) 23 Dec '21

23 Dec '21

Tony CHEMIT pushed new branch release/7.6.10 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.6.10 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Séparation du référentiel Programme pour chaque domaine (ps_common et...
by Tony CHEMIT (＠tchemit) 23 Dec '21

23 Dec '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2079807 by Tony Chemit at 2021-12-23T13:02:08+01:00 Séparation du référentiel Programme pour chaque domaine (ps_common et ll_common) - See ultreiaio/ird-observe#2138 - - - - - 97db4275 by Tony Chemit at 2021-12-23T13:02:08+01:00 update pom - - - - - bd792dcd by Tony Chemit at 2021-12-23T23:46:26+01:00 Rendre le type d'activité bateau éditable - Close ultreiaio/ird-observe#2136 - - - - - 66a20cb7 by Tony Chemit at 2021-12-23T23:46:26+01:00 fix backup - - - - - e06d35ac by Tony Chemit at 2021-12-23T23:46:26+01:00 fix i18n - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/ProgramNode.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/AskToDelete.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/AskToDelete.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewPredicates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/NodeChildrenUpdate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SavePredicate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/TableSavePredicate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b89cf5472ba567d4e476b197… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b89cf5472ba567d4e476b197… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Mutualisation de la configuration de la sélection de données.
by Tony CHEMIT (＠tchemit) 21 Dec '21

21 Dec '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 87aa91c7 by Tony Chemit at 2021-12-21T12:51:11+01:00 Mutualisation de la configuration de la sélection de données. Plus tard on aura la possible de mieux configurer la vue à construire - - - - - 491eef21 by Tony Chemit at 2021-12-21T13:51:20+01:00 Le client ObServe ne démarre plus depuis Java 17 (peut-être 15 ou 16) - Closes #2147 - - - - - b89cf547 by Tony Chemit at 2021-12-21T13:52:13+01:00 Utilisation directement documentation html et suppression ressource inutile - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingConfigUI.jaxx → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingConfigUI.jcss → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/SelectModelType.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectModelType.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - − client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/SelectModelType.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - client/pom.xml - client/runner/pom.xml - client/runner/src/main/assembly/dist/go.bat - client/runner/src/main/assembly/dist/go.sh - client/runner/src/main/assembly/dist/scripts/postgresql/create.bat - client/runner/src/main/assembly/dist/scripts/postgresql/create.sh - client/runner/src/main/assembly/dist/scripts/postgresql/drop.bat - client/runner/src/main/assembly/dist/scripts/postgresql/drop.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update.bat The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/69776a1dd2634b268e109840… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/69776a1dd2634b268e109840… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Appairement des activités PS absent - Closes ultreiaio/ird-observe#2145
by Tony CHEMIT (＠tchemit) 21 Dec '21

21 Dec '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69776a1d by Tony Chemit at 2021-12-21T12:11:40+01:00 Appairement des activités PS absent - Closes ultreiaio/ird-observe#2145 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client/datasource/actions/src/main/i18n/getters/java-enumeration.getter - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingConfigUI.jaxx - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingModel.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingUI.jaxx → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingUI.jcss → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUI.jcss - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/ActivityLlPairingUIActionSupport.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/ActivityPairingUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/Prepare.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/SelectModelType.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/Start.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Start.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/PairingTreeTable.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/node/ActivityLlPairingTripNode.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/PairingTreeTableModel.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/RootNodeBuilder.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/node/ActivityNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/node/ActivityLlPairingRootNode.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/node/RootNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingUIHandler.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/node/TripNode.java - − client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - − client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTableModel.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/PairingTreeTable.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/PairingTreeTableModel.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/RootNodeBuilder.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/node/ActivityNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69776a1dd2634b268e1098402… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/69776a1dd2634b268e1098402… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Suppression des paramètres de configuration sur le serveur - Closes #2148
by Tony CHEMIT (＠tchemit) 21 Dec '21

21 Dec '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 878afa91 by Tony Chemit at 2021-12-21T08:29:29+01:00 Suppression des paramètres de configuration sur le serveur - Closes #2148 - - - - - 7 changed files: - 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 - server-configuration/src/main/config/Server.ini - server-configuration/src/main/i18n/getters/config.getter - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java - src/site/markdown/administration-web.md.vm Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Local database in server mode observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. observe.warning.no.ui=No gui environment found observeweb.adminApiKey.description=API Key to use the admin mode (You should change it). -observeweb.apiUrl.description=REST API end point observeweb.baseDirectory.description=Base directory observeweb.build.date.description=Build date observeweb.build.number.description=Build number @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Build major 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) ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Base local en modo servidor 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. observe.warning.no.ui=Ninguno entorno gráfico fue detectado observeweb.adminApiKey.description=Llave API Admin (Cambiar). -observeweb.apiUrl.description=Url de la api rest observeweb.baseDirectory.description=Directorio de la aplicación observeweb.build.date.description=Fecha de construcción observeweb.build.number.description=Número de construcción @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Majore Versión de construcción observeweb.contextPath.description=Contexto de aplicación observeweb.databasesConfigurationFile.description=Ubicación del archivo de configuración de las bases observeweb.devMode.description=Modo desarollador -observeweb.host.description=Administrador de la aplicación observeweb.httpTimeout.description=Tiempo máximo de intento de conexión http (en milisegundos) 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) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2336,7 +2336,6 @@ observe.view.server=Base locale en mode serveur observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. observe.warning.no.ui=Aucun environnement graphique détecté observeweb.adminApiKey.description=Clé API Admin (À changer) -observeweb.apiUrl.description=Url de l'api rest observeweb.baseDirectory.description=Répertoire de l'application observeweb.build.date.description=Date de construction observeweb.build.number.description=Numéro de construction @@ -2345,7 +2344,6 @@ observeweb.build.version.major.description=Version majeure 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) ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -35,20 +35,6 @@ 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 = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = build.version.persistence ===================================== server-configuration/src/main/i18n/getters/config.getter ===================================== @@ -2,7 +2,6 @@ ObserveWebApplicationConfig.description observe.config.temporaryFilesTimeout.description observe.model.version observeweb.adminApiKey.description -observeweb.apiUrl.description observeweb.baseDirectory.description observeweb.build.date.description observeweb.build.number.description @@ -11,7 +10,6 @@ observeweb.build.version.major.description observeweb.contextPath.description observeweb.databasesConfigurationFile.description observeweb.devMode.description -observeweb.host.description observeweb.httpTimeout.description observeweb.log4jConfigurationFile.description observeweb.sessionExpirationDelay.description ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -71,7 +71,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken); } @@ -83,7 +83,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection((ObserveDataSourceConfigurationRest)dataSourceConfiguration, observeDataSourceConnection, authenticationToken); } @@ -155,10 +155,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConfigurationRest dataSourceConfigurationTopia, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + dataSourceConfigurationTopia.getServerUrl(), authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), ===================================== src/site/markdown/administration-web.md.vm ===================================== @@ -12,10 +12,9 @@ La configuration de l'application web est regroupé dans un seul fichier à plac 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. -Deux options doivent être modifiées : +Une option doit être modifiée : - **observeweb.adminApiKey** : la clef à utiliser pour accéder aux services d'administration - - **observeweb.apiUrl** : l'url publique d'accès aux services web Consulter la [page des configurations](./config-report.html#detail_observeWeb) pour connaitre l'ensemble des options de cette configuration. @@ -47,7 +46,6 @@ Par exemple : ``` observeweb.adminApiKey=a - observeweb.apiUrl=http://localhost:8080/observeweb/api/v1 observeweb.baseDirectory=C:\\var\\local\\observe-server observeweb.sessionExpirationDelay=90 ``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/878afa9109da7e893593559e6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/878afa9109da7e893593559e6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-23-SNAPSHOT)
by Tony CHEMIT (＠tchemit) 20 Dec '21

20 Dec '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7df2df8e by Tony Chemit at 2021-12-20T22:58:00+01:00 Site checkin for project ObServe (version 9.0.0-RC-23-SNAPSHOT) - - - - - 7 changed files: - + latest/avdth/sample.html - + latest/changelog.html - + latest/changes-report.html - + latest/ci-management.html - + latest/dependency-convergence.html - + latest/dependency-info.html - + latest/dependency-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7df2df8e5cf514e9a014736bb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7df2df8e5cf514e9a014736bb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-23-SNAPSHOT)
by Tony CHEMIT (＠tchemit) 20 Dec '21

20 Dec '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: c66d6a69 by Tony Chemit at 2021-12-20T22:53:46+01:00 Site checkin for project ObServe (version 9.0.0-RC-23-SNAPSHOT) - - - - - 12 changed files: - 9.0.0-RC-23-SNAPSHOT/CHANGELOG.html - − 9.0.0-RC-23-SNAPSHOT/ClientConfig.properties - − 9.0.0-RC-23-SNAPSHOT/ServerConfig.properties - 9.0.0-RC-23-SNAPSHOT/architecture-logicielle.html - 9.0.0-RC-23-SNAPSHOT/avdth/common.html - 9.0.0-RC-23-SNAPSHOT/avdth/index.html - 9.0.0-RC-23-SNAPSHOT/avdth/landing.html - 9.0.0-RC-23-SNAPSHOT/avdth/local_market.html - 9.0.0-RC-23-SNAPSHOT/avdth/logbook.html - 9.0.0-RC-23-SNAPSHOT/avdth/referential.html - 9.0.0-RC-23-SNAPSHOT/avdth/sample.html - 9.0.0-RC-23-SNAPSHOT/changelog.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c66d6a69c32208771d93e3ecf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c66d6a69c32208771d93e3ecf… You're receiving this email because of your account on gitlab.com.

1 0