From 72e611b640ca1e90d4c7ee1c4c90848ca7167270 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Tue, 13 Dec 2022 17:53:05 +0100 Subject: [PATCH] Updated to 2022.02.02 (#43) --- MapStore2 | 2 +- backend/pom.xml | 12 - index.html | 6 - package.json | 5 +- pom.xml | 2 +- web/pom.xml | 421 +++++++----------- .../geostore-datasource-ovr.properties | 2 +- ...atcher-servlet.xml => configs-servlet.xml} | 25 +- .../webapp/WEB-INF/extensions-servlet.xml | 22 + .../webapp/WEB-INF/loadAssets-servlet.xml | 20 + web/src/main/webapp/WEB-INF/web.xml | 59 ++- 11 files changed, 255 insertions(+), 321 deletions(-) rename web/src/main/webapp/WEB-INF/{dispatcher-servlet.xml => configs-servlet.xml} (55%) create mode 100644 web/src/main/webapp/WEB-INF/extensions-servlet.xml create mode 100644 web/src/main/webapp/WEB-INF/loadAssets-servlet.xml diff --git a/MapStore2 b/MapStore2 index d645777..814ac15 160000 --- a/MapStore2 +++ b/MapStore2 @@ -1 +1 @@ -Subproject commit d64577718ad902b704e826e98c98b86429b2bb9e +Subproject commit 814ac1528efa37fd04b1b69eb5999d39d7a8f2c7 diff --git a/backend/pom.xml b/backend/pom.xml index 4e06fea..8b72096 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -16,18 +16,6 @@ - - - - - org.codehaus.jackson - jackson-mapper-asl - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind-version} - diff --git a/index.html b/index.html index fe5ffd4..3ebd992 100644 --- a/index.html +++ b/index.html @@ -83,13 +83,7 @@ } - - - - - -
diff --git a/package.json b/package.json index e0c70dc..ecce112 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,10 @@ "postinstall": "node MapStore2/utility/build/postInstall.js", "clean": "rimraf dist", "compile": "npm run clean && mkdirp ./dist && node --max_old_space_size=2048 ./node_modules/webpack/bin/webpack.js --config prod-webpack.config.js --env.production", - "start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .", + "fe:start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .", + "start": "concurrently -n frontend,backend -c green,blue \"npm:fe:start\" \"npm:be:start\"", + "be:start": "npm run be:build && mvn cargo:run -f ./web/pom.xml", + "be:build": "mvn clean install", "ext:startapp": "webpack serve --progress --color --port 8081 --hot --inline --content-base . --config build/extension/module.app.webpack.config.js", "ext:start": "webpack serve --progress --color --port 8082 --hot --inline --config build/extension/webpack.config.js", "ext:build": "rimraf ./dist && mkdirp ./dist && webpack --progress --color --config build/extension/prod-webpack.config.js", diff --git a/pom.xml b/pom.xml index 390ee53..8b8bc43 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ web - MapStore2/backend + MapStore2/java/services diff --git a/web/pom.xml b/web/pom.xml index 5c4953c..a61be9f 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -2,101 +2,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - it.geosolutions.MapStoreExtension - MapStoreExtension-root + it.geosolutions.mapstore + mapstore-root 1.0-SNAPSHOT - MapStoreExtension-web + mapstore-web war Template project to create MapStore extensions - WAR - undefined + UTF-8 - 7.0.86 + 8.5.69 + 8080 - it.geosolutions.mapstore - mapstore-backend - 1.0-SNAPSHOT + it.geosolutions.mapstore + mapstore-services + 1.4-SNAPSHOT + it.geosolutions.geostore geostore-webapp - 1.5-SNAPSHOT + 1.9.0 war runtime proxy http_proxy - 1.2-SNAPSHOT + 1.3.0 war runtime - - - org.geotools - gt-epsg-hsql - 8.6 - - - org.jyaml - jyaml - 1.3 - - - com.vividsolutions - jts - 1.8 - - - javax.media - jai_codec - 1.1.3 - - - org.apache.pdfbox - pdfbox - 1.6.0 - - - javax.media - jai_imageio - 1.1 - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.xmlgraphics - batik-transcoder - 1.7 - - - com.lowagie - itext - 2.1.5 - - - org.json - json - 20080701 - - - javax.media - jai_core - 1.1.3 - junit @@ -113,9 +59,9 @@ - javax.servlet - servlet-api - 2.5 + javax.servlet + javax.servlet-api + 3.0.1 @@ -123,10 +69,16 @@ ehcache-web 2.0.4 + + + commons-pool + commons-pool + 1.5.4 + - MapStoreExtension + mapstore maven-resources-plugin @@ -139,7 +91,7 @@ copy-resources - ${basedir}/target/MapStoreExtension + ${basedir}/target/mapstore UTF-8 @@ -159,7 +111,7 @@ copy-resources - ${basedir}/target/MapStoreExtension + ${basedir}/target/mapstore UTF-8 @@ -182,7 +134,7 @@ copy-resources - ${basedir}/target/MapStoreExtension + ${basedir}/target/mapstore UTF-8 @@ -199,19 +151,19 @@ - only api.html + only dashboard-embedded.html process-classes copy-resources - ${basedir}/target/MapStoreExtension + ${basedir}/target/__PROJECTNAME__ UTF-8 ${basedir}/../dist - api.html + dashboard-embedded.html MapStore2/* @@ -222,117 +174,125 @@ - html, configuration files and images + only geostory-embedded.html process-classes copy-resources - ${basedir}/target/MapStoreExtension + ${basedir}/target/__PROJECTNAME__ UTF-8 - ${basedir}/.. + ${basedir}/../dist - **/*.html - **/*.json - **/img/* - **/*.less + geostory-embedded.html - node_modules/* - node_modules/**/* MapStore2/* MapStore2/**/* - **/libs/Cesium/**/* - **/test-resources/* - js files + only api.html process-classes copy-resources - ${basedir}/target/MapStoreExtension/dist + ${basedir}/target/mapstore UTF-8 ${basedir}/../dist + + api.html + + + MapStore2/* + MapStore2/**/* + - CSS files + html, configuration files and images process-classes copy-resources - ${basedir}/target/MapStoreExtension/assets + ${basedir}/target/mapstore UTF-8 - ${basedir}/../assets + ${basedir}/.. + + **/*.html + **/*.json + **/img/* + **/*.less + + + node_modules/* + node_modules/**/* + MapStore2/* + MapStore2/**/* + **/libs/Cesium/**/* + **/test-resources/* + - translations + js files process-classes copy-resources - ${basedir}/target/MapStoreExtension/ + ${basedir}/target/mapstore/dist UTF-8 - ${basedir}/../ - - translations/* - + ${basedir}/../dist - - printing + + CSS files process-classes copy-resources - ${basedir}/target/MapStoreExtension/printing + ${basedir}/target/mapstore/assets UTF-8 - ${basedir}/../MapStore2/resources/geoserver/print - - * - + ${basedir}/../assets - translations-ms2 + translations process-classes copy-resources - ${basedir}/target/MapStoreExtension/MapStore2/web/client + ${basedir}/target/mapstore/ UTF-8 - ${basedir}/../MapStore2/web/client + ${basedir}/../ translations/* @@ -341,17 +301,20 @@ - CesiumJS-navigation + translations-ms2 process-classes copy-resources - ${basedir}/target/MapStoreExtension/MapStore2/web/client/libs/cesium-navigation + ${basedir}/target/mapstore/MapStore2/web/client UTF-8 - ${basedir}/../MapStore2/web/client/libs/cesium-navigation + ${basedir}/../MapStore2/web/client + + translations/* + @@ -363,7 +326,7 @@ copy-resources - ${basedir}/target/MapStoreExtension/MapStore2/web/client + ${basedir}/target/mapstore/MapStore2/web/client UTF-8 @@ -386,8 +349,10 @@ WEB-INF/lib/commons-codec-1.2.jar, WEB-INF/lib/commons-io-1.1.jar, WEB-INF/lib/commons-logging-1.0.4.jar, - WEB-INF/lib/commons-pool-1.3.jar, - WEB-INF/lib/spring-*-3.1.0*.jar + WEB-INF/lib/commons-pool-1.3.jar, + WEB-INF/lib/slf4j-api-1.5*.jar, + WEB-INF/lib/slf4j-log4j12-1.5*.jar, + WEB-INF/lib/spring-tx-5.2.15*.jar @@ -402,150 +367,99 @@ - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 + org.codehaus.cargo + cargo-maven3-plugin - /MapStoreExtension - 8080 + + tomcat8x + + https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip + + + + standalone + + ${project.build.directory}/apache-tomcat-${tomcat.version} + + + ${tomcat.port} + low + + + + + ${project.groupId} + ${project.artifactId} + war + + /mapstore + + + - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat - tomcat-util - ${tomcat.version} - - - org.apache.tomcat - tomcat-coyote - ${tomcat.version} - - - org.apache.tomcat - tomcat-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-jdbc - ${tomcat.version} - - - org.apache.tomcat - tomcat-dbcp - ${tomcat.version} - - - org.apache.tomcat - tomcat-servlet-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-jsp-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-jasper - ${tomcat.version} - - - org.apache.tomcat - tomcat-jasper-el - ${tomcat.version} - - - org.apache.tomcat - tomcat-el-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-catalina - ${tomcat.version} - - - org.apache.tomcat - tomcat-tribes - ${tomcat.version} - - - org.apache.tomcat - tomcat-catalina-ha - ${tomcat.version} - - - org.apache.tomcat - tomcat-annotations-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-juli - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-logging-log4j - ${tomcat.version} - - + + dev-custom-port + + + env.MAPSTORE_BACKEND_PORT + + + + + ${env.MAPSTORE_BACKEND_PORT} + + printing false - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 - - - rename-context - prepare-package - - copy - - - true - src/printing/applicationContext-print.xml - target/MapStoreExtension/WEB-INF/classes/applicationContext-print.xml - - - - - - + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.mapfish.print print-lib - geosolutions-2.0-SNAPSHOT - - - org.mapfish.geo - mapfish-geo-lib - 1.2.0 + geosolutions-2.1.0 + + + commons-codec + commons-codec + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework + spring-web + + + org.springframework + spring-context + + @@ -562,32 +476,11 @@ - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - false - - - - - - jboss-repo - JBoss Maven2 Repository - http://repository.jboss.com/maven2 - - false - - - spring-release Spring Portfolio Release Repository - http://maven.springframework.org/release + https://maven.springframework.org/release false @@ -595,7 +488,7 @@ spring-external Spring Portfolio External Repository - http://maven.springframework.org/external + https://maven.springframework.org/external false diff --git a/web/src/main/resources/geostore-datasource-ovr.properties b/web/src/main/resources/geostore-datasource-ovr.properties index 5491436..11125f8 100644 --- a/web/src/main/resources/geostore-datasource-ovr.properties +++ b/web/src/main/resources/geostore-datasource-ovr.properties @@ -1,2 +1,2 @@ -geostoreDataSource.url=jdbc:h2:./webapps/MapStoreExtension/geostore +geostoreDataSource.url=jdbc:h2:./webapps/mapstore/geostore geostoreEntityManagerFactory.jpaPropertyMap[hibernate.hbm2ddl.auto]=update diff --git a/web/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/web/src/main/webapp/WEB-INF/configs-servlet.xml similarity index 55% rename from web/src/main/webapp/WEB-INF/dispatcher-servlet.xml rename to web/src/main/webapp/WEB-INF/configs-servlet.xml index 5e5bebc..9eddc99 100644 --- a/web/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/web/src/main/webapp/WEB-INF/configs-servlet.xml @@ -1,13 +1,12 @@ - - - - \ No newline at end of file + + + + + + diff --git a/web/src/main/webapp/WEB-INF/extensions-servlet.xml b/web/src/main/webapp/WEB-INF/extensions-servlet.xml new file mode 100644 index 0000000..206c71b --- /dev/null +++ b/web/src/main/webapp/WEB-INF/extensions-servlet.xml @@ -0,0 +1,22 @@ + + + + + + + + + + diff --git a/web/src/main/webapp/WEB-INF/loadAssets-servlet.xml b/web/src/main/webapp/WEB-INF/loadAssets-servlet.xml new file mode 100644 index 0000000..28d407b --- /dev/null +++ b/web/src/main/webapp/WEB-INF/loadAssets-servlet.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/web/src/main/webapp/WEB-INF/web.xml b/web/src/main/webapp/WEB-INF/web.xml index c2da1e2..4ea227f 100644 --- a/web/src/main/webapp/WEB-INF/web.xml +++ b/web/src/main/webapp/WEB-INF/web.xml @@ -19,23 +19,30 @@ proxyPropPath - /proxy.properties + /proxy.properties,${datadir.location}/proxy.properties - - - org.springframework.web.util.Log4jConfigListener - + - + org.springframework.web.context.ContextLoaderListener + + springRequestContextFilter + org.springframework.web.filter.RequestContextFilter + + + springRequestContextFilter + /* + + springSecurityFilterChain @@ -66,14 +73,35 @@ - dispatcher + loadAssets org.springframework.web.servlet.DispatcherServlet 1 - dispatcher + loadAssets /rest/config/* + + + configs + org.springframework.web.servlet.DispatcherServlet + 2 + + + configs + /configs/* + + + + extensions + org.springframework.web.servlet.DispatcherServlet + 3 + + + extensions + /extensions/* + + @@ -96,21 +124,6 @@ HttpProxy /proxy/* - - - - mapfish.print - org.mapfish.print.servlet.MapPrinterServlet - - config - printing/config.yaml - - - - mapfish.print - /pdf/* - - index.html