From 1353217d07cd027ee5f2770ee0c06538a7c2f0f6 Mon Sep 17 00:00:00 2001 From: fnecas Date: Mon, 18 Dec 2023 23:44:24 +0100 Subject: [PATCH] feat: update migration guide guide & default config & geor datadir --- core/src/main/resources/config-spring-geonetwork.xml | 2 ++ core/src/test/resources/config-spring-geonetwork.xml | 1 + georchestra-migration/MIGRATION_NOTES.md | 10 ++++++++++ .../{migration.md => migration-dev-guide.md} | 5 ++++- .../components/toolbar/partials/menu-signin.html | 2 +- web/pom.xml | 3 +-- .../WEB-INF/config-db/postgres-postgis.xml | 8 +++++++- .../WEB-INF/classes/setup/sql/data/data-db-default.sql | 7 ------- 8 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 georchestra-migration/MIGRATION_NOTES.md rename georchestra-migration/{migration.md => migration-dev-guide.md} (94%) diff --git a/core/src/main/resources/config-spring-geonetwork.xml b/core/src/main/resources/config-spring-geonetwork.xml index 74bb752b8b..7dc187acf6 100644 --- a/core/src/main/resources/config-spring-geonetwork.xml +++ b/core/src/main/resources/config-spring-geonetwork.xml @@ -57,8 +57,10 @@ + diff --git a/core/src/test/resources/config-spring-geonetwork.xml b/core/src/test/resources/config-spring-geonetwork.xml index e62debc073..85933b1641 100644 --- a/core/src/test/resources/config-spring-geonetwork.xml +++ b/core/src/test/resources/config-spring-geonetwork.xml @@ -35,6 +35,7 @@ + diff --git a/georchestra-migration/MIGRATION_NOTES.md b/georchestra-migration/MIGRATION_NOTES.md new file mode 100644 index 0000000000..4f467151f3 --- /dev/null +++ b/georchestra-migration/MIGRATION_NOTES.md @@ -0,0 +1,10 @@ +# Migration Notes + +## 4.2.4 -> 4.2.7 + +### Havesters + +- Update XSL transformations in Simple URL haverster to the ones named `schema:...` + +**Simple URL Havester** +- Update `Element for the UUID of each record` with prefixing it with a slash, e.g. `datasetid` becomes `/datasetid` diff --git a/georchestra-migration/migration.md b/georchestra-migration/migration-dev-guide.md similarity index 94% rename from georchestra-migration/migration.md rename to georchestra-migration/migration-dev-guide.md index 4d4df40aa2..fe37cb9772 100644 --- a/georchestra-migration/migration.md +++ b/georchestra-migration/migration-dev-guide.md @@ -31,6 +31,7 @@ All italic folder just have the `pom.xml` change. - `JeevesContextLoaderListener.java` : remove java 8 runtime exception as we use java 11. - `XslUtil.java`: Implement georchestra header specific code - `config-spring-geonetwork.xml` : Implement `context:property-placeholder` for georchestra's datadir + - `src/test/resources/config-spring-geonetwork.xml`: Add GeonetworkDataDirectory bean - `cleanoutdatabase.sql`: Delete from settings-ui at the end of the file - *csw-server* - **docker** @@ -90,11 +91,13 @@ All italic folder just have the `pom.xml` change. - Implement `context:property-placeholder` for georchestra's datadir - Don't forget to import config resource and logging bean - `spring-servlet.xml`: Implement `context:property-placeholder` for georchestra's datadir - - `pom.xml`: Update `dockerGnDatadirScmVersion` variable accordingly + - `postgres-postgis.xml` Keep `context:property-placeholder` for georchestra's datadir + - `pom.xml`: Update `dockerGnDatadirScmVersion` variable accordingly and remove `font-awesome/css/` from `packagingExclude` - web-ui - `pom.xml`: version to update **and to add to gn-web-ui** - `RelatedResourcesService.js`: Add 3DTiles - `CatController.js`: Menu bar accessible and 3DTiles + - `menu-signin.html`: remove the `authenticated` from the `ng-if` in firstul tag. - `src/main/resources/catalog/locales/` - Add OGC API - Features to i18n files - Get `en-georchestra.json` and `fr-georchestra.json` from georchestra diff --git a/web-ui/src/main/resources/catalog/components/toolbar/partials/menu-signin.html b/web-ui/src/main/resources/catalog/components/toolbar/partials/menu-signin.html index 23c7e0d5af..82a6e7e195 100644 --- a/web-ui/src/main/resources/catalog/components/toolbar/partials/menu-signin.html +++ b/web-ui/src/main/resources/catalog/components/toolbar/partials/menu-signin.html @@ -1,5 +1,5 @@
    diff --git a/web/pom.xml b/web/pom.xml index d9a528527a..80ce784cba 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -1356,7 +1356,6 @@ catalog/lib/style/bootstrap/fonts/**, catalog/lib/style/bootstrap/grunt/**, catalog/lib/style/bootstrap/test-infra/**, - catalog/lib/style/font-awesome/css/**, catalog/lib/style/font-awesome/src/**, catalog/lib/style/font-awesome/scss/** @@ -1399,7 +1398,7 @@ ${project.build.directory}/deb/etc/georchestra scm:git:https://github.com/georchestra/datadir.git false - 22.0 + 23.0 branch diff --git a/web/src/main/webResources/WEB-INF/config-db/postgres-postgis.xml b/web/src/main/webResources/WEB-INF/config-db/postgres-postgis.xml index 1a94046890..d4ebf68a3e 100644 --- a/web/src/main/webResources/WEB-INF/config-db/postgres-postgis.xml +++ b/web/src/main/webResources/WEB-INF/config-db/postgres-postgis.xml @@ -23,12 +23,18 @@ --> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + + diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql index 8c29bcd646..797cd96d49 100644 --- a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql @@ -1381,13 +1381,6 @@ INSERT INTO settings_ui VALUES ('srv', '{ "enabled": false, "includePortals": true } - }, - "signin": { - "appUrl": "../../{{node}}/{{lang}}/catalog.signin", - "enabled": false - }, - "signout": { - "appUrl": "../../signout" } }, "nodeDetector": {