diff --git a/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java b/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
index ab467a227e..bd1e25bd8e 100644
--- a/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
+++ b/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
@@ -124,81 +124,6 @@ public void init(final String webappName, final Path webappDir, Path systemDataD
this.init(webappName, webappDir, handlerConfig, jeevesServlet);
}
-
- /**
- * This is the name of the RollingFileAppender in your log4j2.xml configuration file.
- *
- * LogConfig uses this name to lookup RollingFileAppender to check configuration in
- * case a custom log file location has been used.
- */
- private static final String FILE_APPENDER_NAME = "File";
-
- /**
- * Logfile location as determined from appender, or system property, or default.
- *
- * Note this code is duplicated with the deprecated {@code LogConfig}.
- *
- * @return logfile location, or {@code null} if unable to determine
- */
- public static File getLogfile() {
- // Appender is supplied by LogUtils based on parsing log4j2.xml file indicated
- // by database settings
-
- // First, try the fileappender from the logger named "geonetwork"
- Appender appender = Logger.getLogger(Geonet.GEONETWORK).getAppender(FILE_APPENDER_NAME);
- // If still not found, try the one from the logger named "jeeves"
- if (appender == null) {
- appender = Logger.getLogger(Log.JEEVES).getAppender(FILE_APPENDER_NAME);
- }
- if (appender != null) {
- if (appender instanceof AppenderWrapper) {
- AppenderWrapper wrapper = (AppenderWrapper) appender;
- org.apache.logging.log4j.core.Appender appender2 = wrapper.getAppender();
-
- if (appender2 instanceof FileAppender) {
- FileAppender fileAppender = (FileAppender) appender2;
- String logFileName = fileAppender.getFileName();
- if (logFileName != null) {
- File logFile = new File(logFileName);
- if (logFile.exists()) {
- return logFile;
- }
- }
- }
- if (appender2 instanceof RollingFileAppender) {
- RollingFileAppender fileAppender = (RollingFileAppender) appender2;
- String logFileName = fileAppender.getFileName();
- if (logFileName != null) {
- File logFile = new File(logFileName);
- if (logFile.exists()) {
- return logFile;
- }
- }
- }
- }
- }
- Log.warning(Geonet.GEONETWORK, "Error when getting logger file for the " + "appender named '" + FILE_APPENDER_NAME + "'. "
- + "Check your log configuration file. "
- + "A FileAppender or RollingFileAppender is required to return last activity to the user interface."
- + "Appender file not found.");
-
- if (System.getProperties().containsKey("log_dir")) {
- File logDir = new File(System.getProperty("log_dir"));
- if (logDir.exists() && logDir.isDirectory()) {
- File logFile = new File(logDir, "logs/geonetwork.log");
- if (logFile.exists()) {
- return logFile;
- }
- }
- } else {
- File logFile = new File("logs/geonetwork.log");
- if (logFile.exists()) {
- return logFile;
- }
- }
- return null; // unavailable
- }
-
/**
* Logfile location as determined from appender, or system property, or default.
*
diff --git a/core/src/main/resources/config-spring-geonetwork.xml b/core/src/main/resources/config-spring-geonetwork.xml
index cf67704efd..74bb752b8b 100644
--- a/core/src/main/resources/config-spring-geonetwork.xml
+++ b/core/src/main/resources/config-spring-geonetwork.xml
@@ -33,9 +33,15 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
">
+
+
+
diff --git a/csw-server/pom.xml b/csw-server/pom.xml
index ca717869c1..ae4c6bd4ab 100644
--- a/csw-server/pom.xml
+++ b/csw-server/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml
index ce640cbbb1..ddf7357a22 100644
--- a/docs/manual/pom.xml
+++ b/docs/manual/pom.xml
@@ -27,7 +27,7 @@
gn-docs
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-guide
diff --git a/docs/pom.xml b/docs/pom.xml
index 3d527915d4..2ad1acac5a 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-docs
diff --git a/doi/pom.xml b/doi/pom.xml
index c19a0cca04..1d198387e0 100644
--- a/doi/pom.xml
+++ b/doi/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/domain/pom.xml b/domain/pom.xml
index 883066f379..1f790cfa5a 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml
index 9f4bf056e8..360ecfb0c1 100644
--- a/es/es-dashboards/pom.xml
+++ b/es/es-dashboards/pom.xml
@@ -28,7 +28,7 @@
gn-es
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
diff --git a/es/pom.xml b/es/pom.xml
index 89235feaff..debb01bb8f 100644
--- a/es/pom.xml
+++ b/es/pom.xml
@@ -5,7 +5,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-es
diff --git a/estest/pom.xml b/estest/pom.xml
index e7c3c0db2b..e1b6eb02f0 100644
--- a/estest/pom.xml
+++ b/estest/pom.xml
@@ -5,7 +5,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/events/pom.xml b/events/pom.xml
index 2502562875..0679230674 100644
--- a/events/pom.xml
+++ b/events/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
GeoNetwork Events
diff --git a/georchestra-integration/externalized-accounts/pom.xml b/georchestra-integration/externalized-accounts/pom.xml
index 1d00c450c9..634f6f88d8 100644
--- a/georchestra-integration/externalized-accounts/pom.xml
+++ b/georchestra-integration/externalized-accounts/pom.xml
@@ -4,7 +4,7 @@
org.geonetwork-opensource
gn-georchestra-integration
- 4.2.2-georchestra
+ 4.2.6-georchestra
4.0.0
gn-externalized-accounts
diff --git a/georchestra-integration/georchestra-authnz/pom.xml b/georchestra-integration/georchestra-authnz/pom.xml
index 7b7bb2daae..7fee60216f 100644
--- a/georchestra-integration/georchestra-authnz/pom.xml
+++ b/georchestra-integration/georchestra-authnz/pom.xml
@@ -4,7 +4,7 @@
org.geonetwork-opensource
gn-georchestra-integration
- 4.2.2-georchestra
+ 4.2.6-georchestra
4.0.0
gn-georchestra-authnz
diff --git a/georchestra-integration/georchestra-utils/pom.xml b/georchestra-integration/georchestra-utils/pom.xml
index 3d5c3478be..1a61d9a9ef 100644
--- a/georchestra-integration/georchestra-utils/pom.xml
+++ b/georchestra-integration/georchestra-utils/pom.xml
@@ -4,7 +4,7 @@
org.geonetwork-opensource
gn-georchestra-integration
- 4.2.2-georchestra
+ 4.2.6-georchestra
4.0.0
gn-georchestra-utils
diff --git a/georchestra-integration/pom.xml b/georchestra-integration/pom.xml
index 84ab0ec5a9..7040365d4e 100644
--- a/georchestra-integration/pom.xml
+++ b/georchestra-integration/pom.xml
@@ -4,7 +4,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.2-georchestra
+ 4.2.6-georchestra
4.0.0
gn-georchestra-integration
diff --git a/harvesters/pom.xml b/harvesters/pom.xml
index eb1e237c22..5cde120101 100644
--- a/harvesters/pom.xml
+++ b/harvesters/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml
index 558c463e3b..70f731c104 100644
--- a/healthmonitor/pom.xml
+++ b/healthmonitor/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/index/pom.xml b/index/pom.xml
index 480d89bfab..77f6f20c03 100644
--- a/index/pom.xml
+++ b/index/pom.xml
@@ -5,7 +5,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-index
diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml
index aaebc6a311..86d71e449e 100644
--- a/inspire-atom/pom.xml
+++ b/inspire-atom/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/jmeter/pom.xml b/jmeter/pom.xml
index aa3255f49d..daf013d3aa 100644
--- a/jmeter/pom.xml
+++ b/jmeter/pom.xml
@@ -29,7 +29,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
diff --git a/listeners/pom.xml b/listeners/pom.xml
index 8a9a16633a..35f0dd9619 100644
--- a/listeners/pom.xml
+++ b/listeners/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
GeoNetwork Events
diff --git a/messaging/pom.xml b/messaging/pom.xml
index e02510e1c6..43aa2cfc15 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -5,7 +5,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml
index 4bbe540e6f..22bc7d065c 100644
--- a/oaipmh/pom.xml
+++ b/oaipmh/pom.xml
@@ -30,7 +30,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
diff --git a/pom.xml b/pom.xml
index 41250e02e7..c5f3e66afc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
org.geonetwork-opensource
geonetwork
pom
- 4.2.6-0
+ 4.2.6-georchestra
GeoNetwork opensource
GeoNetwork opensource is a standards based, Free and
Open Source catalog application to manage spatially referenced
@@ -229,10 +229,6 @@
org.apache.maven.plugins
maven-compiler-plugin
3.8.1
-
- 1.8
- 1.8
-
maven-assembly-plugin
@@ -1313,9 +1309,52 @@
messaging
estest
index
+ georchestra-integration
+
+ jdk11+
+
+ [11,)
+
+
+ 11
+
+
+
+
+ javax.annotation
+ javax.annotation-api
+ 1.3.2
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 11
+ 11
+ true
+ UTF-8
+
+ -proc:none
+ --add-exports
+ java.base/sun.net.ftp=ALL-UNNAMED
+
+
+
+
+
+
toolchain
@@ -1435,8 +1474,6 @@
geonetwork
WEB-INF/config.properties
- 1.8
- 1.8
@@ -1451,9 +1488,8 @@
GEONETWORK_DB_CONNECTION_PROPERTIES=
-->
- ${geonetwork.db.type:h2}
- ../config-db/${db.type}.xml
+ ../config-db/postgres-postgis.xml
#{systemEnvironment['GEONETWORK_DB_HOST']?:'localhost'}
#{systemEnvironment['GEONETWORK_DB_PORT']}
#{systemEnvironment['GEONETWORK_DB_NAME']?:'~/gn'}
diff --git a/release/pom.xml b/release/pom.xml
index e86119b442..0aea6f748f 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -7,7 +7,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
gn-release
diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml
index 2d6b4ae372..260091a7c0 100644
--- a/schemas-test/pom.xml
+++ b/schemas-test/pom.xml
@@ -27,7 +27,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
jar
diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml
index d4f1b1e928..33fab27553 100644
--- a/schemas/csw-record/pom.xml
+++ b/schemas/csw-record/pom.xml
@@ -5,7 +5,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-schema-csw-record
diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml
index d4dcc8881b..9ecd66368b 100644
--- a/schemas/dublin-core/pom.xml
+++ b/schemas/dublin-core/pom.xml
@@ -5,7 +5,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml
index a7e04a366d..f73336075e 100644
--- a/schemas/iso19110/pom.xml
+++ b/schemas/iso19110/pom.xml
@@ -28,7 +28,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml
index 738f9055ef..0b69652922 100644
--- a/schemas/iso19115-3.2018/pom.xml
+++ b/schemas/iso19115-3.2018/pom.xml
@@ -6,7 +6,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
index 69eada94e7..eb809268f0 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
@@ -3932,6 +3932,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/labels.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/labels.xml
index aab7c76f6f..93a58b8e20 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/labels.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/labels.xml
@@ -776,6 +776,31 @@
Bound feature attribute
+
+ Néant
+ Indique qu'un certain élément n'a pas de valeur ou que la valeur est inconnue.
+
+
+ Est infini
+
+
+ Cardinalité
+
+
+ Intervalle
+
+
+ Intervalle
+
+
+ Jointure
+
+
+ Bound association role
+
+
+ Bound feature attribute
+
Identifiant
@@ -6332,6 +6357,7 @@ la non-évaluation, dans le cadre de métadonnées INSPIRE
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml
index 1b743b725a..5eee3828e6 100644
--- a/schemas/iso19139/pom.xml
+++ b/schemas/iso19139/pom.xml
@@ -5,7 +5,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ara/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ara/labels.xml
index 1632751f0d..ddeb5951d1 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ara/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ara/labels.xml
@@ -2192,6 +2192,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml
index 459e5840c2..b41df24378 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml
@@ -1874,6 +1874,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Servei de catàleg per a la Web
OGC-KML Keyhole Markup Language
OGC-GML Llenguatge de Marcat Geogràfic
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/chi/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/chi/labels.xml
index 36286f7aad..4ed4f2aea1 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/chi/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/chi/labels.xml
@@ -2188,6 +2188,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/dut/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/dut/labels.xml
index 954cedfbc6..d6c5f64fd6 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/dut/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/dut/labels.xml
@@ -1836,6 +1836,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
index 8689ba9a9d..cee9fb1e04 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
@@ -2273,6 +2273,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/fin/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/fin/labels.xml
index 6a0ff45816..9464ca5bd8 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/fin/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/fin/labels.xml
@@ -2157,6 +2157,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml
index 70ff2fcc25..740be5173f 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml
@@ -4356,6 +4356,7 @@ la non-évaluation, dans le cadre de métadonnées INSPIRE
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ger/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ger/labels.xml
index 757110134d..9b6d3c1dd1 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ger/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ger/labels.xml
@@ -2583,6 +2583,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-WMS Web Map Service
OGC-WFS Web Feature Service
OGC-WCS Web Coverage Service
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ita/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ita/labels.xml
index d733bf74c9..a9692eff16 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ita/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ita/labels.xml
@@ -2040,6 +2040,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
index 0a1e267395..e40e55a3b9 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
@@ -1972,6 +1972,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/pol/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/pol/labels.xml
index 20857be4fe..975381cc8d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/pol/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/pol/labels.xml
@@ -1644,6 +1644,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/por/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/por/labels.xml
index efe5148e6e..3ab41c2967 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/por/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/por/labels.xml
@@ -2128,6 +2128,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/rus/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/rus/labels.xml
index 2444c124ce..2a85dd8028 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/rus/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/rus/labels.xml
@@ -2222,6 +2222,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/slo/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/slo/labels.xml
index a052770338..55d4f68292 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/slo/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/slo/labels.xml
@@ -1753,6 +1753,7 @@ presnosť / vertikálna -
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml
index 2410d002d4..c402682433 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml
@@ -1944,6 +1944,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Servicio de catálogo para la Web
OGC-KML Keyhole Markup Language
OGC-GML Lenguaje de Marcado Geográfico
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
index f17dccc644..cc08c25b4e 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
@@ -1784,6 +1784,7 @@
OGC API - Features
OGC API - Maps
OGC API - Records
+ OGC-3DTiles Dataset
OGC-CSW Catalogue Service for the Web
OGC-KML Keyhole Markup Language
OGC-GML Geography Markup Language
diff --git a/schemas/pom.xml b/schemas/pom.xml
index d47211d613..02195dd35e 100644
--- a/schemas/pom.xml
+++ b/schemas/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml
index 38692a4cc9..d1ffd2c0a9 100644
--- a/schemas/schema-core/pom.xml
+++ b/schemas/schema-core/pom.xml
@@ -28,7 +28,7 @@
gn-schemas
org.geonetwork-opensource.schemas
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/sde/pom.xml b/sde/pom.xml
index 4815086fb7..1a7c6d8dbe 100644
--- a/sde/pom.xml
+++ b/sde/pom.xml
@@ -30,7 +30,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
diff --git a/services/pom.xml b/services/pom.xml
index 10fa60e56a..0f2e77819f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -27,12 +27,13 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
gn-services
GeoNetwork services
+ 4.2.6-georchestra
diff --git a/services/src/main/resources/config-spring-geonetwork.xml b/services/src/main/resources/config-spring-geonetwork.xml
index e5baa797a3..d13736472d 100644
--- a/services/src/main/resources/config-spring-geonetwork.xml
+++ b/services/src/main/resources/config-spring-geonetwork.xml
@@ -30,9 +30,14 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+
diff --git a/slave/pom.xml b/slave/pom.xml
index 4c19221063..9b6ba891ca 100644
--- a/slave/pom.xml
+++ b/slave/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
GeoNetwork Slave
diff --git a/web-ui/pom.xml b/web-ui/pom.xml
index 26217d1bc6..ed0da4f910 100644
--- a/web-ui/pom.xml
+++ b/web-ui/pom.xml
@@ -30,13 +30,14 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
org.geonetwork-opensource
gn-web-ui
jar
GeoNetwork user interface module
+ 4.2.6-georchestra
diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js
index 8e628c7fc6..888176dabe 100644
--- a/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js
+++ b/web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js
@@ -79,7 +79,7 @@
return r.mimeType;
} else if (r.protocol && r.protocol.indexOf("WWW:DOWNLOAD:") >= 0) {
return r.protocol.replace("WWW:DOWNLOAD:", "");
- } else if (mainType.match(/W([MCF]|MT)S.*|ESRI:REST/) != null) {
+ } else if (mainType.match(/W([MCF]|MT)S.*|3DTILES|ESRI:REST/) != null) {
return mainType.replace("SERVICE", "");
} else if (mainType.match(/KML|GPX/) != null) {
return mainType;
@@ -126,6 +126,8 @@
var addWMSToMap =
gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;
+ var add3dTilesToMap =
+ gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;
var addEsriRestToMap =
gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;
@@ -279,6 +281,11 @@
label: "addToMap",
action: addWMTSToMap
},
+ "3DTILES": {
+ iconClass: "fa-globe",
+ label: "addToMap",
+ action: add3dTilesToMap
+ },
TMS: {
iconClass: "fa-globe",
label: "addToMap",
@@ -508,6 +515,8 @@
return "ESRI:REST";
} else if (protocolOrType.match(/wmts/i)) {
return "WMTS";
+ } else if (protocolOrType.match(/3dtiles/i)) {
+ return "3DTILES";
} else if (protocolOrType.match(/tms/i)) {
return "TMS";
} else if (protocolOrType.match(/wfs/i)) {
diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js
index 110f1bbae1..7cc4b586a4 100644
--- a/web-ui/src/main/resources/catalog/js/CatController.js
+++ b/web-ui/src/main/resources/catalog/js/CatController.js
@@ -116,6 +116,7 @@
fluidHeaderLayout: true,
showGNName: true,
isHeaderFixed: false,
+ isMenubarAccessible: true,
showPortalSwitcher: true,
topCustomMenu: [] // List of static pages identifiers to display
},
@@ -1310,6 +1311,7 @@
gnSearchSettings.mapProtocols = {
layers: [
"OGC:WMS",
+ "OGC:3DTILES",
"OGC:WMTS",
"OGC:WMS-1.1.1-http-get-map",
"OGC:WMS-1.3.0-http-get-map",
diff --git a/web-ui/src/main/resources/catalog/views/default/module.js b/web-ui/src/main/resources/catalog/views/default/module.js
index dd9c5fd448..43c3fefb52 100644
--- a/web-ui/src/main/resources/catalog/views/default/module.js
+++ b/web-ui/src/main/resources/catalog/views/default/module.js
@@ -360,6 +360,8 @@
? "wmts"
: link.protocol == "ESRI:REST" || link.protocol.startsWith("ESRI REST")
? "esrirest"
+ : link.protocol == "OGC:3DTILES"
+ ? "3dtiles"
: "wms",
url: $filter("gnLocalized")(link.url) || link.url
};
diff --git a/web/pom.xml b/web/pom.xml
index 3b2c7a925d..e564d5104b 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -30,7 +30,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra
@@ -407,6 +407,17 @@
${project.version}
+
+ ${project.groupId}
+ gn-georchestra-utils
+ ${project.version}
+
+
+ ${project.groupId}
+ gn-georchestra-authnz
+ ${project.version}
+
+
dlib
@@ -650,6 +661,7 @@
properties
true
true
+ true
false
false
false
@@ -660,7 +672,10 @@
^git.tags$
^git.branch$
^git.commit.id$
- ^git.commit.id.describe.*$
+ ^git.commit.id.abbrev$
+ ^git.closest.tag.name$
+ ^git.closest.tag.commit.count$
+ ^git.commit.id.describe.short$
^git.build.time$
@@ -745,7 +760,8 @@
META-INF/MANIFEST.MF
data/**
- doc/**
+ doc/en/**
+ doc/fr/**
images/logos/*
images/logos/statTmp
scripts/lib/**
@@ -1303,6 +1319,288 @@
+
+
+ debianPackage
+
+ yyyyMMddHHmmss
+
+
+ geonetwork
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+ generic
+ false
+ false
+
+
+ ${project.basedir}/../schemas
+
+ **/src/main/plugin/*
+
+ WEB-INF/data/config/schema_plugins
+
+
+ ${project.basedir}/../web-ui/src/main/resources
+
+
+ ${build.webapp.resources}
+
+
+
+ xml/schemas/**,
+ catalog/lib/style/bootstrap/docs/**,
+ 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/**
+
+ ${build.webapp.resources}/WEB-INF/web.xml
+
+
+
+ maven-resources-plugin
+ 2.5
+
+
+ copy-filter-webResource
+ process-resources
+
+ copy-resources
+
+
+ false
+ ${build.webapp.resources}
+
+
+ ${basedir}/src/main/webResources
+ true
+ ${build.webapp.resources}
+
+
+
+ ${basedir}/src/main/filters/${env}.properties
+
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-scm-plugin
+ 1.9.4
+
+ ${project.build.directory}/deb/etc/georchestra
+ scm:git:https://github.com/georchestra/datadir.git
+ false
+ 22.0
+ branch
+
+
+
+ checkout-deb-default-datadir
+ process-resources
+
+ checkout
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.7
+
+
+ remove-useless-directories
+ package
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+ fix-permissions
+ package
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+ set-project-packageversion
+ package
+
+ run
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ net.sf.debian-maven
+ debian-maven-plugin
+ 1.0.6
+
+ georchestra-geonetwork
+ Debian package for the GeoNetwork fork of geOrchestra.
+ ${project.packageVersion}
+ http://www.georchestra.org/
+ geOrchestra
+ PSC
+ psc@georchestra.org
+ true
+
+
+
+
+
+
+ docker
+
+ georchestra/${project.parent.artifactId}:${git.closest.tag.name}-dev
+ scm:git:https://github.com/georchestra/datadir.git
+ docker-master
+ scm:git:https://github.com/georchestra/geonetwork_minimal_datadir.git
+ gn4.2.2
+
+
+
+ geonetwork
+
+
+ org.apache.maven.plugins
+ maven-scm-plugin
+ 1.9.4
+
+
+ checkout-docker-default-datadir
+ process-resources
+
+ checkout
+
+
+ ${project.build.directory}/datadir/
+ ${dockerDatadirScmUrl}
+ false
+ ${dockerDatadirScmVersion}
+ branch
+
+
+
+ checkout-docker-gn-datadir
+ process-resources
+
+ checkout
+
+
+ ${project.build.directory}/gn_datadir/
+ ${dockerGnDatadirScmUrl}
+ false
+ ${dockerGnDatadirScmVersion}
+ branch
+
+
+
+
+
+ com.spotify
+ docker-maven-plugin
+ 0.3.8
+
+ ${dockerImageName}
+ ${project.basedir}/src/docker
+
+
+ /var/lib/jetty/webapps
+ ${project.build.directory}
+ geonetwork/**
+
+
+ /etc/georchestra
+ ${project.build.directory}/datadir
+ ${project.parent.artifactId}/**
+
+
+ /mnt/geonetwork_datadir
+ ${project.build.directory}/gn_datadir
+ .git**
+ true
+
+
+ docker-hub
+ https://index.docker.io/v1/
+
+
+
+ com.google.guava
+ guava
+ 19.0
+
+
+ javax.activation
+ activation
+ 1.1.1
+
+
+
+
+
+
+
+ log4j-logstash
+
+
+ net.logstash.log4j
+ jsonevent-layout
+ 1.7
+
+
+
+
+ sentry-log4j
+
+
+ io.sentry
+ sentry-log4j
+ 1.7.30
+
+
+
+
war
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 ed11d04102..813f8260bf 100644
--- a/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml
+++ b/web/src/main/webResources/WEB-INF/config-db/defaultJdbcDataSource.xml
@@ -30,12 +30,16 @@
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/webResources/WEB-INF/config-spring-geonetwork.xml b/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
index 312971aca7..ca43500104 100644
--- a/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
+++ b/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
@@ -32,9 +32,16 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+
+
+
@@ -45,6 +52,13 @@
+
+
+
+
+
+
+
diff --git a/web/src/main/webResources/WEB-INF/spring-servlet.xml b/web/src/main/webResources/WEB-INF/spring-servlet.xml
index 30d7b21e43..71d6a95e84 100644
--- a/web/src/main/webResources/WEB-INF/spring-servlet.xml
+++ b/web/src/main/webResources/WEB-INF/spring-servlet.xml
@@ -38,9 +38,14 @@
+
+
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 8a3bcf1ac0..59e3daa523 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
@@ -583,6 +583,7 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/port', '8080', 1, 230, 'n');
INSERT INTO settings (name, value, datatype, position, internal) VALUES ('system/server/log','log4j2.xml', 0, 250, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/timeZone', '', 0, 260, 'n');
+INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/sitemapLinkUrl', NULL, 0, 270, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/intranet/network', '127.0.0.1', 0, 310, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/intranet/netmask', '255.0.0.0', 0, 320, 'y');
@@ -625,7 +626,7 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/oai/tokentimeout', '3600', 1, 7020, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/oai/cachesize', '60', 1, 7030, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/oai/maxrecords', '10', 1, 7040, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/inspire/enable', 'false', 2, 7210, 'n');
+INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/inspire/enable', 'true', 2, 7210, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/inspire/atom', 'disabled', 0, 7230, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/inspire/atomSchedule', '0 0 0 * * ?', 0, 7240, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/inspire/atomProtocol', 'INSPIRE-ATOM', 0, 7250, 'y');
@@ -712,7 +713,7 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('metada
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('metadata/csvReport/csvName', 'metadata_{datetime}.csv', 0, 12607, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/ui/defaultView', 'default', 0, 10100, 'n');
+INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/ui/defaultView', 'georchestra', 0, 10100, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userSelfRegistration/recaptcha/enable', 'false', 2, 1910, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userSelfRegistration/recaptcha/publickey', '', 0, 1910, 'n');
@@ -771,3 +772,632 @@ INSERT INTO GUF_RatingCriteria (id, name, isinternal) VALUES (1, 'Discoverabilit
INSERT INTO GUF_RatingCriteria (id, name, isinternal) VALUES (2, 'Readability', 'n');
INSERT INTO GUF_RatingCriteria (id, name, isinternal) VALUES (3, 'DataQuality', 'n');
INSERT INTO GUF_RatingCriteria (id, name, isinternal) VALUES (4, 'ServiceQuality', 'n');
+
+-- ======================================================================
+-- === Table: Settings_ui
+-- ======================================================================
+
+INSERT INTO settings_ui VALUES ('srv', '{
+ "baseURLDetector": {
+ "default": "/geonetwork",
+ "regexp": "^((?:/.+)?)+/.+/[a-z]{2,3}/.+"
+ },
+ "langDetector": {
+ "default": "eng",
+ "fromHtmlTag": false,
+ "regexp": "^(?:/.+)?/.+/([a-z]{2,3})/.+"
+ },
+ "mods": {
+ "admin": {
+ "appUrl": "../../{{node}}/{{lang}}/admin.console",
+ "enabled": true,
+ "facetConfig": {
+ "availableInServices": {
+ "filters": {
+ "filters": {
+ "availableInDownloadService": {
+ "query_string": {
+ "query": "+linkProtocol:/OGC:WFS.*/"
+ }
+ },
+ "availableInViewService": {
+ "query_string": {
+ "query": "+linkProtocol:/OGC:WMS.*/"
+ }
+ }
+ }
+ }
+ },
+ "cl_hierarchyLevel.key": {
+ "meta": {
+ "vega": "arc"
+ },
+ "terms": {
+ "field": "cl_hierarchyLevel.key"
+ }
+ },
+ "tag.default": {
+ "meta": {
+ "vega": "arc"
+ },
+ "terms": {
+ "field": "tag.default",
+ "size": 10
+ }
+ }
+ }
+ },
+ "authentication": {
+ "enabled": false,
+ "signinUrl": "../../{{node}}/{{lang}}/catalog.signin",
+ "signoutUrl": "../../signout"
+ },
+ "cookieWarning": {
+ "cookieWarningMoreInfoLink": "",
+ "cookieWarningRejectLink": "",
+ "enabled": false
+ },
+ "editor": {
+ "allowRemoteRecordLink": true,
+ "appUrl": "../../{{node}}/{{lang}}/catalog.edit",
+ "createPageTpl": "../../catalog/templates/editor/new-metadata-horizontal.html",
+ "editorIndentType": "",
+ "enabled": true,
+ "facetConfig": {
+ "cl_status.key": {
+ "terms": {
+ "field": "cl_status.key",
+ "size": 15
+ }
+ },
+ "documentStandard": {
+ "terms": {
+ "field": "documentStandard",
+ "size": 10
+ }
+ },
+ "groupOwner": {
+ "terms": {
+ "field": "groupOwner",
+ "size": 10
+ }
+ },
+ "groupPublished": {
+ "terms": {
+ "field": "groupPublished",
+ "size": 10
+ }
+ },
+ "isHarvested": {
+ "terms": {
+ "field": "isHarvested",
+ "size": 2
+ }
+ },
+ "isPublishedToAll": {
+ "terms": {
+ "field": "isPublishedToAll",
+ "size": 2
+ }
+ },
+ "isTemplate": {
+ "terms": {
+ "field": "isTemplate",
+ "size": 5
+ }
+ },
+ "isValid": {
+ "terms": {
+ "field": "isValid",
+ "size": 10
+ }
+ },
+ "isValidInspire": {
+ "terms": {
+ "field": "isValidInspire",
+ "size": 10
+ }
+ },
+ "recordOwner": {
+ "terms": {
+ "field": "recordOwner",
+ "size": 10
+ }
+ },
+ "resourceType": {
+ "terms": {
+ "field": "resourceType",
+ "size": 20
+ }
+ },
+ "sourceCatalogue": {
+ "terms": {
+ "field": "sourceCatalogue",
+ "size": 15
+ }
+ }
+ },
+ "fluidEditorLayout": true,
+ "isFilterTagsDisplayed": false,
+ "isUserRecordsOnly": false,
+ "minUserProfileToCreateTemplate": ""
+ },
+ "footer": {
+ "enabled": false,
+ "showSocialBarInFooter": false
+ },
+ "geocoder": {
+ "appUrl": "https://secure.geonames.org/searchJSON",
+ "enabled": true
+ },
+ "global": {
+ "dateFormat": "DD-MM-YYYY HH:mm",
+ "humanizeDates": true,
+ "timezone": "Browser"
+ },
+ "header": {
+ "enabled": true,
+ "fluidHeaderLayout": true,
+ "isHeaderFixed": false,
+ "isLogoInHeader": false,
+ "languages": {
+ "cat": "ca",
+ "chi": "zh",
+ "cze": "cs",
+ "dut": "nl",
+ "eng": "en",
+ "fin": "fi",
+ "fre": "fr",
+ "ger": "de",
+ "ice": "is",
+ "ita": "it",
+ "kor": "ko",
+ "por": "pt",
+ "rus": "ru",
+ "slo": "sk",
+ "spa": "es",
+ "swe": "sv"
+ },
+ "logoInHeaderPosition": "left",
+ "showGNName": true
+ },
+ "home": {
+ "appUrl": "../../{{node}}/{{lang}}/catalog.search#/home",
+ "enabled": true,
+ "showMosaic": false,
+ "facetConfig": {
+ "cl_hierarchyLevel.key": {
+ "terms": {
+ "field": "cl_hierarchyLevel.key",
+ "size": 10
+ }
+ },
+ "cl_topic.key": {
+ "terms": {
+ "field": "cl_topic.key",
+ "size": 20
+ }
+ }
+ },
+ "fluidLayout": true,
+ "showSocialBarInFooter": false
+ },
+ "map": {
+ "appUrl": "../../{{node}}/{{lang}}/catalog.search#/map",
+ "autoFitOnLayer": false,
+ "bingKey": "",
+ "disabledTools": {
+ "addLayers": false,
+ "contexts": false,
+ "drawVector": false,
+ "filter": false,
+ "graticule": false,
+ "layers": false,
+ "legend": false,
+ "mInteraction": false,
+ "mousePosition": true,
+ "print": false,
+ "processes": false,
+ "projectionSwitcher": false,
+ "syncAllLayers": false
+ },
+ "enabled": true,
+ "externalViewer": {
+ "baseUrl": "/mapstore/",
+ "enabled": true,
+ "enabledViewAction": false,
+ "openNewWindow": false,
+ "urlTemplate": "/mapstore/#/?actions=[{\"type\":\"CATALOG:ADD_LAYERS_FROM_CATALOGS\",\"layers\":[\"${service.name}\"],\"sources\":[{\"type\":\"${service.type}\",\"url\":\"${service.url}\"}]}]",
+ "valuesSeparator": ","
+ },
+ "graticuleOgcService": {},
+ "is3DModeAllowed": false,
+ "isExportMapAsImageEnabled": false,
+ "isSaveMapInCatalogAllowed": true,
+ "listOfServices": {
+ "wms": [],
+ "wmts": []
+ },
+ "map-editor": {
+ "context": "",
+ "extent": [
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "layers": [
+ {
+ "type": "osm"
+ }
+ ]
+ },
+ "map-search": {
+ "context": "../../map/config-viewer.xml",
+ "extent": [
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "layers": []
+ },
+ "map-viewer": {
+ "context": "../../map/config-viewer.xml",
+ "extent": [
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "layers": []
+ },
+ "projection": "EPSG:3857",
+ "projectionList": [
+ {
+ "code": "urn:ogc:def:crs:EPSG:6.6:4326",
+ "label": "WGS84 (EPSG:4326)"
+ },
+ {
+ "code": "EPSG:3857",
+ "label": "Google mercator (EPSG:3857)"
+ }
+ ],
+ "storage": "sessionStorage",
+ "switcherProjectionList": [
+ {
+ "code": "EPSG:3857",
+ "label": "Google mercator (EPSG:3857)"
+ }
+ ]
+ },
+ "page": {
+ "appUrl": "../../{{node}}/{{lang}}/catalog.search#/page",
+ "enabled": true
+ },
+ "recordview": {
+ "enabled": true,
+ "isSocialbarEnabled": false
+ },
+ "search": {
+ "appUrl": "../../{{node}}/{{lang}}/catalog.search#/search",
+ "autocompleteConfig": {
+ "_source": [
+ "resourceTitleObject"
+ ],
+ "from": 0,
+ "query": {
+ "bool": {
+ "must": [
+ {
+ "multi_match": {
+ "fields": [
+ "resourceTitleObject.*",
+ "resourceAbstractObject.*",
+ "tag",
+ "resourceIdentifier"
+ ],
+ "query": "",
+ "type": "bool_prefix"
+ }
+ }
+ ]
+ }
+ },
+ "size": 20
+ },
+ "downloadFormatter": [
+ {
+ "class": "fa-file-zip-o",
+ "label": "exportMEF",
+ "url": "/formatters/zip?withRelated=false"
+ },
+ {
+ "class": "fa-file-pdf-o",
+ "label": "exportPDF",
+ "url": "/formatters/xsl-view?output=pdf&language=${lang}"
+ },
+ {
+ "class": "fa-file-code-o",
+ "label": "exportXML",
+ "url": "/formatters/xml"
+ }
+ ],
+ "enabled": true,
+ "exactMatchToggle": true,
+ "facetConfig": {
+ "OrgForResource": {
+ "meta": {
+ "caseInsensitiveInclude": true
+ },
+ "terms": {
+ "field": "OrgForResource",
+ "include": ".*",
+ "size": 15
+ }
+ },
+ "availableInServices": {
+ "filters": {
+ "filters": {
+ "availableInDownloadService": {
+ "query_string": {
+ "query": "+linkProtocol:/OGC:WFS.*/"
+ }
+ },
+ "availableInViewService": {
+ "query_string": {
+ "query": "+linkProtocol:/OGC:WMS.*/"
+ }
+ }
+ }
+ }
+ },
+ "cl_hierarchyLevel.key": {
+ "aggs": {
+ "format": {
+ "terms": {
+ "field": "format"
+ }
+ }
+ },
+ "terms": {
+ "field": "cl_hierarchyLevel.key"
+ }
+ },
+ "cl_maintenanceAndUpdateFrequency.key": {
+ "meta": {
+ "collapsed": true
+ },
+ "terms": {
+ "field": "cl_maintenanceAndUpdateFrequency.key",
+ "size": 10
+ }
+ },
+ "cl_spatialRepresentationType.key": {
+ "terms": {
+ "field": "cl_spatialRepresentationType.key",
+ "size": 10
+ }
+ },
+ "creationYearForResource": {
+ "histogram": {
+ "field": "creationYearForResource",
+ "interval": 5,
+ "keyed": true,
+ "min_doc_count": 1
+ },
+ "meta": {
+ "collapsed": true
+ }
+ },
+ "resolutionScaleDenominator": {
+ "histogram": {
+ "field": "resolutionScaleDenominator",
+ "interval": 10000,
+ "keyed": true,
+ "min_doc_count": 1
+ },
+ "meta": {
+ "collapsed": true
+ }
+ },
+ "tag.default": {
+ "meta": {
+ "caseInsensitiveInclude": true
+ },
+ "terms": {
+ "field": "tag.default",
+ "include": ".*",
+ "size": 10
+ }
+ },
+ "th_gemet_tree.default": {
+ "terms": {
+ "field": "th_gemet_tree.default",
+ "include": "[^^]+^?[^^]+",
+ "order": {
+ "_key": "asc"
+ },
+ "size": 100
+ }
+ },
+ "th_httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset_tree.default": {
+ "terms": {
+ "field": "th_httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset_tree.default",
+ "order": {
+ "_key": "asc"
+ },
+ "size": 100
+ }
+ },
+ "th_regions_tree.default": {
+ "terms": {
+ "field": "th_regions_tree.default",
+ "order": {
+ "_key": "asc"
+ },
+ "size": 100
+ }
+ }
+ },
+ "facetTabField": "",
+ "filters": null,
+ "formatter": {
+ "defaultUrl": "",
+ "list": [
+ {
+ "label": "defaultView",
+ "url": ""
+ },
+ {
+ "label": "full",
+ "url": "/formatters/xsl-view?root=div&view=advanced"
+ }
+ ]
+ },
+ "grid": {
+ "related": [
+ "parent",
+ "children",
+ "services",
+ "datasets"
+ ]
+ },
+ "hitsperpageValues": [
+ 30,
+ 60,
+ 120
+ ],
+ "isFilterTagsDisplayedInSearch": false,
+ "isVegaEnabled": true,
+ "linkTypes": {
+ "downloads": [
+ "DOWNLOAD"
+ ],
+ "layers": [
+ "OGC",
+ "ESRI:REST"
+ ],
+ "links": [
+ "LINK",
+ "kml"
+ ],
+ "maps": [
+ "ows"
+ ]
+ },
+ "moreLikeThisConfig": {
+ "more_like_this": {
+ "fields": [
+ "resourceTitleObject.default",
+ "resourceAbstractObject.default",
+ "tag.raw"
+ ],
+ "like": null,
+ "max_query_terms": 12,
+ "min_term_freq": 1
+ }
+ },
+ "paginationInfo": {
+ "hitsPerPage": 30
+ },
+ "queryBase": "any.${searchLang}:(${any}) OR any.common:(${any}) OR resourceTitleObject.${searchLang}:(${any})^2 OR resourceTitleObject.\\*:\"${any}\"^6",
+ "resultTemplate": "../../catalog/components/search/resultsview/partials/viewtemplates/grid.html",
+ "resultViewTpls": [
+ {
+ "icon": "fa-th",
+ "tooltip": "Grid",
+ "tplUrl": "../../catalog/components/search/resultsview/partials/viewtemplates/grid.html"
+ },
+ {
+ "icon": "fa-bars",
+ "tooltip": "List",
+ "tplUrl": "../../catalog/components/search/resultsview/partials/viewtemplates/list.html"
+ }
+ ],
+ "savedSelection": {
+ "enabled": false
+ },
+ "scoreConfig": {
+ "boost": "5",
+ "functions": [
+ {
+ "filter": {
+ "exists": {
+ "field": "parentUuid"
+ }
+ },
+ "weight": 0.3
+ },
+ {
+ "filter": {
+ "match": {
+ "cl_status.key": "obsolete"
+ }
+ },
+ "weight": 0.3
+ },
+ {
+ "gauss": {
+ "dateStamp": {
+ "decay": 0.5,
+ "offset": "90d",
+ "scale": "365d"
+ }
+ }
+ }
+ ],
+ "score_mode": "multiply"
+ },
+ "sortBy": "relevance",
+ "sortbyValues": [
+ {
+ "sortBy": "relevance",
+ "sortOrder": ""
+ },
+ {
+ "sortBy": "dateStamp",
+ "sortOrder": "desc"
+ },
+ {
+ "sortBy": "createDate",
+ "sortOrder": "desc"
+ },
+ {
+ "sortBy": "resourceTitleObject.default.keyword",
+ "sortOrder": ""
+ },
+ {
+ "sortBy": "rating",
+ "sortOrder": "desc"
+ },
+ {
+ "sortBy": "popularity",
+ "sortOrder": "desc"
+ }
+ ],
+ "usersearches": {
+ "displayFeaturedSearchesPanel": false,
+ "enabled": false,
+ "includePortals": true
+ }
+ },
+ "signin": {
+ "appUrl": "../../{{node}}/{{lang}}/catalog.signin",
+ "enabled": false
+ },
+ "signout": {
+ "appUrl": "../../signout"
+ }
+ },
+ "nodeDetector": {
+ "default": "srv",
+ "regexp": "^(?:/.+)?/(.+)/[a-z]{2,3}/.+"
+ },
+ "serviceDetector": {
+ "default": "catalog.search",
+ "regexp": "^(?:/.+)?/.+/[a-z]{2,3}/(.+)"
+ }
+}');
+
+
diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security.xml b/web/src/main/webapp/WEB-INF/config-security/config-security.xml
index 817d79df5e..c464a3b230 100644
--- a/web/src/main/webapp/WEB-INF/config-security/config-security.xml
+++ b/web/src/main/webapp/WEB-INF/config-security/config-security.xml
@@ -30,13 +30,6 @@
http://www.springframework.org/schema/context/spring-context.xsd"
xmlns="http://www.springframework.org/schema/beans">
-
-
-
@@ -64,4 +57,21 @@
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workers/camelPeriodicProducer/pom.xml b/workers/camelPeriodicProducer/pom.xml
index 4b5bd76543..1efe8da990 100644
--- a/workers/camelPeriodicProducer/pom.xml
+++ b/workers/camelPeriodicProducer/pom.xml
@@ -5,7 +5,7 @@
gn-workers
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/workers/pom.xml b/workers/pom.xml
index facf75c9ad..fd384a94a3 100644
--- a/workers/pom.xml
+++ b/workers/pom.xml
@@ -28,7 +28,7 @@
geonetwork
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml
index 52748f6ae3..ddde185f11 100644
--- a/workers/wfsfeature-harvester/pom.xml
+++ b/workers/wfsfeature-harvester/pom.xml
@@ -28,7 +28,7 @@
gn-workers
org.geonetwork-opensource
- 4.2.6-0
+ 4.2.6-georchestra
4.0.0
diff --git a/wro4j/pom.xml b/wro4j/pom.xml
index c9bdaf92db..ea96d62126 100644
--- a/wro4j/pom.xml
+++ b/wro4j/pom.xml
@@ -7,7 +7,7 @@
org.geonetwork-opensource
geonetwork
- 4.2.6-0
+ 4.2.6-georchestra