From 902e86aaf3eaf83cd187d97d0944436fa1d7d002 Mon Sep 17 00:00:00 2001
From: fnecas <florian.necas@camptocamp.com>
Date: Mon, 18 Dec 2023 19:04:01 +0100
Subject: [PATCH] feat: update migration guide guide & default config & geor
 datadir

---
 .../main/resources/config-spring-geonetwork.xml    | 10 +++++-----
 georchestra-migration/MIGRATION_NOTES.md           | 10 ++++++++++
 .../{migration.md => migration-dev-guide.md}       | 14 ++++++++------
 .../main/resources/config-spring-geonetwork.xml    |  7 +++----
 .../components/toolbar/partials/menu-signin.html   |  2 +-
 web/pom.xml                                        |  3 +--
 .../WEB-INF/config-db/defaultJdbcDataSource.xml    |  9 +++------
 .../WEB-INF/config-db/postgres-postgis.xml         |  8 +++++++-
 .../WEB-INF/config-spring-geonetwork.xml           |  7 +++----
 .../main/webResources/WEB-INF/spring-servlet.xml   |  8 +++-----
 .../classes/setup/sql/data/data-db-default.sql     |  7 -------
 11 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 georchestra-migration/MIGRATION_NOTES.md
 rename georchestra-migration/{migration.md => migration-dev-guide.md} (89%)

diff --git a/core/src/main/resources/config-spring-geonetwork.xml b/core/src/main/resources/config-spring-geonetwork.xml
index 74bb752b8b..5ef678894b 100644
--- a/core/src/main/resources/config-spring-geonetwork.xml
+++ b/core/src/main/resources/config-spring-geonetwork.xml
@@ -38,12 +38,10 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
-                                ignore-unresolvable="true"
-                                ignore-resource-not-found="true"
+  <context:property-placeholder location="${app.properties}"
                                 order="3"
-                                file-encoding="UTF-8"/>
-
+                                file-encoding="UTF-8"
+                                ignore-unresolvable="true"/>
   <context:annotation-config/>
   <bean id="ProfileManager" class="jeeves.component.ProfileManager" lazy-init="true"/>
   <bean id="MonitorManager" class="jeeves.monitor.MonitorManager" lazy-init="true"/>
@@ -57,8 +55,10 @@
 
   <bean id="AccessManager" class="org.fao.geonet.kernel.AccessManager" lazy-init="true"/>
   <bean id="DataManager" class="org.fao.geonet.kernel.DataManager" lazy-init="true"/>
+  <!-- will be defined into the web/ module
   <bean id="GeonetworkDataDirectory" class="org.fao.geonet.kernel.GeonetworkDataDirectory"
         lazy-init="true"/>
+  -->
 
   <bean id="ThesaurusManager" class="org.fao.geonet.kernel.ThesaurusManager" lazy-init="true">
     <property name="thesaurusCacheMaxSize" value="\${thesaurus.cache.maxsize}"/>
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 89%
rename from georchestra-migration/migration.md
rename to georchestra-migration/migration-dev-guide.md
index 4d4df40aa2..9a182df689 100644
--- a/georchestra-migration/migration.md
+++ b/georchestra-migration/migration-dev-guide.md
@@ -30,7 +30,7 @@ All italic folder just have the `pom.xml` change.
 - core
   - `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
+  - `config-spring-geonetwork.xml` : Implement `context:property-placeholder` for georchestra's datadir **AND** set only app.properties in third order
   - `cleanoutdatabase.sql`: Delete from settings-ui at the end of the file
 - *csw-server*
 - **docker** 
@@ -69,7 +69,7 @@ All italic folder just have the `pom.xml` change.
 - *schemas-test*
 - *sde*
 - services
-  - `config-spring-geonetwork.xml`: Implement `context:property-placeholder` for georchestra's datadir
+  - `config-spring-geonetwork.xml`: Implement `context:property-placeholder` for georchestra's datadir **AND** set only app.properties in third order
   - `MetadataExtentApiTest.java` : Update image signatures if necessary (tests may fail see [MetadataExtentApiTest-reference](resources%2FMetadataExtentApiTest-reference) for image reference)
   - `BatchOpsMetadatReindexerTest.java` : Add PowerMockIgnore
   - `pom.xml`: version to update **and to add to gn-services**
@@ -85,16 +85,18 @@ All italic folder just have the `pom.xml` change.
     - Get files from georchestra
   - `base-variables.xsl` and `base-layout.xsl`
     - Get header from georchestra
-  - `defaultJdbcDataSource.xml`: Implement `context:property-placeholder` for georchestra's db
+  - `defaultJdbcDataSource.xml`: Implement `context:property-placeholder` for georchestra's db **AND** keep only two firsts of them
   - `config-spring-geonetwork.xml`
-    - Implement `context:property-placeholder` for georchestra's datadir
+    - Implement `context:property-placeholder` for georchestra's datadir **AND** set only app.properties in third order
     - 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
+  - `spring-servlet.xml`: Implement `context:property-placeholder` for georchestra's datadir **AND** set only app.properties in third order
+  - `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/services/src/main/resources/config-spring-geonetwork.xml b/services/src/main/resources/config-spring-geonetwork.xml
index d13736472d..c424740ad7 100644
--- a/services/src/main/resources/config-spring-geonetwork.xml
+++ b/services/src/main/resources/config-spring-geonetwork.xml
@@ -34,11 +34,10 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
-                                ignore-unresolvable="true"
-                                ignore-resource-not-found="true"
+  <context:property-placeholder location="${app.properties}"
                                 order="3"
-                                file-encoding="UTF-8"/>
+                                file-encoding="UTF-8"
+                                ignore-unresolvable="true"/>
 
   <context:component-scan base-package="org.springdoc.webmvc"/>
   <context:component-scan base-package="org.springdoc.core"/>
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 @@
 <ul
-  data-ng-if="gnCfg.mods.authentication.enabled || authenticated"
+  data-ng-if="gnCfg.mods.authentication.enabled"
   class="nav navbar-nav username-dropdown accessible-dropdown"
 >
   <!-- logged in -->
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/**
               </packagingExcludes>
@@ -1399,7 +1398,7 @@
               <checkoutDirectory>${project.build.directory}/deb/etc/georchestra</checkoutDirectory>
               <connectionUrl>scm:git:https://github.com/georchestra/datadir.git</connectionUrl>
               <pushChanges>false</pushChanges>
-              <scmVersion>22.0</scmVersion>
+              <scmVersion>23.0</scmVersion>
               <scmVersionType>branch</scmVersionType>
             </configuration>
             <executions>
diff --git a/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml b/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml
index 813f8260bf..410ee45f81 100644
--- a/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml
+++ b/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml
@@ -30,16 +30,13 @@
 		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
 	">
+
+
   <context:property-placeholder location="file:${georchestra.datadir}/geonetwork/geonetwork.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
- <!-- <context:property-placeholder location="${db.properties},file://#{systemEnvironment['geonetwork_dir']}/config/db.properties"
-                            ignore-unresolvable="true"
-                            ignore-resource-not-found="true"
-                            file-encoding="UTF-8"
-                            order="-1"/>
--->
+
   <bean id="jdbcDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="JmxName" value="jdbcDataSource"/>
     <property name="driverClassName" ref="jdbcDriverClassName"/>
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 @@
   -->
 
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
        default-lazy-init="true"
        xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       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">
   <!-- allow loading properties from the tomcat conf directory. If not found the default jdbc.properties will be used. Uncomment to use. -->
   <!-- context:property-placeholder location="file:${catalina.home}/conf/jdbc.properties" ignore-resource-not-found="true" file-encoding="UTF-8" ignore-unresolvable="true" order="0"/-->
 
+  <context:property-placeholder location="file:${georchestra.datadir}/geonetwork/geonetwork.properties"
+                                ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
+  <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
+                                ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
+
   <import resource="defaultJdbcDataSource.xml"/>
 
   <bean id="jpaVendorAdapterDatabaseParam" class="java.lang.String">
diff --git a/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml b/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
index ca43500104..d820563c2a 100644
--- a/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
+++ b/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
@@ -38,11 +38,10 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
-                                ignore-unresolvable="true"
-                                ignore-resource-not-found="true"
+  <context:property-placeholder location="${app.properties}"
                                 order="3"
-                                file-encoding="UTF-8"/>
+                                file-encoding="UTF-8"
+                                ignore-unresolvable="true"/>
 
   <import resource="config-spring-env.xml"/>
   <import resource="config-security/config-security.xml"/>
diff --git a/web/src/main/webResources/WEB-INF/spring-servlet.xml b/web/src/main/webResources/WEB-INF/spring-servlet.xml
index 71d6a95e84..18beb01681 100644
--- a/web/src/main/webResources/WEB-INF/spring-servlet.xml
+++ b/web/src/main/webResources/WEB-INF/spring-servlet.xml
@@ -42,14 +42,12 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
-                                ignore-unresolvable="true"
-                                ignore-resource-not-found="true"
-                                order="3"
-                                file-encoding="UTF-8"/>
+  <context:property-placeholder location="${app.properties}"
+                                file-encoding="UTF-8" ignore-unresolvable="true" order="3" />
 
   <context:component-scan base-package="org.fao.geonet"/>
 
+
   <bean id="configPath" class="java.lang.String">
     <constructor-arg index="0" value="/WEB-INF/"/>
   </bean>
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": {