Merge remote-tracking branch 'origin/main' into metawal-4.4.x

core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java

@@ -826,8 +826,8 @@ public SearchResponse query(JsonNode jsonRequest, Set<String> includedFields,
         return client.query(defaultIndex, jsonRequest, null, includedFields, from, size);
     }
 
-    public Map<String, String> getFieldsValues(String id, Set<String> fields) throws IOException {
-        return client.getFieldsValues(defaultIndex, id, fields);
+    public Map<String, String> getFieldsValues(String id, Set<String> fields, String language) throws Exception {
+        return client.getFieldsValues(defaultIndex, id, fields, language);
     }
 
 

core/src/main/java/org/fao/geonet/util/MailUtil.java

@@ -364,9 +364,6 @@ private static void configureBasics(String hostName, Integer smtpPort,
             email.setAuthenticator(new DefaultAuthenticator(username, password));
         }
 
-
-        email.setDebug(true);
-
         if (tls != null && tls) {
             email.setStartTLSEnabled(tls);
             email.setStartTLSRequired(tls);

core/src/main/java/org/fao/geonet/util/XslUtil.java

@@ -843,11 +843,9 @@ public static String getIndexField(Object appName, Object uuid, Object field, Ob
         try {
             Set<String> fields = new HashSet<>();
             fields.add(fieldname);
-            // TODO: Multilingual fields
-            final Map<String, String> values = searchManager.getFieldsValues(id, fields);
+            final Map<String, String> values = searchManager.getFieldsValues(id, fields, language);
             return values.get(fieldname);
         } catch (Exception e) {
-            e.printStackTrace();
             Log.error(Geonet.GEONETWORK, "Failed to get index field '" + fieldname + "' value on '" + id + "', caused by " + e.getMessage());
         }
         return "";

core/src/test/resources/org/fao/geonet/api/Messages.properties

@@ -54,8 +54,8 @@ user_password_changed='%s' password was updated.
 user_password_notchanged=A problem occurred trying to change '%s' password. Contact the helpdesk.
 user_password_invalid_changekey='%s' is an invalid change key for '%s'. Change keys are only valid for one day.
 user_registered=User '%s' registered.
-user_with_that_email_found=A user with this email '%s' already exists.
-user_with_that_username_found=A user with this username '%s' already exists.
+user_with_that_email_found=A user with this email or username already exists.
+user_with_that_username_found=A user with this email or username already exists.
 register_email_admin_subject=%s / New account for %s as %s
 register_email_admin_message=Dear Admin,\n\
   Newly registered user %s has requested %s access for %s.\n\
@@ -118,6 +118,12 @@ Message: \n\
 View record: \n\
 {{link}}
 # TODO: Link to DOI creation panel
+metadata_published_subject=%s / Metadata publication
+metadata_published_text=The following records have been processed:\n\
+    <ul>%s</ul>
+metadata_published_record_text=<li>The metadata <a href="{{link}}">{{index:resourceTitleObject}}</a> has been published.</li>
+metadata_unpublished_record_text=<li>The metadata <a href="{{link}}">{{index:resourceTitleObject}}</a> has been unpublished.</li>
+metadata_approved_published_record_text=<li>The metadata <a href="{{link}}">{{index:resourceTitleObject}}</a> has been published as a new version.</li>
 
 api.groups.group_not_found=Group with ID ''{0}'' not found in this catalog.
 user_watchlist_subject=%s / %d updates in your watch list since %s
@@ -171,9 +177,9 @@ exception.doi.missingSavedquery.description="Record ''{0}'' is in schema ''{1}''
 exception.doi.recordNotConformantMissingInfo=Record is not conform with DataCite format
 exception.doi.recordNotConformantMissingInfo.description=Record ''{0}'' is not conform with DataCite format. {1} mandatory field(s) missing. {2}
 exception.doi.recordNotConformantMissingMandatory=Record is not conform with DataCite validation rules for mandatory fields
-exception.doi.recordNotConformantMissingMandatory.description=Record ''{0}'' is not conform with DataCite validation rules for mandatory fields. Error is: {1}. Required fields in DataCite are: identifier, creators, titles, publisher, publicationYear, resourceType. <a href=''{2}api/records/%s/formatters/datacite?output=xml''>Check the DataCite format output</a> and adapt the record content to add missing information.
+exception.doi.recordNotConformantMissingMandatory.description=Record ''{0}'' is not conform with DataCite validation rules for mandatory fields. Error is: {1}. Required fields in DataCite are: identifier, creators, titles, publisher, publicationYear, resourceType. <a href=''{2}api/records/{3}/formatters/datacite?output=xml''>Check the DataCite format output</a> and adapt the record content to add missing information.
 exception.doi.recordInvalid=Record converted to DataCite format is invalid.
-exception.doi.recordInvalid.description=Record ''{0}'' converted to DataCite format is invalid. Error is: {1}. Required fields in DataCite are: identifier, creators, titles, publisher, publicationYear, resourceType. <a href='{2}api/records/{3}/formatters/datacite?output=xml'>Check the DataCite format output</a> and adapt the record content to add missing information.
+exception.doi.recordInvalid.description=Record ''{0}'' converted to DataCite format is invalid. Error is: {1}. Required fields in DataCite are: identifier, creators, titles, publisher, publicationYear, resourceType. <a href=''{2}api/records/{3}/formatters/datacite?output=xml''>Check the DataCite format output</a> and adapt the record content to add missing information.
 api.metadata.import.importedWithId=Metadata imported with ID '%s'
 api.metadata.import.importedWithUuid=Metadata imported with UUID '%s'
 api.metadata.import.importedFromXMLWithUuid=Metadata imported from XML with UUID '%s'

core/src/test/resources/org/fao/geonet/api/Messages_fre.properties

@@ -45,8 +45,8 @@ user_password_sent=Si l''utilisateur existe, vous recevrez un courriel contenant
 user_password_changed=Le mot de passe de %s a \u00E9t\u00E9 mis \u00E0 jour.
 user_password_notchanged=\u00C9chec lors du changement de mot de passe de %s. Contactez le support.
 user_password_invalid_changekey=%s est une cl\u00E9 invalide pour %s. Les cl\u00E9s ne sont valides que pendant une journ\u00E9e.
-user_with_that_email_found=Un utilisateur avec cette adresse email %s existe d\u00E9j\u00E0.
-user_with_that_username_found=Un utilisateur avec ce nom d''utilisateur %s existe d\u00E9j\u00E0.
+user_with_that_email_found=Un utilisateur avec cette adresse email ou ce nom d''utilisateur existe d\u00E9j\u00E0.
+user_with_that_username_found=Un utilisateur avec cette adresse email ou ce nom d''utilisateur existe d\u00E9j\u00E0.
 register_email_admin_subject=%s / Cr\u00E9ation de compte pour %s en tant que %s
 register_email_admin_message=Cher administrateur,\n\
   L'utilisateur %s vient de demander une cr\u00E9ation de compte pour %s.\n\
@@ -112,6 +112,7 @@ metadata_published_text=Les fiches suivantes ont \u00E9t\u00E9 trait\u00E9es:\n\
     <ul>%s</ul>
 metadata_published_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 metadata_unpublished_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 d\u00E9publi\u00E9e.</li>
+metadata_approved_published_record_text=<li>Une nouvelle version de la m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 
 api.groups.group_not_found=Le groupe avec l''identifiant ''{0}'' n''a pas \u00E9t\u00E9 trouv\u00E9 dans le catalogue.
 user_watchlist_subject=%s / %d mises \u00e0 jour dans vos fiches surveill\u00E9es %s

docs/manual/README.md

@@ -96,34 +96,36 @@ If you are not familiar with Python the MkDocs-material website has instructions
    mvn install -Pdefault
    ```
 
-## Deploy
+## Publish Documentation
 
-We use ``mike`` for publishing to https://geonetwork.github.io using `<major>.<minor>` version:
+We use ``mike`` for publishing (from the `gh-pages` branch). Docs are published by the ``.github/workflows/docs.yml`` automation each time pull-request is merged.
 
-1. To deploy docs from the `main` branch to website `gh-pages` branch:
+If you wish to preview using your own `gh-pages` branch:
+
+1. To deploy 4.4 docs as latest from the `main` branch to website `gh-pages` branch:
 
    ```bash
-   mike deploy --push --no-redirect --update-aliases 4.4 latest
+   mike deploy --title "4.4 Latest" --alias-type=copy --update-aliases 4.4 latest
    ```
-    
+
 2. To deploy documentation for a new release:
 
    ```bash
-   mike deploy --push --no-redirect --update-aliases 4.2 stable
+   mike deploy --push --alias-type=copy 4.2 stable
    ```
 
 3. When starting a new branch you can make it the default:
 
    ```bash
-   mike set-default --push 4.2
+   mike set-default --push 4.6
    ```
-
-   Hint: When starting a new branch update `overview/changelog/` navigation tree also.
+    
+   Hint: When starting a new branch update `overview/changelog/history/index.md` headings for latest, maintenance, stable (for prior branches also).
 
 4. To publish documentation for a maintenance release:
 
    ```bash
-   mike deploy --push --no-redirect --update-aliases 3.12 maintenance
+   mike deploy --push --alias-type=copy 3.12 maintenance
    ```
 
 5. To show published versions:

docs/manual/docs/maintainer-guide/updating/index.md

@@ -99,7 +99,7 @@ Update:
         
 Guidance:
 
-* [Changelog 4.4.x](../../overview/change-log/latest/index.md)
+* [Changelog 4.4](../../overview/change-log/history/index.md#44)
 * No additional guidance provided at this time.
 
 ## Upgrade from GeoNetwork 3.0 to GeoNetwork 4.4
@@ -161,5 +161,6 @@ Guidance:
 
 * For information on new features and functionality:
 
-   * [Changelog 4.4.x](../../overview/change-log/latest/index.md)
-   * [Changelog 4.0.x](../../overview/change-log/archive/index.md#40x)
+   * [Changelog 4.4](../../overview/change-log/history/index.md#44)
+   * [Changelog 4.2](../../overview/change-log/history/index.md#42)
+   * [Changelog 4.0](../../overview/change-log/history/index.md#40)

docs/manual/docs/overview/change-log/archive/index.md → docs/manual/docs/overview/change-log/history/index.md

@@ -1,12 +1,30 @@
-# Archived
+# Release History
 
-The following series of GeoNetwork are no longer in active use and you are encouraged to migrate to a newer version.
-
-The GeoNetwork community is not large enough to maintain many active branches of GeoNetwork at one time. Older installations of GeoNetwork may be subject to disclosed security vulnerabilities resulting in our recommendation to update to the supported [stable](../stable/index.md) (or [maintenance](../maintenance/index.md) series if available).
+The GeoNetwork community is not large enough to maintain many active branches of GeoNetwork at one time. Older installations of GeoNetwork may be subject to disclosed security vulnerabilities resulting in our recommendation to update to the supported [stable](http://docs.geonetwork-opensource.org/stable/) or [maintenance](https://docs.geonetwork-opensource.org/maintenance/) series if available.
 
 Volunteers wishing to backport security fixes to older versions of GeoNetwork are welcome to do so. Commercial support providers are welcome to do so on behalf of their customers.
 
-## 4.2.x
+## Latest Release
+
+The latest release of GeoNetwork is recommended for those enjoying the newest features from the GeoNetwork community. 
+
+This series is under active development by our community, with new features, improvements, documentation updates, bug reports, fixes, and releases.
+
+### 4.4
+
+-   [Version 4.4.4](../version-4.4.4.md)
+-   [Version 4.4.3](../version-4.4.3.md)
+-   [Version 4.4.2](../version-4.4.2.md)
+-   [Version 4.4.1](../version-4.4.1.md)
+-   [Version 4.4.0](../version-4.4.0.md)
+
+## Stable Release
+
+The stable release of GeoNetwork is recommended for production use and for new installations of GeoNetwork.
+
+This series is under active use by our community, with regular improvements, documentation updates, bug reports, fixes, and releases.
+
+### 4.2
 
 - [Version 4.2.9](../version-4.2.9.md)
 - [Version 4.2.8](../version-4.2.8.md)
@@ -19,7 +37,23 @@ Volunteers wishing to backport security fixes to older versions of GeoNetwork ar
 - [Version 4.2.1](../version-4.2.1.md)
 - [Version 4.2.0](../version-4.2.0.md)
 
-## 4.0.x
+## Maintenance Release
+
+The maintenance release of GeoNetwork provides production systems with essential updates and fixes to allow time to upgrade to the recommended stable release. 
+
+This series is no longer under active development, providing essential fixes, and releases only.
+
+### No maintenance release
+
+With the final release of 3.12.12 there is no active maintenance release being provided.
+
+Production systems are advised to update to 4.2 above if they have not already done so.
+
+## Archived Releases
+
+The following series of GeoNetwork are no longer in active use and you are encouraged to migrate to a newer version.
+
+### 4.0
 
 -   [Version 4.0.6](../version-4.0.6.md)
 -   [Version 4.0.5](../version-4.0.5.md)
@@ -31,7 +65,7 @@ Volunteers wishing to backport security fixes to older versions of GeoNetwork ar
 -   [Version 4.0.0 Alpha.2](../version-4.0.0-alpha.2.md)
 -   [Version 4.0.0 Alpha.1](../version-4.0.0-alpha.1.md)
 
-## 3.12.x
+### 3.12
 
 -   [Version 3.12.12](../version-3.12.12.md)
 -   [Version 3.12.11](../version-3.12.11.md)
@@ -47,7 +81,7 @@ Volunteers wishing to backport security fixes to older versions of GeoNetwork ar
 -   [Version 3.12.1](../version-3.12.1.md)
 -   [Version 3.12.0](../version-3.12.0.md)
 
-## 3.10.x
+### 3.10
 
 -   [Version 3.10.10](../version-3.10.10.md)
 -   [Version 3.10.9](../version-3.10.9.md)
@@ -79,40 +113,40 @@ Volunteers wishing to backport security fixes to older versions of GeoNetwork ar
 -   [Version 3.0.1](../version-3.0.1.md)
 -   [Version 3.0.0](../version-3.0.0.md)
 
-## 3.8.x
+### 3.8
 
 -   [Version 3.8.3](../version-3.8.3.md)
 -   [Version 3.8.2](../version-3.8.2.md)
 -   [Version 3.8.1](../version-3.8.1.md)
 -   [Version 3.8.0](../version-3.8.0.md)
 
-## 3.6.x
+### 3.6
 
 -   [Version 3.6.0](../version-3.6.0.md)
 
-## 3.4.x
+### 3.4
 
 -   [Version 3.4.4](../version-3.4.4.md)
 -   [Version 3.4.3](../version-3.4.3.md)
 -   [Version 3.4.2](../version-3.4.2.md)
 -   [Version 3.4.1](../version-3.4.1.md)
 -   [Version 3.4.0](../version-3.4.0.md)
 
-## 3.2.x
+### 3.2
 
 -   [Version 3.2.2](../version-3.2.2.md)
 -   [Version 3.2.1](../version-3.2.1.md)
 -   [Version 3.2.0](../version-3.2.0.md)
 
-## 3.0.x
+### 3.0
 
 -   [Version 3.0.4](../version-3.0.4.md)
 -   [Version 3.0.3](../version-3.0.3.md)
 -   [Version 3.0.2](../version-3.0.2.md)
 -   [Version 3.0.1](../version-3.0.1.md)
 -   [Version 3.0.0](../version-3.0.0.md)
 
-## 2.10.x
+### 2.10
 
 All development has ceased:
 

docs/manual/docs/overview/change-log/index.md

@@ -2,7 +2,6 @@
 
 Notable changes made to GeoNetwork opensource including new features, migration instructions, and bug fixes.
 
--   [Latest](latest/index.md)
--   [Stable](stable/index.md)
--   [Maintenance](maintenance/index.md)
--   [Archive](archive/index.md)
+-   [Version 4.4.4](version-4.4.4.md)
+-   [Version 4.2.9](version-4.2.9.md)
+-   [Release History](history/index.md)