Skip to content

Commit

Permalink
Merge branch 'main' into main.metadata.history.access.level
Browse files Browse the repository at this point in the history
# Conflicts:
#	web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v441/migrate-default.sql
  • Loading branch information
wangf1122 committed Nov 29, 2023
2 parents 80eddab + 50694f5 commit f4ee086
Show file tree
Hide file tree
Showing 120 changed files with 453 additions and 168 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
working-directory: docs/manual
run: |
mike deploy --title "4.4 Latest" --no-redirect --update-aliases 4.4 latest
mike deploy --title "4.4 Latest" --alias-type=copy --update-aliases 4.4 latest
- name: deploy latest docs to gh-pages branch
if: ${{ github.event_name != 'pull_request' }}
working-directory: docs/manual
run: |
mike deploy --push --title "4.4 Latest" --no-redirect --update-aliases 4.4 latest
mike deploy --push --title "4.4 Latest" --alias-type=copy --update-aliases 4.4 latest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ web/src/main/webapp/WEB-INF/prebuilt
web/src/main/webapp/data/
web/src/main/webapp/doc/en
web/src/main/webapp/doc/fr
web/src/main/webapp/WEB-INF/data/data/resources/schemapublication
2 changes: 1 addition & 1 deletion cachingxslt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion csw-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datastorages/cmis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>gn-datastorages</artifactId>
<groupId>org.geonetwork-opensource.datastorage</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datastorages/jcloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>gn-datastorages</artifactId>
<groupId>org.geonetwork-opensource.datastorage</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datastorages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datastorages/s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>gn-datastorages</artifactId>
<groupId>org.geonetwork-opensource.datastorage</groupId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
65 changes: 65 additions & 0 deletions docs/changes4.4.1-0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
================================================================================
===
=== GeoNetwork 4.4.1: List of changes
===
================================================================================
- Changelog / 441 and 427. (#7508)
- i18n / Transifex update. (#7505)
- Security / Jolokia update. (#7501)
- Add web/src/main/webapp/WEB-INF/data/data/resources/schemapublication folder to .gitignore
- Check http links in documentation (#7496)
- Add more db information to the site information page. (#7403)
- Update manual links to use https://docs.geonetwork-opensource.org/ (#7487)
- Change the structure of the MkDocs assets. Stylesheets and logos are moved to the `overrides` directory (#7429)
- Fix url link in full view. bracket ") " could be included in link (#7483)
- Batch edit access level for editor role (#7464)
- Fixed broken links and formatting in BUILDING.md (#7471)
- Editor / Remove extra space on mandatory add action (#7438)
- WRO4J / Fix unresolvable source map file on Windows (#7476)
- Add node identifier parameter for xlst processing. Required in skin.xsl (#7454)
- change label to "Access to the catalogue" (#7467)
- API / Batch editing / XPath / Add support for attribute with namespace.
- Remove exception class name from the error message (#6977)
- Release / Create SQL migration script for new version (#7395)
- Standard / Formatter / Citation improvements (#7434)
- Update to GeoTools 30.0 Release (#7416)
- Record view / Series / Technical information
- List styling for related records (#7442)
- Standard / Processes / Collection merge (#7436)
- Indexing / Add related record title to the full text search (#7437)
- Update docker.md
- Fix cookies path when deployed on root "/" context (#7446)
- Search results / Fix button size
- Standard / Feature catalogues / Do not index empty codelist value (#7440)
- Remove the `Download metadata` button in the metadata block on the Metadata page.
- Fixed typos, formatting and numbering (#7430)
- Fix issue with canViewRecord when calling related api (#7373)
- Transifex updates (#7432)
- Fix exception handling from schematron validation so that it flags the metadata as invalid if there is an exception (#6978)
- Rename ElasticSearch to Elasticsearch (#7404)
- Sort the portals by label, not by name (identifier) (#7424)
- Metadata editor / ISO19115-3.2008 / Filter out metadata templates in the online resources dialog
- Fix system info when ES throw errors (#7413)
- Remove old password field for admins (#7417)
- Add documentation to GitHub workflows (#7411)
- GeoNetwork 4.4.x minor versions library updates
- Change the url the icon in the homepage is linking to (#7422)
- Fixed typos and updated SearchManager to EsSearchManager in core readme (#7418)
- Update the links to documentation in the sofware development pages (#7408)
- Update the CONTRIBUTING guide to detail the steps, before merging the pull requests (#7419)
- Transifex updates
- [feat] allow to open COG links in external viewer (#7387)
- please prettier-java
- Add 3DTILES support to gn_relatedresources_service module
- add badge support for 3dtiles
- add OGC:3DTILES to gnSearchSettings.mapProtocols.layers
- support OGC:3DTILES protocol, set type to 3dtiles in buildAddToMapConfig
- add OGC:3DTILES to possible values for gmd:protocol
- Record view / fix double approved parameter in the metadata working copy page, for the buttons in the online resources panel. Related to #7248 (#7402)
- Doc / Fix list (#7401)
- Fixed typos in code_quality readme (#7407)
- Use default mike settings to fix interaction between language chooser and versions
- Correct canical_version to stable
- Add 3.12.11 changelog and fix the display of the changelogs in the navigation bar (#7397)
- Doc / 4.4.0 / Add note about datastore changes (#7398)
- Update version to 4.4.1-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To configure the discovery service, a dedicated service metadata record MUST be

## Loading INSPIRE codelists

To describe INSPIRE datasets and series, it is recommended to load relevant codelists from the [INSPIRE Registry](http://inspire.ec.europa.eu/registry/), the following codelists are relevant in the scope of metadata guidelines v2.0:
To describe INSPIRE datasets and series, it is recommended to load relevant codelists from the [INSPIRE Registry](https://inspire.ec.europa.eu/registry/), the following codelists are relevant in the scope of metadata guidelines v2.0:

- [INSPIRE Theme](https://inspire.ec.europa.eu/theme)
- [Application schema](https://inspire.ec.europa.eu/applicationschema)
Expand Down Expand Up @@ -54,7 +54,7 @@ Via the schema plugin form configuration it is an option to configure a thesauru

## INSPIRE validation

INSPIRE validation of metadata records is available at [the INSPIRE Validator](https://inspire.ec.europa.eu/validator/about/). It is using [ETF which is an open source testing framework for spatial data and services](https://github.com/etf-validator/etf-webapp). GeoNetwork is able to `te` any record using a service provided by an instance of ETF. To configure remote validation, go to `Admin console` --> `Settings` and set the URL of the validator. The url of the main INSPIRE validator is `http://inspire.ec.europa.eu/validator/`.
INSPIRE validation of metadata records is available at [the INSPIRE Validator](https://inspire.ec.europa.eu/validator/about/). It is using [ETF which is an open source testing framework for spatial data and services](https://github.com/etf-validator/etf-webapp). GeoNetwork is able to `te` any record using a service provided by an instance of ETF. To configure remote validation, go to `Admin console` --> `Settings` and set the URL of the validator. The url of the main INSPIRE validator is `https://inspire.ec.europa.eu/validator/`.

![image](img/inspire-configuration.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

To publish information from the catalog as OGC services (WMS, WFS, WCS), catalog administrator need to register one or more map servers to publish on. Map servers MUST support the GeoServer REST API in order to work with the catalog. The 2 following implementations have been tested:

- [GeoServer](http://geoserver.org)
- [Mapserver](http://mapserver.org) and [Mapserver REST API](https://github.com/neogeo-technologies/mra)
- [GeoServer](https://geoserver.org)
- [Mapserver](https://mapserver.org) and [Mapserver REST API](https://github.com/neogeo-technologies/mra)

Setup you map server and then register it from the administration interface:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ See [Configuring for the INSPIRE Directive](inspire-configuration.md).

## INSPIRE Atom Feed

Allows to define the configuration of Atom Feeds referenced by the metadata to provide services related to the [INSPIRE technical guidance for download services](http://inspire.ec.europa.eu/documents/Network_Services/Technical_Guidance_Download_Services_3.0.pdf):
Allows to define the configuration of Atom Feeds referenced by the metadata to provide services related to the [INSPIRE technical guidance for download services](https://inspire.ec.europa.eu/documents/Network_Services/Technical_Guidance_Download_Services_3.0.pdf):

- Select the type of atom feed:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ To assign a category to a metadata document. Go to the metadata modification for

To modify the available categories in the catalog, from the admin page, open the "classification systems" and then the "category" tab.

Note: If you add or modify categories, they may not obtain an appropriate icon. These icon are managed in `/catalog/style/gn_icons.less`. In this file category-classes are mapped to font-awesome variables that map to a certain [font-awesome icon](http://fontawesome.io).
Note: If you add or modify categories, they may not obtain an appropriate icon. These icon are managed in `/catalog/style/gn_icons.less`. In this file category-classes are mapped to font-awesome variables that map to a certain [font-awesome icon](https://fontawesome.io).
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ In order to define which groups the user is member of and which profile is the u
``` text
ldapUserContextMapper.mapping[privilege]=groups,sample
# If not set, the default profile is RegisteredUser
# Valid profiles are http://geonetwork-opensource.org/manuals/trunk/eng/developer/apidocs/geonetwork/org/fao/geonet/constants/Geonet.Profile.html
# Valid profiles are ADMINISTRATOR, USER_ADMIN, REVIEWER, EDITOR, REGISTERED_USER, GUEST
ldapUserContextMapper.mapping[profile]=privileges,RegisteredUser
```

Expand Down
6 changes: 3 additions & 3 deletions docs/manual/docs/annexes/standards/iso19115-3.2018.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ This schema also includes:

More information:

- [Using the latest ISO Standard for Geographic Information (ISO19115-1) for an INSPIRE Discovery Service](http://cnig.gouv.fr/wp-content/uploads/2015/06/titellus_fx_prunayre_iso19115-3_inspire2015.pdf)
- [Using the latest ISO Standard for Geographic Information (ISO19115-1) for an INSPIRE Discovery Service](https://www.iso.org/standard/53798.html)

This standard is maintained on <https://github.com/metadata101/iso19115-3.2018> and is available by default in GeoNetwork 3.8+. The TC211 is maintaining the XSD for this standard on <https://github.com/ISO-TC211/XML>.
This standard is maintained on <https://github.com/geonetwork/core-geonetwork/tree/master/schemas/iso19115-3.2018> and is available by default in GeoNetwork. The TC211 is maintaining the XSD for this standard on <https://github.com/ISO-TC211/XML>.

Example of catalogues using this standard:

- [Metawal - Catalogue pour l'information géographique de Wallonie](http://metawal.wallonie.be/) is using ISO19115-3 as the default standard for all records. Main advantages are: categorizations of related documents (eg. online sources, DQ reports, GIS styles, Data models), better description of organization / parties and roles, remain compliant to the INSPIRE directive by converting to ISO19139 through CSW.
- [Metawal - Catalogue pour l'information géographique de Wallonie](https://metawal.wallonie.be/) is using ISO19115-3 as the default standard for all records. Main advantages are: categorizations of related documents (eg. online sources, DQ reports, GIS styles, Data models), better description of organization / parties and roles, remain compliant to the INSPIRE directive by converting to ISO19139 through CSW.

![](img/metawal-tramedesaxes.png)

Expand Down
2 changes: 1 addition & 1 deletion docs/manual/docs/help/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ GeoNetwork is a catalog application to manage spatially referenced resources. It

[GeoNetwork Manual](https://docs.geonetwork-opensource.org/4.4)

[GeoNetwork opensource](http://geonetwork-opensource.org)
[GeoNetwork opensource](https://geonetwork-opensource.org)
2 changes: 1 addition & 1 deletion docs/manual/docs/install-guide/configuring-database.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GeoNetwork uses a database to persist aspects such as metadata records, privileg

## H2 database

By default, a [H2](http://www.h2database.com/html/main.html) database is configured and created when the application first starts. The H2 database named `gn.h2.db` is created:
By default, a [H2](https://www.h2database.com/html/main.html) database is configured and created when the application first starts. The H2 database named `gn.h2.db` is created:

- In the **`jetty`** folder of the GeoNetwork application folder when using the [ZIP distribution](installing-from-zip.md).
- In the **`bin`** folder of Tomcat when deploying the [WAR](installing-from-war-file.md) on Tomcat (started using `startup.sh`).
Expand Down
18 changes: 11 additions & 7 deletions docs/manual/docs/install-guide/installing-from-source-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

### Java 11

GeoNetwork 4.4 is a Java 11 application that runs as a servlet, which means that a Java Development Kit (JDK) must be installed in order to build and run it. You can get a Java 11 JDK from your Linux distribution, [Oracle OpenJDK](http://openjdk.java.net/) or [AdoptOpenJDK](https://adoptopenjdk.net). Please note that the Java 11 [Oracle JDK](http://www.oracle.com/technetwork/java/javase/downloads) is currently only being distributed for testing purposes.
GeoNetwork 4.4 is a Java 11 application that runs as a servlet, which means that a Java Development Kit (JDK) must be installed in order to build and run it. You can get a Java 11 JDK from your Linux distribution, [OpenJDK](https://openjdk.java.net/) or [Adoptium Temurin JDK](https://adoptopenjdk.net).

Please note that the commercial distribution of [Oracle JDK](https://www.oracle.com/technetwork/java/javase/downloads) no longer provides Java 11 for testing purposes.

Because GeoNetwork is developed with Java 11 (LTS), it won't run at all with earlier releases.

Expand All @@ -16,13 +18,15 @@ Because GeoNetwork is developed with Java 11 (LTS), it won't run at all with ea

Next, you need a servlet container. GeoNetwork ships with an embedded container, [Eclipse Jetty](https://www.eclipse.org/jetty/), which is fast and well-suited for most applications.

If you need a more powerful container, we recommend [Apache Tomcat](http://tomcat.apache.org). Tomcat provides load balancing, fault tolerance and other production features. Apache Tomcat is widely used with many organizations standardizing on Tomcat for all their Java Web Applications.
We highly recommend [Apache Tomcat](https://tomcat.apache.org). Apache Tomcat provides load balancing, fault tolerance and other production features. Apache Tomcat is widely used with many organizations as a standardized environment for all their Java Web Applications.

We recommend the following stable releases of Tomcat:

- Apache Tomcat 9.0
- Apache Tomcat 8.5

GeoNetwork cannot use the newer versions of Apache Tomcat 10 which are based on the Jakarata Enterprise Edition web application standard.

### Database

Regarding storage, you need a Database Management System (DBMS) like Oracle, MySQL, Postgresql etc. GeoNetwork comes with an embedded DBMS (H2) which is used by default during installation. This DBMS can be used for small or desktop installations of no more than a few thousand metadata records with one or two users. If you have heavier demands then you should use a professional, stand alone DBMS.
Expand All @@ -45,10 +49,10 @@ The software runs in different ways depending on the servlet container you are u
The following tools are required to be installed to setup a development environment for GeoNetwork:

- **Java 11** - Developing with GeoNetwork requires Java Development Kit (JDK) 11.
- **Maven** 3.1.0+ - GeoNetwork uses [Maven](http://maven.apache.org/) to manage the build process and the dependencies. Once is installed, you should have the mvn command in your path (on Windows systems, you have to open a shell to check).
- **Git** - GeoNetwork source code is stored and versioned in [a Git repository on Github](https://github.com/geonetwork/core-geonetwork). Depending on your operating system a variety of Git clients are available. Please check the Git website for some [alternatives](http://git-scm.com/downloads/guis) and good [documentation](http://git-scm.com/documentation). More documentation can be found on the [Github website](https://help.github.com/).
- **Ant** - GeoNetwork uses [Ant](http://ant.apache.org/) to build the installer. Version 1.6.5 works but any other recent version should be OK. Once installed, you should have the Ant command in your path (on Windows systems, you have to open a shell to check).
- **Sphinx** - To build the GeoNetwork documentation in a nice format, [Sphinx](https://www.sphinx-doc.org/) is used. Please note that if you don't have a Python interpreter on your system, Sphinx will not work, so you need to install [Python](https://www.python.org/downloads/).
- **Maven** 3.1.0+ - GeoNetwork uses [Maven](https://maven.apache.org/) to manage the build process and the dependencies. Once is installed, you should have the mvn command in your path (on Windows systems, you have to open a shell to check).
- **Git** - GeoNetwork source code is stored and versioned in [a Git repository on Github](https://github.com/geonetwork/core-geonetwork). Depending on your operating system a variety of Git clients are available. Please check the Git website for some [alternatives](https://git-scm.com/downloads/guis) and good [documentation](https://git-scm.com/documentation). More documentation can be found on the [Github website](https://help.github.com/).
- **Ant** - GeoNetwork uses [Ant](https://ant.apache.org/) to build the installer. Version 1.6.5 works but any other recent version should be OK. Once installed, you should have the Ant command in your path (on Windows systems, you have to open a shell to check).
- **mkdocs** - To build the GeoNetwork documentation in a nice format, [mkdocs](https://www.mkdocs.org) is used. Please note that if you don't have a Python interpreter on your system, Sphinx will not work, so you need to install [Python](https://www.python.org/downloads/).

## Building & Running

Expand Down Expand Up @@ -155,7 +159,7 @@ $ mvn install -o
$ mvn install -o -DskipTests -T 2C
```

Please refer to the [Maven documentation](http://www.sonatype.com/books/mvnref-book/reference/public-book.html) for any other options.
Please refer to the [Maven documentation](https://www.sonatype.com/books/mvnref-book/reference/public-book.html) for any other options.

### Run embedded Jetty server

Expand Down
Loading

0 comments on commit f4ee086

Please sign in to comment.