Commit f12daa23 authored by Célia Michotey's avatar Célia Michotey
Browse files

Rename GPDS application in FAIDARE. GNP-5519.

parent 50513533
...@@ -16,7 +16,7 @@ image: urgi/docker-browsers:latest ...@@ -16,7 +16,7 @@ image: urgi/docker-browsers:latest
variables: variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false" GRADLE_OPTS: "-Dorg.gradle.daemon=false"
GRADLE_USER_HOME: $CI_PROJECT_DIR/.gradle GRADLE_USER_HOME: $CI_PROJECT_DIR/.gradle
APP_NAME: gpds APP_NAME: faidare
JAR_PATH: "backend/build/libs/${APP_NAME}.jar" JAR_PATH: "backend/build/libs/${APP_NAME}.jar"
......
# How to contribute to GPDS # How to contribute to FAIDARE
## Git management ## Git management
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
Total 0 (delta 0), reused 0 (delta 0) Total 0 (delta 0), reused 0 (delta 0)
remote: remote:
remote: To create a merge request for chore/explaining_how_to_merge, visit: remote: To create a merge request for chore/explaining_how_to_merge, visit:
remote:   https://forgemia.inra.fr/urgi-is/gpds/merge_requests/new?merge_request%5Bsource_branch%5D=chore/explaining_how_to_merge remote:   https://forgemia.inra.fr/urgi-is/faidare/merge_requests/new?merge_request%5Bsource_branch%5D=chore/explaining_how_to_merge
remote: remote:
To forgemia.inra.fr:urgi-is/gpds.git To forgemia.inra.fr:urgi-is/faidare.git
* [new branch]      chore/explaining_how_to_merge -> chore/explaining_how_to_merge * [new branch]      chore/explaining_how_to_merge -> chore/explaining_how_to_merge
La branche 'chore/explaining_how_to_merge' est paramétrée pour suivre la branche distante 'chore/explaining_how_to_merge' depuis 'origin'. La branche 'chore/explaining_how_to_merge' est paramétrée pour suivre la branche distante 'chore/explaining_how_to_merge' depuis 'origin'.
``` ```
......
...@@ -65,10 +65,10 @@ If you just need access to API (to run the `ng serve` on top of it), you can run ...@@ -65,10 +65,10 @@ If you just need access to API (to run the `ng serve` on top of it), you can run
Otherwise, for the complete server (backend APIs + frontend interface), you can run: Otherwise, for the complete server (backend APIs + frontend interface), you can run:
```sh ```sh
./gradlew assemble && java -jar backend/build/libs/gpds.jar ./gradlew assemble && java -jar backend/build/libs/faidare.jar
``` ```
The server should then be accessible at http://localhost:8380/gpds-dev The server should then be accessible at http://localhost:8380/faidare-dev
## Run frontend development server ## Run frontend development server
...@@ -105,7 +105,7 @@ The details of this remote server are filled in the `bootstrap.yml` file. ...@@ -105,7 +105,7 @@ The details of this remote server are filled in the `bootstrap.yml` file.
By default, it tries to connect to the remote server on http://localhost:8888 By default, it tries to connect to the remote server on http://localhost:8888
but it can of course be changed, or even configured via the `SPRING_CONFIG_URI` environment variable. but it can of course be changed, or even configured via the `SPRING_CONFIG_URI` environment variable.
It will try to fetch the configuration for the application name `gpds`, and the default profile. It will try to fetch the configuration for the application name `faidare`, and the default profile.
If such a configuration is not found, it will then fallback to the local `application.yml` properties. If such a configuration is not found, it will then fallback to the local `application.yml` properties.
To avoid running the Spring Cloud config server every time when developing the application, To avoid running the Spring Cloud config server every time when developing the application,
all the properties are still available in `application.yml` even if they are configured on the remote Spring Cloud server as well. all the properties are still available in `application.yml` even if they are configured on the remote Spring Cloud server as well.
......
...@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank; ...@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
* *
* @author gcornut * @author gcornut
*/ */
@ConfigurationProperties(prefix = "gpds") @ConfigurationProperties(prefix = "faidare")
public class GPDSProperties { public class GPDSProperties {
@NotBlank @NotBlank
......
...@@ -19,7 +19,7 @@ logging.level: ...@@ -19,7 +19,7 @@ logging.level:
web.client.RestTemplate: DEBUG web.client.RestTemplate: DEBUG
fr.inra: DEBUG fr.inra: DEBUG
gpds: faidare:
elasticsearch-alias-template: elasticsearch-alias-template:
gnpis_{source}_{documentType}_5432_krusty-group{groupId} gnpis_{source}_{documentType}_5432_krusty-group{groupId}
...@@ -43,5 +43,5 @@ server: ...@@ -43,5 +43,5 @@ server:
- text/css - text/css
port: 8380 port: 8380
servlet: servlet:
context-path: /gpds-dev context-path: /faidare-dev
spring: spring:
application.name: gpds application.name: faidare
cloud: cloud:
config: config:
uri: ${SPRING_CONFIG_URI:http://localhost:8888} uri: ${SPRING_CONFIG_URI:http://localhost:8888}
spring.data.elasticsearch.host=localhost spring.data.elasticsearch.host=localhost
spring.data.elasticsearch.port=9200 spring.data.elasticsearch.port=9200
gpds.elasticsearch-alias-template=gnpis_{source}_{documentType}-group{groupId} faidare.elasticsearch-alias-template=gnpis_{source}_{documentType}-group{groupId}
gpds.elasticsearch-xref-index-name=urgi_xref_test faidare.elasticsearch-xref-index-name=urgi_xref_test
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"root": "", "root": "",
"sourceRoot": "src", "sourceRoot": "src",
"projectType": "application", "projectType": "application",
"prefix": "gpds", "prefix": "faidare",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
"styleext": "scss" "styleext": "scss"
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
"node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css" "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
], ],
"scripts": [], "scripts": [],
"baseHref": "/gpds-dev/", "baseHref": "/faidare-dev/",
"es5BrowserSupport": true "es5BrowserSupport": true
}, },
"configurations": { "configurations": {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
export const environment = { export const environment = {
production: false, production: false,
navbar: { navbar: {
title: 'GnpIS Plant Data Search', title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
links: [ links: [
{ {
label: 'URGI', label: 'URGI',
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
export const environment = { export const environment = {
production: false, production: false,
navbar: { navbar: {
title: 'GnpIS Plant Data Search', title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
links: [ links: [
{ {
label: 'URGI', label: 'URGI',
......
rootProject.name = "gpds" rootProject.name = "faidare"
include("backend", "frontend") include("backend", "frontend")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment