From dff6b8caaf504502b1ce8662b1072372e632cbb8 Mon Sep 17 00:00:00 2001
From: Marc Guillemot <mguillemot@yahoo.fr>
Date: Fri, 9 Feb 2024 17:20:30 +0100
Subject: [PATCH] XPLANBOX-XPLANBOX-2689 code drop:
d24aa092c03544de02a4d9ae3b3493b5f7bdb9a5
---
CHANGELOG.md | 7 +++++
pom.xml | 4 +--
xplan-api/pom.xml | 2 +-
xplan-api/xplan-api-commons/pom.xml | 2 +-
xplan-api/xplan-api-dokumente/pom.xml | 2 +-
.../xplanbox/api/dokumente/SpringBootApp.java | 14 ++++++++-
xplan-api/xplan-api-manager/pom.xml | 2 +-
.../xplanbox/api/manager/SpringBootApp.java | 14 ++++++++-
xplan-api/xplan-api-validator/pom.xml | 2 +-
.../xplanbox/api/validator/SpringBootApp.java | 18 ++++++++++--
xplan-cli/pom.xml | 2 +-
xplan-cli/xplan-cli-docker/pom.xml | 2 +-
.../pom.xml | 2 +-
xplan-cli/xplan-manager-cli/pom.xml | 2 +-
xplan-cli/xplan-transform-cli/pom.xml | 2 +-
xplan-cli/xplan-update-data-cli/pom.xml | 2 +-
xplan-cli/xplan-validatedb-cli/pom.xml | 2 +-
xplan-cli/xplan-validator-cli/pom.xml | 2 +-
xplan-configuration/pom.xml | 2 +-
.../xplan-dokumenten-config/pom.xml | 2 +-
.../xplan-manager-config/pom.xml | 2 +-
.../xplan-mapproxy-config/pom.xml | 2 +-
.../xplan-mapserver-config/pom.xml | 2 +-
.../xplan-validator-config/pom.xml | 2 +-
xplan-core/pom.xml | 2 +-
xplan-core/xplan-commons-cli/pom.xml | 2 +-
xplan-core/xplan-commons/pom.xml | 2 +-
xplan-core/xplan-core-job/pom.xml | 2 +-
xplan-core/xplan-core-manager-db/pom.xml | 2 +-
xplan-core/xplan-core-manager-deegree/pom.xml | 2 +-
.../xplan-inspireplu-transformation/pom.xml | 2 +-
xplan-core/xplan-manager-core/pom.xml | 4 +--
.../manager/edit/XPlanToEditFactory.java | 9 +++++-
.../manager/edit/xplan54/BPlan002_5-4.gml | 1 +
xplan-core/xplan-synthesizer/pom.xml | 2 +-
xplan-core/xplan-validator-core/pom.xml | 2 +-
.../OptimisedFlaechenschlussInspector.java | 8 +++--
xplan-distribution/pom.xml | 2 +-
xplan-docker/pom.xml | 2 +-
xplan-docker/xplan-docker-mapproxy/pom.xml | 2 +-
xplan-docker/xplan-docker-mapserver/pom.xml | 2 +-
xplan-docker/xplan-docker-tomcat-gdal/pom.xml | 2 +-
xplan-docker/xplan-docker-tomcat/pom.xml | 2 +-
xplan-docker/xplan-docker-volume-init/pom.xml | 2 +-
xplan-documentation/pom.xml | 2 +-
.../xplan-benutzerhandbuch/pom.xml | 2 +-
.../src/main/asciidoc/aenderungsHistorie.adoc | 8 +++++
.../xplan-betriebshandbuch/pom.xml | 2 +-
.../src/main/asciidoc/aktualisierung.adoc | 15 ++++++++++
xplan-resources/pom.xml | 2 +-
.../xplan-database-scripts/pom.xml | 2 +-
xplan-resources/xplan-schemas/pom.xml | 2 +-
xplan-resources/xplan-sql-scripts/pom.xml | 2 +-
xplan-security/pom.xml | 2 +-
xplan-tests/pom.xml | 2 +-
xplan-tests/xplan-tests-manual/pom.xml | 2 +-
xplan-tests/xplan-tests-resources/pom.xml | 2 +-
xplan-tests/xplan-tests-soapui/pom.xml | 2 +-
.../xplan-api-manager/plans/BP_6.0.gml | 1 +
xplan-webapps/pom.xml | 2 +-
xplan-webapps/xplan-commons-web/pom.xml | 2 +-
xplan-webapps/xplan-manager-web/Dockerfile | 12 ++++----
.../xplan-manager-web/DockerfileHale | 29 +++++++++++++++----
xplan-webapps/xplan-manager-web/pom.xml | 2 +-
xplan-webapps/xplan-root/pom.xml | 2 +-
.../xplan-validator-web-commons/pom.xml | 2 +-
xplan-webapps/xplan-validator-web/pom.xml | 2 +-
xplan-webservices/pom.xml | 2 +-
.../xplan-commons-webservices/pom.xml | 2 +-
xplan-webservices/xplan-inspireplu/pom.xml | 2 +-
.../xplan-services-docker/pom.xml | 2 +-
xplan-webservices/xplan-validator-wms/pom.xml | 2 +-
xplan-webservices/xplan-wfs/pom.xml | 2 +-
xplan-webservices/xplan-wms/pom.xml | 2 +-
xplan-webservices/xplansyn-wfs/pom.xml | 2 +-
xplan-workspaces/pom.xml | 2 +-
76 files changed, 182 insertions(+), 86 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e3d3869e..cf5d9a1d39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
Alle nennenswerten Änderungen an diesem Projekt werden in dieser Datei dokumentiert.
+## Version 7.1.1 (2024-02-09)
+
+### Fehlerbehebungen
+- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
+- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
+- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+
## Version 7.1 (2023-12-13)
### Erweiterungen
diff --git a/pom.xml b/pom.xml
index 3bae9576de..75382e2487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
<packaging>pom</packaging>
- <version>7.1</version>
+ <version>7.1.1</version>
<name>xPlanBox</name>
<description>Software zur Verwaltung von XPlanGML Daten</description>
<inceptionYear>2008</inceptionYear>
@@ -1566,7 +1566,7 @@
<connection>scm:git:git@bitbucket.org:latlon/xplanbox.git</connection>
<developerConnection>scm:git:git@bitbucket.org:latlon/xplanbox.git</developerConnection>
<url>https://bitbucket.org/latlon/xplanbox</url>
- <tag>xplanbox-7.1</tag>
+ <tag>xplanbox-7.1.1</tag>
</scm>
<repositories>
diff --git a/xplan-api/pom.xml b/xplan-api/pom.xml
index c7039d96fe..35756cacb8 100644
--- a/xplan-api/pom.xml
+++ b/xplan-api/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-api/xplan-api-commons/pom.xml b/xplan-api/xplan-api-commons/pom.xml
index d08f817c48..cceaaad3a6 100644
--- a/xplan-api/xplan-api-commons/pom.xml
+++ b/xplan-api/xplan-api-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml
index 72ead1aeba..8399c38f91 100755
--- a/xplan-api/xplan-api-dokumente/pom.xml
+++ b/xplan-api/xplan-api-dokumente/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
index 6321535e03..58956b22a6 100644
--- a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
@@ -22,14 +22,26 @@ package de.latlon.xplanbox.api.dokumente;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.dokumente.config" })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-api/xplan-api-manager/pom.xml
index 74fc29194c..8fbdac5221 100644
--- a/xplan-api/xplan-api-manager/pom.xml
+++ b/xplan-api/xplan-api-manager/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
index d817847a57..7fd9ee65ca 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
@@ -26,16 +26,28 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.manager.config" })
@EnableAutoConfiguration(
exclude = { QuartzAutoConfiguration.class, LiquibaseAutoConfiguration.class, SecurityAutoConfiguration.class })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-api/xplan-api-validator/pom.xml
index f4ead0858b..644154aabb 100755
--- a/xplan-api/xplan-api-validator/pom.xml
+++ b/xplan-api/xplan-api-validator/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
index efb3215d53..ce190ab55e 100644
--- a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
+++ b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
@@ -8,12 +8,12 @@
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
@@ -24,15 +24,27 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.validator.config" })
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-cli/pom.xml b/xplan-cli/pom.xml
index 4e9c25d3aa..38047f12e1 100644
--- a/xplan-cli/pom.xml
+++ b/xplan-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-cli/xplan-cli-docker/pom.xml b/xplan-cli/xplan-cli-docker/pom.xml
index bbd9186a0d..f686cb64b3 100644
--- a/xplan-cli/xplan-cli-docker/pom.xml
+++ b/xplan-cli/xplan-cli-docker/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
index 4ff5be0725..8f8d40c093 100644
--- a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
+++ b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml
index d6a3971978..21ebf8fd75 100644
--- a/xplan-cli/xplan-manager-cli/pom.xml
+++ b/xplan-cli/xplan-manager-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml
index 7302087cd7..45e79dccd7 100644
--- a/xplan-cli/xplan-transform-cli/pom.xml
+++ b/xplan-cli/xplan-transform-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml
index 1a879a914b..38b5f73c8e 100644
--- a/xplan-cli/xplan-update-data-cli/pom.xml
+++ b/xplan-cli/xplan-update-data-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml
index 3ef7440cb9..760223ad18 100644
--- a/xplan-cli/xplan-validatedb-cli/pom.xml
+++ b/xplan-cli/xplan-validatedb-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml
index 682ba29d3a..00b608495f 100644
--- a/xplan-cli/xplan-validator-cli/pom.xml
+++ b/xplan-cli/xplan-validator-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-configuration/pom.xml b/xplan-configuration/pom.xml
index 0871c8d249..865068173e 100644
--- a/xplan-configuration/pom.xml
+++ b/xplan-configuration/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-configuration/xplan-dokumenten-config/pom.xml b/xplan-configuration/xplan-dokumenten-config/pom.xml
index 290e37e97e..22339ed162 100644
--- a/xplan-configuration/xplan-dokumenten-config/pom.xml
+++ b/xplan-configuration/xplan-dokumenten-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-manager-config/pom.xml b/xplan-configuration/xplan-manager-config/pom.xml
index 58376a77a3..daa2a8d19b 100644
--- a/xplan-configuration/xplan-manager-config/pom.xml
+++ b/xplan-configuration/xplan-manager-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapproxy-config/pom.xml b/xplan-configuration/xplan-mapproxy-config/pom.xml
index 802aad4c8d..5da06bd336 100644
--- a/xplan-configuration/xplan-mapproxy-config/pom.xml
+++ b/xplan-configuration/xplan-mapproxy-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapserver-config/pom.xml b/xplan-configuration/xplan-mapserver-config/pom.xml
index 9821f5a5d3..a92b95308b 100644
--- a/xplan-configuration/xplan-mapserver-config/pom.xml
+++ b/xplan-configuration/xplan-mapserver-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-validator-config/pom.xml b/xplan-configuration/xplan-validator-config/pom.xml
index 270cfeb07d..e555993f4d 100644
--- a/xplan-configuration/xplan-validator-config/pom.xml
+++ b/xplan-configuration/xplan-validator-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/pom.xml b/xplan-core/pom.xml
index 2a231e850e..1ac4feb855 100644
--- a/xplan-core/pom.xml
+++ b/xplan-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-core/xplan-commons-cli/pom.xml
index c1d1e6edc7..580c1903bb 100644
--- a/xplan-core/xplan-commons-cli/pom.xml
+++ b/xplan-core/xplan-commons-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-commons/pom.xml
index ff5ec24c41..fb14321ee0 100644
--- a/xplan-core/xplan-commons/pom.xml
+++ b/xplan-core/xplan-commons/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml
index dd78f05f23..141f769982 100644
--- a/xplan-core/xplan-core-job/pom.xml
+++ b/xplan-core/xplan-core-job/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<artifactId>xplan-core-job</artifactId>
diff --git a/xplan-core/xplan-core-manager-db/pom.xml b/xplan-core/xplan-core-manager-db/pom.xml
index 9624471241..f2aa2326ed 100644
--- a/xplan-core/xplan-core-manager-db/pom.xml
+++ b/xplan-core/xplan-core-manager-db/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-core-manager-deegree/pom.xml b/xplan-core/xplan-core-manager-deegree/pom.xml
index 589b68eb5c..043bb2972a 100644
--- a/xplan-core/xplan-core-manager-deegree/pom.xml
+++ b/xplan-core/xplan-core-manager-deegree/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-inspireplu-transformation/pom.xml
index 93b5e7d824..4cbc54d896 100644
--- a/xplan-core/xplan-inspireplu-transformation/pom.xml
+++ b/xplan-core/xplan-inspireplu-transformation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-manager-core/pom.xml
index 0cb5b22f7a..d99779bcd1 100644
--- a/xplan-core/xplan-manager-core/pom.xml
+++ b/xplan-core/xplan-manager-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
@@ -181,7 +181,7 @@
<dependency>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core-manager-deegree</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
index 08481ddfe5..415ab0fe4f 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
@@ -156,7 +156,14 @@ public class XPlanToEditFactory {
baseData.setPlanTypeCode(asInteger(propertyValue));
}
else if ("sonstPlanArt".equals(propertyName)) {
- baseData.setOtherPlanTypeCode(asInteger(propertyValue));
+ try {
+ int sonstPlanArtValue = Integer.parseInt(propertyValue.toString());
+ baseData.setOtherPlanTypeCode(sonstPlanArtValue);
+ }
+ catch (NumberFormatException e) {
+ LOG.warn("sonstPlanArt is not an integer value. Currently only integer values are supported.");
+ baseData.setOtherPlanTypeCode(-1);
+ }
}
else if ("verfahren".equals(propertyName)) {
baseData.setMethodCode(asInteger(propertyValue));
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml b/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
index c117b98215..fa8a450ae9 100644
--- a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
+++ b/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
@@ -59,6 +59,7 @@
</xplan:XP_Gemeinde>
</xplan:gemeinde>
<xplan:planArt>1000</xplan:planArt>
+ <xplan:sonstPlanArt codeSpace="https://registry.gdi-de.org/codelist/de.xleitstelle.xplanung/BP_SonstPlanArt" >9999_4</xplan:sonstPlanArt>
<xplan:verfahren>1000</xplan:verfahren>
<xplan:rechtsstand>3000</xplan:rechtsstand>
<xplan:veraenderungssperre>false</xplan:veraenderungssperre>
diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-synthesizer/pom.xml
index 7a0fb2be1e..2b7b3e7f04 100644
--- a/xplan-core/xplan-synthesizer/pom.xml
+++ b/xplan-core/xplan-synthesizer/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-validator-core/pom.xml
index 3220e09bf5..b8cf1f82e6 100644
--- a/xplan-core/xplan-validator-core/pom.xml
+++ b/xplan-core/xplan-validator-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
index f96d475055..85263ee811 100644
--- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
+++ b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
@@ -76,7 +76,6 @@ import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -554,8 +553,11 @@ public class OptimisedFlaechenschlussInspector implements GeometricFeatureInspec
}
else if (geltungsbereichFeature instanceof PlanFeature) {
FeaturesUnderTest planFeaturesUnderTest = new FeaturesUnderTest(flaechenschlussUnion, featuresUnderTest);
- planFeaturesWithFeaturesUnderTest.put((PlanFeature) geltungsbereichFeature,
- Collections.singletonList(planFeaturesUnderTest));
+ PlanFeature planFeature = (PlanFeature) geltungsbereichFeature;
+ if (!planFeaturesWithFeaturesUnderTest.containsKey(planFeature)) {
+ planFeaturesWithFeaturesUnderTest.put(planFeature, new ArrayList<>());
+ }
+ planFeaturesWithFeaturesUnderTest.get(planFeature).add(planFeaturesUnderTest);
}
}
diff --git a/xplan-distribution/pom.xml b/xplan-distribution/pom.xml
index e0cda068a4..ca3d759fef 100644
--- a/xplan-distribution/pom.xml
+++ b/xplan-distribution/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-docker/pom.xml b/xplan-docker/pom.xml
index 274ce7b1f1..bb74a32bcb 100644
--- a/xplan-docker/pom.xml
+++ b/xplan-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-docker/xplan-docker-mapproxy/pom.xml b/xplan-docker/xplan-docker-mapproxy/pom.xml
index 2ab8c1826a..4561bac36d 100644
--- a/xplan-docker/xplan-docker-mapproxy/pom.xml
+++ b/xplan-docker/xplan-docker-mapproxy/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-mapserver/pom.xml b/xplan-docker/xplan-docker-mapserver/pom.xml
index 421d5936be..abd250b952 100644
--- a/xplan-docker/xplan-docker-mapserver/pom.xml
+++ b/xplan-docker/xplan-docker-mapserver/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
index 9ee7d8fd85..3682496ada 100644
--- a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat/pom.xml b/xplan-docker/xplan-docker-tomcat/pom.xml
index 816c75e6b5..3521344a26 100644
--- a/xplan-docker/xplan-docker-tomcat/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-volume-init/pom.xml b/xplan-docker/xplan-docker-volume-init/pom.xml
index 33b6796269..4f409d7c38 100644
--- a/xplan-docker/xplan-docker-volume-init/pom.xml
+++ b/xplan-docker/xplan-docker-volume-init/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-documentation/pom.xml b/xplan-documentation/pom.xml
index 7505cbebaa..ef482051d3 100644
--- a/xplan-documentation/pom.xml
+++ b/xplan-documentation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/pom.xml b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
index 80946d06a2..eebcca0473 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/pom.xml
+++ b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
index 96dd70ce9c..1ecb68e617 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
@@ -2,6 +2,14 @@
[[Aenderungshistorie]]
== Änderungshistorie der xPlanBox
+[[Aenderungshistorie-7.1.1]]
+=== Version 7.1.1
+
+==== Fehlerbehebungen
+- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
+- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
+- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+
[[Aenderungshistorie-7.1]]
=== Version 7.1
diff --git a/xplan-documentation/xplan-betriebshandbuch/pom.xml b/xplan-documentation/xplan-betriebshandbuch/pom.xml
index bc892f460c..e59c324859 100644
--- a/xplan-documentation/xplan-betriebshandbuch/pom.xml
+++ b/xplan-documentation/xplan-betriebshandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
index e133c5bd2a..7a77079776 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
@@ -80,6 +80,7 @@ Die Aktualisierungswerkzeuge und -skripte werden nur für die genannten Versione
| 7.0.1 | ja (<<aktualisierung-version-7.0.1, Details>>) | nein
| 7.0.2 | ja (<<aktualisierung-version-7.0.2, Details>>) | nein
| 7.1 | ja (<<aktualisierung-version-7.1, Details>>) | ja (<<aktualisierung-version-7.1, Details>>)
+| 7.1.1 | nein | nein
|Durchzuführende Aktualisierungen | <<aktualisierung-der-betroffenen-konfigurationsdateien-in-den-workspaces>> | <<aktualisierung-der-schemas>> und <<aktualisierung-der-daten>>
|===
@@ -290,3 +291,17 @@ Bei unerwartetem Verhalten der xPlanBox nach einer Aktualisierung können folgen
* Löschen des Verzeichnisses _<CATALINA_HOME>/work/_ des Tomcat-Servers. Der Tomcat-Server muss zuvor gestoppt und anschließend neu gestartet werden.
* Reload der Workspaces der XPlanDienste.
* Löschen des Browser-Caches.
+
+[[aktualisierung-version-7.1.1]]
+=== Aktualisierung auf die Version 7.1.1
+
+Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden:
+
+* Austausch der Webapps:
+** _xplan-api-validator.war_
+** _xplan-api-manager.war_
+** _xplan-validator-web.war_
+** _xplan-manager-web.war_
+** _xplan-api-dokumente.war_
+
+TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden.
\ No newline at end of file
diff --git a/xplan-resources/pom.xml b/xplan-resources/pom.xml
index f8f13687bd..789ead135e 100644
--- a/xplan-resources/pom.xml
+++ b/xplan-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-resources/xplan-database-scripts/pom.xml b/xplan-resources/xplan-database-scripts/pom.xml
index 00c539a2db..86d296273e 100644
--- a/xplan-resources/xplan-database-scripts/pom.xml
+++ b/xplan-resources/xplan-database-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-schemas/pom.xml b/xplan-resources/xplan-schemas/pom.xml
index 6ea89e1ca4..4280381543 100644
--- a/xplan-resources/xplan-schemas/pom.xml
+++ b/xplan-resources/xplan-schemas/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-sql-scripts/pom.xml b/xplan-resources/xplan-sql-scripts/pom.xml
index 001381d6eb..db9dcbdc65 100644
--- a/xplan-resources/xplan-sql-scripts/pom.xml
+++ b/xplan-resources/xplan-sql-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-security/pom.xml b/xplan-security/pom.xml
index ad8d63a784..7f3cef4553 100644
--- a/xplan-security/pom.xml
+++ b/xplan-security/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-tests/pom.xml b/xplan-tests/pom.xml
index f4ce4f9712..9668c32904 100644
--- a/xplan-tests/pom.xml
+++ b/xplan-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-tests/xplan-tests-manual/pom.xml b/xplan-tests/xplan-tests-manual/pom.xml
index f3ae250de2..d8558edc04 100644
--- a/xplan-tests/xplan-tests-manual/pom.xml
+++ b/xplan-tests/xplan-tests-manual/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
</project>
diff --git a/xplan-tests/xplan-tests-resources/pom.xml b/xplan-tests/xplan-tests-resources/pom.xml
index e4ba2ce5ae..70b51a54f9 100644
--- a/xplan-tests/xplan-tests-resources/pom.xml
+++ b/xplan-tests/xplan-tests-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
</project>
\ No newline at end of file
diff --git a/xplan-tests/xplan-tests-soapui/pom.xml b/xplan-tests/xplan-tests-soapui/pom.xml
index 4c492dd25e..76d0cf450b 100644
--- a/xplan-tests/xplan-tests-soapui/pom.xml
+++ b/xplan-tests/xplan-tests-soapui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
index 6f62f641d2..b9d1c0625a 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
@@ -43,6 +43,7 @@
</xplan:XP_Gemeinde>
</xplan:gemeinde>
<xplan:planArt>1000</xplan:planArt>
+ <xplan:sonstPlanArt codeSpace="https://registry.gdi-de.org/codelist/de.xleitstelle.xplanung/BP_SonstPlanArt" >9999_4</xplan:sonstPlanArt>
<xplan:rechtsstand>3000</xplan:rechtsstand>
<xplan:staedtebaulicherVertrag>false</xplan:staedtebaulicherVertrag>
<xplan:erschliessungsVertrag>false</xplan:erschliessungsVertrag>
diff --git a/xplan-webapps/pom.xml b/xplan-webapps/pom.xml
index c596f3c870..b821b999d3 100644
--- a/xplan-webapps/pom.xml
+++ b/xplan-webapps/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-webapps/xplan-commons-web/pom.xml b/xplan-webapps/xplan-commons-web/pom.xml
index 014c53afb9..9486f285d8 100644
--- a/xplan-webapps/xplan-commons-web/pom.xml
+++ b/xplan-webapps/xplan-commons-web/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-manager-web/Dockerfile b/xplan-webapps/xplan-manager-web/Dockerfile
index a9c544002b..cd8faeacd9 100644
--- a/xplan-webapps/xplan-manager-web/Dockerfile
+++ b/xplan-webapps/xplan-manager-web/Dockerfile
@@ -5,7 +5,7 @@ FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat-gdal:$XPLANBOX_VERSION
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
-ARG WEB_CONTEXT=ROOT
+ARG WEB_CONTEXT=xplan-manager-web
ARG XPLANBOX_VERSION=latest
# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
@@ -22,10 +22,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
# set environment variables
ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
-# add xplan-manager-web
-# TODO: add unpacked
-COPY target/xplan-manager-web-*.war /usr/local/tomcat/webapps/xplan-manager-web.war
-
+# add xplan-manager-web directly unpacked
+COPY target/xplan-manager-web-*.war /tmp/
+RUN mkdir /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && cd /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && jar xf /tmp/xplan-manager-web-*.war \
+ && rm /tmp/xplan-manager-web-*.war
# run tomcat
CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]
diff --git a/xplan-webapps/xplan-manager-web/DockerfileHale b/xplan-webapps/xplan-manager-web/DockerfileHale
index 3ca0059855..7a467e6737 100644
--- a/xplan-webapps/xplan-manager-web/DockerfileHale
+++ b/xplan-webapps/xplan-manager-web/DockerfileHale
@@ -2,20 +2,37 @@ ARG XPLANBOX_VERSION=latest
ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat-gdal:$XPLANBOX_VERSION
-ARG WEB_CONTEXT=ROOT
+ARG BUILD_DATE=?
+ARG DOCKER_IMAGE_NAME=?
+ARG GIT_REVISION=?
+ARG WEB_CONTEXT=xplan-manager-web
+ARG XPLANBOX_VERSION=latest
+
+# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
+ "org.opencontainers.image.description"="ozgxplanung xPlanBox component" \
+ "org.opencontainers.image.licenses"="GNU Affero General Public License & others" \
+ "org.opencontainers.image.ref.name"="$DOCKER_IMAGE_NAME" \
+ "org.opencontainers.image.revision"="$GIT_REVISION" \
+ "org.opencontainers.image.title"="ozgxplanung - $DOCKER_IMAGE_NAME" \
+ "org.opencontainers.image.url"="https://gitlab.opencode.de/diplanung/ozgxplanung" \
+ "org.opencontainers.image.vendor"="lat/lon GmbH" \
+ "org.opencontainers.image.version"="$XPLANBOX_VERSION"
# set environment variables
-ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Dlog4j2.configurationFile=classpath:/log4j2.yaml -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
+ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
# add hale-cli which is using Java 8 JDK
RUN cd / && wget https://github.com/halestudio/hale-cli/releases/download/v3.4.0/hale-cli-3.4.0.zip && unzip hale-cli-3.4.0.zip
RUN apt update && apt -y install openjdk-8-jdk
RUN sed -i '2iJAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64' /hale/bin/hale
-# add xplan-manager-web
-# TODO: add unpacked
-COPY target/xplan-manager-web-*.war /usr/local/tomcat/webapps/xplan-manager-web.war
-
+# add xplan-manager-web directly unpacked
+COPY target/xplan-manager-web-*.war /tmp/
+RUN mkdir /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && cd /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && jar xf /tmp/xplan-manager-web-*.war \
+ && rm /tmp/xplan-manager-web-*.war
# run tomcat
CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]
diff --git a/xplan-webapps/xplan-manager-web/pom.xml b/xplan-webapps/xplan-manager-web/pom.xml
index 5788a85d8f..167351a8cf 100644
--- a/xplan-webapps/xplan-manager-web/pom.xml
+++ b/xplan-webapps/xplan-manager-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-webapps/xplan-root/pom.xml
index 4dc5838048..6171ee9d11 100644
--- a/xplan-webapps/xplan-root/pom.xml
+++ b/xplan-webapps/xplan-root/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web-commons/pom.xml b/xplan-webapps/xplan-validator-web-commons/pom.xml
index f4e8d455bc..8bbed430f2 100644
--- a/xplan-webapps/xplan-validator-web-commons/pom.xml
+++ b/xplan-webapps/xplan-validator-web-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web/pom.xml b/xplan-webapps/xplan-validator-web/pom.xml
index 551d3a9658..fd8e737e7f 100644
--- a/xplan-webapps/xplan-validator-web/pom.xml
+++ b/xplan-webapps/xplan-validator-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml
index 1340ace063..d34c29492b 100644
--- a/xplan-webservices/pom.xml
+++ b/xplan-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-webservices/xplan-commons-webservices/pom.xml b/xplan-webservices/xplan-commons-webservices/pom.xml
index 30eda8aaa0..a9e1edd297 100644
--- a/xplan-webservices/xplan-commons-webservices/pom.xml
+++ b/xplan-webservices/xplan-commons-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webservices/xplan-inspireplu/pom.xml b/xplan-webservices/xplan-inspireplu/pom.xml
index 2dbe40bf9d..96b98019a9 100644
--- a/xplan-webservices/xplan-inspireplu/pom.xml
+++ b/xplan-webservices/xplan-inspireplu/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-services-docker/pom.xml b/xplan-webservices/xplan-services-docker/pom.xml
index 769f4cb7fc..b2ecab584f 100644
--- a/xplan-webservices/xplan-services-docker/pom.xml
+++ b/xplan-webservices/xplan-services-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webservices/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-validator-wms/pom.xml
index 91bbc41777..f2eef7a3ae 100644
--- a/xplan-webservices/xplan-validator-wms/pom.xml
+++ b/xplan-webservices/xplan-validator-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wfs/pom.xml b/xplan-webservices/xplan-wfs/pom.xml
index 96f7889518..94c7d49e90 100644
--- a/xplan-webservices/xplan-wfs/pom.xml
+++ b/xplan-webservices/xplan-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wms/pom.xml b/xplan-webservices/xplan-wms/pom.xml
index 36be17f56d..de2e0baed6 100644
--- a/xplan-webservices/xplan-wms/pom.xml
+++ b/xplan-webservices/xplan-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webservices/xplansyn-wfs/pom.xml b/xplan-webservices/xplansyn-wfs/pom.xml
index eb6d07a469..4bc6c8dee6 100644
--- a/xplan-webservices/xplansyn-wfs/pom.xml
+++ b/xplan-webservices/xplansyn-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-workspaces/pom.xml b/xplan-workspaces/pom.xml
index 81d0870be5..4427e2c4aa 100644
--- a/xplan-workspaces/pom.xml
+++ b/xplan-workspaces/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
--
GitLab