Align project with MapStore2 master

Dockerfile

@@ -1,9 +1,9 @@
-FROM tomcat:8.5-jdk8-openjdk
+FROM tomcat:10.1-jdk17
 MAINTAINER geosolutions<info@geo-solutions.it>
 
 # Tomcat specific options
 ENV CATALINA_BASE "$CATALINA_HOME"
-ENV JAVA_OPTS="${JAVA_OPTS}  -Xms512m -Xmx512m -XX:MaxPermSize=128m"
+ENV JAVA_OPTS="${JAVA_OPTS}  -Xms512m -Xmx512m"
 
 # Optionally remove Tomcat manager, docs, and examples
 ARG TOMCAT_EXTRAS=false

README.md

@@ -16,7 +16,7 @@ Clone the repository with the --recursive option to automatically clone submodul
 
 `git clone --recursive https://github.com/geosolutions-it/MapStoreExtension`
 
-Install NodeJS >= 12.16.1 , if needed, from [here](https://nodejs.org/en/download/releases/).
+Install NodeJS >= 20 and Java 17 (for the backend), if needed. NodeJS is available [here](https://nodejs.org/en/download/releases/).
 
 You can start the development application locally:
 

build/extension/module.app.webpack.config.js

@@ -5,21 +5,23 @@ const webpackConfig = require("../../webpack.config");
 const { name } = require('../../config');
 
 // emulate the extension root directory
-webpackConfig.devServer.proxy["/extensions/"] = {
-    target: "http://localhost:8082"
-};
+webpackConfig.devServer.proxy = [
+    {
+        context: ["/extensions/"],
+        target: "http://localhost:8082"
+    },
+    ...webpackConfig.devServer.proxy
+];
 // emulate the extensions.json
-
-// before option has changed in the v4 of webpack-dev-server,
-// see https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md
-webpackConfig.devServer.before = function(app) {
-    app.get("/extensions/extensions.json", function(req, res) {
+webpackConfig.devServer.setupMiddlewares = (middlewares, devServer) => {
+    devServer.app.get("/extensions/extensions.json", (req, res) => {
         res.json({
             [name]: {
                 "bundle": "index.js",
                 "translations": "translations"
             }
         });
     });
+    return middlewares;
 };
 module.exports = webpackConfig;

build/extension/webpack.config.js

@@ -10,9 +10,11 @@ const webpackConfig = createExtensionWebpackConfig({
     overrides: {
         // serve translations (and index.json)
         devServer: {
-            publicPath: "/extensions/",
-            contentBase: './assets',
-            contentBasePublicPath: '/extensions/'
+            devMiddleware: { publicPath: "/extensions/" },
+            static: {
+                directory: './assets',
+                publicPath: '/extensions/'
+            }
         }
     }
 });

configs/config.json

@@ -1,20 +1,38 @@
 {
+  "version": 2,
   "map": {
     "projection": "EPSG:900913",
     "units": "m",
-    "center": {"x": 1250000.000000, "y": 5370000.000000, "crs": "EPSG:900913"},
-    "zoom":5,
-    "maxExtent": [
-      -20037508.34, -20037508.34,
-      20037508.34, 20037508.34
-    ],
-    "layers": [{
-      "type": "osm",
-      "title": "Open Street Map",
-      "name": "mapnik",
-            "source": "osm",
-      "group": "background",
-            "visibility": true
-        }]
+    "center": {
+      "x": 1250000.0,
+      "y": 5370000.0,
+      "crs": "EPSG:900913"
+    },
+    "zoom": 5,
+    "maxExtent": [-20037508.34, -20037508.34, 20037508.34, 20037508.34],
+    "layers": [
+      {
+        "format": "image/jpeg",
+        "group": "background",
+        "name": "osm:osm",
+        "opacity": 1,
+        "title": "OSM Bright",
+        "thumbURL": "product/assets/img/osm-bright.jpg",
+        "type": "wms",
+        "url": [
+          "https://maps1.geosolutionsgroup.com/geoserver/wms",
+          "https://maps2.geosolutionsgroup.com/geoserver/wms",
+          "https://maps3.geosolutionsgroup.com/geoserver/wms",
+          "https://maps4.geosolutionsgroup.com/geoserver/wms",
+          "https://maps5.geosolutionsgroup.com/geoserver/wms",
+          "https://maps6.geosolutionsgroup.com/geoserver/wms"
+        ],
+        "visibility": true,
+        "singleTile": false,
+        "credits": {
+          "title": "OSM Bright | Rendering <a href=\"https://www.geo-solutions.it/\">GeoSolutions</a> | Data © <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> contributors, <a href=\"http://www.openstreetmap.org/copyright\">ODbL</a>"
+        }
+      }
+    ]
   }
 }