diff --git a/jenkinsfiles/test/Jenkinsfile b/jenkinsfiles/test/Jenkinsfile
index c92759a0310a2b23d01c4da416b5c3486d962264..5419103f47feac7308b079886f54be1cf0bceafe 100644
--- a/jenkinsfiles/test/Jenkinsfile
+++ b/jenkinsfiles/test/Jenkinsfile
@@ -15,6 +15,7 @@ pipeline {
string(name: 'BASE_URL_MANAGER_API', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of XPlanManagerAPI')
string(name: 'BASE_URL_DOKUMENTEN_API', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of XPlanDokumentenAPI')
string(name: 'BASE_URL_MAPSERVER', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of MapServer')
+ string(name: 'BASE_URL_MAPPROXY', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of MapProxy')
string(name: 'SLACK_CHANNEL', defaultValue: "#testumgebung", description: 'Set slack channel')
string(name: 'SLACK_TESTED_ENVIRONMENT', defaultValue: "https://xplanbox.lat-lon.de/", description: 'Set name of test environment which shall be printed in slack messages')
string(name: 'SLACK_TEAM_DOMAIN', defaultValue: "xplanbox", description: 'Set slack team domain')
@@ -62,7 +63,7 @@ pipeline {
withCredentials([
usernamePassword(credentialsId:"${CREDENTIALS_ID}", passwordVariable: 'Password', usernameVariable: 'Username')
]) {
- sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${BASE_URL_DIENSTE} -DbaseUrlInspirePlu=${BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DbaseUrlMapServer=${BASE_URL_MAPSERVER} -Dusername=$Username -Dpassword=$Password -DapiKey=${SERVICES_API_KEY}'
+ sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${BASE_URL_DIENSTE} -DbaseUrlInspirePlu=${BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DbaseUrlMapServer=${BASE_URL_MAPSERVER} -DbaseUrlMapProxy=${BASE_URL_MAPPROXY} -Dusername=$Username -Dpassword=$Password -DapiKey=${SERVICES_API_KEY}'
}
}
}
diff --git a/pom.xml b/pom.xml
index d08116ea7b6ca928051e7ebf0e1839a2c7ef8fd0..1bf72c6f6801db3f822677f061da4954a022843e 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
<name>xPlanBox</name>
<description>Software zur Verwaltung von XPlanGML Daten</description>
<inceptionYear>2008</inceptionYear>
@@ -19,7 +19,7 @@
<maven.version>3.8.1</maven.version>
<!-- version properties -->
<deegree3.version>3.5.0.2</deegree3.version>
- <xplanung.regeln.version>1.1.5</xplanung.regeln.version>
+ <xplanung.regeln.version>1.1.6-SNAPSHOT</xplanung.regeln.version>
<xplanung.regeln.berlin.version>0.4</xplanung.regeln.berlin.version>
<gwt.version>2.10.0</gwt.version>
<geotools.version>29.2</geotools.version>
@@ -39,16 +39,16 @@
<postgresql.version>42.5.4</postgresql.version>
<owasp.version>8.4.0</owasp.version>
<!-- project properties -->
+ <distribution.repo.id>gitlab-maven</distribution.repo.id>
+ <distribution.repo.url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</distribution.repo.url>
+ <distribution.snapshotRepo.id>gitlab-maven</distribution.snapshotRepo.id>
+ <distribution.snapshotRepo.url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</distribution.snapshotRepo.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tests.jvm.xmx>1000m</tests.jvm.xmx>
<build.key /> <!-- can be set by build job -->
<build-date-utc>${maven.build.timestamp}Z</build-date-utc>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<dependency-check.skip>true</dependency-check.skip>
- <distribution.repo.id>gitlab-maven</distribution.repo.id>
- <distribution.repo.url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</distribution.repo.url>
- <distribution.snapshotRepo.id>gitlab-maven</distribution.snapshotRepo.id>
- <distribution.snapshotRepo.url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</distribution.snapshotRepo.url>
</properties>
<modules>
@@ -447,6 +447,7 @@
<includeOnlyProperties>
<includeOnlyProperty>git.commit.id</includeOnlyProperty>
</includeOnlyProperties>
+ <skipPoms>false</skipPoms>
<verbose>true</verbose>
</configuration>
</plugin>
@@ -635,7 +636,7 @@
<plugin>
<groupId>com.smartbear.soapui</groupId>
<artifactId>soapui-maven-plugin</artifactId>
- <version>5.7.1</version>
+ <version>5.7.2</version>
</plugin>
<!-- asciidoc -->
<plugin>
@@ -660,6 +661,11 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1167,15 +1173,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.24.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.webcompere</groupId>
- <artifactId>system-stubs-junit4</artifactId>
- <version>2.0.2</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1553,7 +1559,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.0.2</tag>
+ <tag>HEAD</tag>
</scm>
<repositories>
diff --git a/xplan-api/pom.xml b/xplan-api/pom.xml
index 3770cda81d61d6df64d7c028641831f8ccc1e6e3..c32f764c83e52e80f57122271a0e59518ec0198c 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
@@ -29,24 +29,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/gen/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
diff --git a/xplan-api/xplan-api-commons/pom.xml b/xplan-api/xplan-api-commons/pom.xml
index 5dce117449343fe7ba929753ce73e82687e666cd..eac3176a0f2e6f191197eee8d851b04bee1a7385 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java
index f7268a3b18ab74537256d594796f20c63440211a..bd2fbb90f80ef5c72b1d685f078de6afe19e077a 100644
--- a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java
+++ b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java
@@ -25,6 +25,7 @@ import de.latlon.xplan.validator.i18n.ValidationMessages;
import de.latlon.xplan.validator.report.ValidatorReport;
import de.latlon.xplan.validator.semantic.report.SemanticValidatorResult;
import de.latlon.xplan.validator.syntactic.report.SyntacticValidatorResult;
+import de.latlon.xplanbox.api.commons.v1.model.DocumentSummary;
import de.latlon.xplanbox.api.commons.v1.model.ExternalReferenceResult;
import de.latlon.xplanbox.api.commons.v1.model.ExternalReferenceStatusEnum;
import de.latlon.xplanbox.api.commons.v1.model.PlanInfoBbox;
@@ -80,6 +81,7 @@ public class ValidationReportBuilder {
if (validatorReport != null) {
validationReport.date(validatorReport.getDate())
.name(validatorReport.getValidationName())
+ .documentSummary(buildDocumentSummary())
.version(fromXPlanVersion(validatorReport.getXPlanVersion()))
.valid(validatorReport.isReportValid())
.status(status())
@@ -94,6 +96,14 @@ public class ValidationReportBuilder {
return validationReport;
}
+ private List<DocumentSummary> buildDocumentSummary() {
+ return validatorReport.getPlanNames()
+ .stream()
+ .map(planName -> new DocumentSummary().name(planName)
+ .type(validatorReport.getXPlanType() != null ? validatorReport.getXPlanType().name() : null))
+ .collect(Collectors.toList());
+ }
+
private String status() {
SyntacticValidatorResult result = validatorReport.getSyntacticValidatorResult();
if (result == null)
diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java
new file mode 100644
index 0000000000000000000000000000000000000000..04b4b84b46c7bec46559ae885a4bf98b4e23debb
--- /dev/null
+++ b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java
@@ -0,0 +1,71 @@
+package de.latlon.xplanbox.api.commons.v1.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.validation.Valid;
+import java.util.Objects;
+
+/**
+ * Contains a summary of a validated plan.
+ *
+ * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
+ * @since 7.1
+ */
+public class DocumentSummary {
+
+ private @Valid String name;
+
+ private @Valid String type;
+
+ public DocumentSummary name(String name) {
+ this.name = name;
+ return this;
+ }
+
+ @Schema(example = "Othmarschen3")
+ @JsonProperty("name")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public DocumentSummary type(String type) {
+ this.type = type;
+ return this;
+ }
+
+ @Schema(example = "BP_Plan")
+ @JsonProperty("type")
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (!(o instanceof DocumentSummary))
+ return false;
+ DocumentSummary that = (DocumentSummary) o;
+ return Objects.equals(name, that.name) && Objects.equals(type, that.type);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, type);
+ }
+
+ @Override
+ public String toString() {
+ return "BasicPlanInfo{" + "name='" + name + '\'' + ", type='" + type + '\'' + '}';
+ }
+
+}
\ No newline at end of file
diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java
index d2cc06aa1c5f90a80f3515ac6f8817e10f386048..54feb87c797388a944905397d698ae237d6dabb5 100644
--- a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java
+++ b/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java
@@ -48,6 +48,8 @@ public class ValidationReport {
private @Valid String name;
+ private @Valid List<DocumentSummary> documentSummary;
+
private @Valid PlanInfoBbox bbox;
private @Valid Date date;
@@ -100,6 +102,21 @@ public class ValidationReport {
this.name = name;
}
+ /**
+ **/
+ public ValidationReport documentSummary(List<DocumentSummary> documentSummary) {
+ this.documentSummary = documentSummary;
+ return this;
+ }
+
+ public List<DocumentSummary> getDocumentSummary() {
+ return documentSummary;
+ }
+
+ public void setDocumentSummary(List<DocumentSummary> documentSummary) {
+ this.documentSummary = documentSummary;
+ }
+
/**
**/
public ValidationReport version(VersionEnum version) {
@@ -281,6 +298,7 @@ public class ValidationReport {
ValidationReport validationReport = (ValidationReport) o;
return Objects.equals(this.filename, validationReport.filename)
&& Objects.equals(this.name, validationReport.name)
+ && Objects.equals(this.documentSummary, validationReport.documentSummary)
&& Objects.equals(this.version, validationReport.version)
&& Objects.equals(this.bbox, validationReport.bbox) && Objects.equals(this.date, validationReport.date)
&& Objects.equals(this.valid, validationReport.valid)
@@ -293,8 +311,8 @@ public class ValidationReport {
@Override
public int hashCode() {
- return Objects.hash(filename, name, version, bbox, date, valid, externalReferences, wmsUrl, rulesMetadata,
- validationResult);
+ return Objects.hash(filename, name, documentSummary, version, bbox, date, valid, externalReferences, wmsUrl,
+ rulesMetadata, validationResult);
}
@Override
@@ -304,6 +322,7 @@ public class ValidationReport {
sb.append(" filename: ").append(toIndentedString(filename)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
+ sb.append(" planInfos: ").append(toIndentedString(documentSummary)).append("\n");
sb.append(" version: ").append(toIndentedString(version)).append("\n");
sb.append(" bbox: ").append(toIndentedString(bbox)).append("\n");
sb.append(" date: ").append(toIndentedString(date)).append("\n");
diff --git a/xplan-api/xplan-api-dokumente/Dockerfile b/xplan-api/xplan-api-dokumente/Dockerfile
index 21beef947c217fbf3e32adc648806d305895cbb9..45896f263ed83931f779ed722d6d169d2c3b9a9e 100644
--- a/xplan-api/xplan-api-dokumente/Dockerfile
+++ b/xplan-api/xplan-api-dokumente/Dockerfile
@@ -1,11 +1,13 @@
ARG XPLANBOX_VERSION=latest
ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
-FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION
+FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION as builder
+
+FROM eclipse-temurin:11.0.17_8-jre-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
-ARG WEB_CONTEXT=ROOT
+ARG JAR_FILE=target/*.jar
ARG XPLANBOX_VERSION=latest
# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
@@ -19,18 +21,22 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
+ENV TZ=Europe/Berlin
+
+# copy jmx exporter from xplan-docker-tomcat until we switch to actuator based prometheus publishing
+ENV JMX_EXPORTER_DIR=/xplanbox/prometheus
+RUN mkdir -p $JMX_EXPORTER_DIR
+COPY --from=builder $JMX_EXPORTER_DIR $JMX_EXPORTER_DIR
+
+ENV JAVA_ADDITIONAL_ARG_JMX_EXPORTER='-javaagent:$JMX_EXPORTER_DIR/jmx_prometheus_javaagent-0.19.0.jar=12345:$JMX_EXPORTER_DIR/jmx-exporter.config.yaml'
+
# set environment variables
-ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-dokumenten-config -Dlog4j2.configurationFile=classpath:/log4j2.yaml -Duser.timezone=Europe/Berlin"
-ENV TOMCAT_ADDITIONAL_ARG_JAVA17_EXPORTS="--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
+ENV JAVA_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-dokumenten-config/ -Duser.timezone=Europe/Berlin"
ENV DEEGREE_WORKSPACE_ROOT=/xplanbox/deegree
-USER root
+COPY ${JAR_FILE} /xplanbox/app.jar
+COPY run.sh /xplanbox/
-# add xplan-api-dokumente
-ADD target/xplan-api-dokumente-*.war /tmp/
-RUN mkdir /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \
- && cd /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \
- && jar xf /tmp/xplan-api-dokumente-*.war \
- && rm /tmp/xplan-api-dokumente-*.war
+USER 1001
-USER 1001
\ No newline at end of file
+ENTRYPOINT ["/bin/sh", "/xplanbox/run.sh"]
diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml
index c4252da950d1791346af561b5e811a26b59a744f..9784fbf6f7d74e15d8adda2beda6089a89b715e4 100755
--- a/xplan-api/xplan-api-dokumente/pom.xml
+++ b/xplan-api/xplan-api-dokumente/pom.xml
@@ -2,16 +2,53 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>xplan-api-dokumente</artifactId>
- <packaging>war</packaging>
- <name>xplan-api-dokumente</name>
- <description>XPlanDokumentenAPI</description>
+ <packaging>jar</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -25,23 +62,14 @@
<groupId>${project.groupId}</groupId>
<artifactId>xplan-core-manager-db</artifactId>
</dependency>
- <!-- Javax -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
- <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -52,32 +80,26 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
- <version>${jersey.version}</version>
</dependency>
<!-- Swagger 3 -->
<dependency>
@@ -105,27 +127,23 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
</dependency>
<!-- spring -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- logging -->
<dependency>
@@ -164,7 +182,6 @@
<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -176,7 +193,6 @@
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-inmemory</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/xplan-api/xplan-api-dokumente/run.sh b/xplan-api/xplan-api-dokumente/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d12d67ccd8497bb2b4bc582a7eb5b75e5160e792
--- /dev/null
+++ b/xplan-api/xplan-api-dokumente/run.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ALL_ADDITIONAL_ARGS=$(env | grep ^JAVA_ADDITIONAL_ | sed 's/^JAVA_ADDITIONAL_[[:alnum:]_]*=//' | tr '\n' ' ')
+
+if [ -n "${ALL_ADDITIONAL_ARGS}" ]; then
+ JAVA_OPTS=$(eval "echo $ALL_ADDITIONAL_ARGS")
+ echo "xPlanBox JAVA_OPTS set: $JAVA_OPTS"
+fi
+
+exec java $JAVA_OPTS -jar /xplanbox/app.jar
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationInitializer.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationInitializer.java
deleted file mode 100644
index e6965838dad036b9c8e010abd28ab4f11aee98f6..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationInitializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * #%L
- * xplan-api-dokumente - XPlanDokumentenAPI
- * %%
- * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- * %%
- * This program is free software: you can redistribute it and/or modify
- * 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%
- */
-package de.latlon.xplanbox.api.dokumente;
-
-import de.latlon.xplanbox.api.dokumente.config.ApplicationContext;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import javax.servlet.ServletContext;
-
-/**
- * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
- * @since 7.0
- */
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class ApplicationInitializer implements WebApplicationInitializer {
-
- @Override
- public void onStartup(ServletContext servletContext) {
- AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
- servletContext.addListener(new ContextLoaderListener(context));
- servletContext.setInitParameter("contextConfigLocation", ApplicationContext.class.getCanonicalName());
- }
-
-}
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
new file mode 100644
index 0000000000000000000000000000000000000000..bbab2513d3f82a1f5bcbea9a3eb23b0d957467d0
--- /dev/null
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
@@ -0,0 +1,15 @@
+package de.latlon.xplanbox.api.dokumente;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackages = { "de.latlon.xplanbox.api.dokumente.config" })
+public class SpringBootApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SpringBootApp.class, args);
+ }
+
+}
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java
index a4e1387aee03990aa95dceb99af2d599f033ae5f..ad9d4194f7918bb4060e9c356514f58c8661b458 100644
--- a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java
@@ -64,12 +64,6 @@ public class ApplicationContext {
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
- @Bean
- public ManagerWorkspaceWrapper managerWorkspaceWrapper() throws WorkspaceException {
- DeegreeWorkspace managerWorkspace = instantiateWorkspace(DEFAULT_XPLAN_MANAGER_WORKSPACE);
- return new ManagerWorkspaceWrapper(managerWorkspace);
- }
-
@Bean
public XPlanDbAdapter xPlanDbAdapter() {
return new XPlanDbAdapter(null, planRepository, planwerkWmsMetadataRepository, artefactRepository);
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java
new file mode 100644
index 0000000000000000000000000000000000000000..8945c9e0b0d9a7ef1370b627e0b7b73fa48ef141
--- /dev/null
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java
@@ -0,0 +1,45 @@
+/*-
+ * #%L
+ * xplan-api-dokumente - XPlanDokumentenAPI
+ * %%
+ * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * 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%
+ */
+package de.latlon.xplanbox.api.dokumente.config;
+
+import static de.latlon.xplan.manager.workspace.WorkspaceUtils.DEFAULT_XPLAN_MANAGER_WORKSPACE;
+import static de.latlon.xplan.manager.workspace.WorkspaceUtils.instantiateWorkspace;
+
+import org.deegree.commons.config.DeegreeWorkspace;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper;
+import de.latlon.xplan.manager.workspace.WorkspaceException;
+
+/**
+ * Simple workaround for circular dependencies in Spring beans.
+ */
+@Configuration
+public class ApplicationContextPart1 {
+
+ @Bean
+ public ManagerWorkspaceWrapper managerWorkspaceWrapper() throws WorkspaceException {
+ DeegreeWorkspace managerWorkspace = instantiateWorkspace(DEFAULT_XPLAN_MANAGER_WORKSPACE);
+ return new ManagerWorkspaceWrapper(managerWorkspace);
+ }
+
+}
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationPathConfig.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java
similarity index 78%
rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationPathConfig.java
rename to xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java
index 19daf43e1a7a3c0f0e86aa386d6e5a7e444f20a8..ff8d5ce1b49446e25a21bc1d23eba4c2661a5f63 100644
--- a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/ApplicationPathConfig.java
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java
@@ -18,13 +18,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-package de.latlon.xplanbox.api.dokumente;
+package de.latlon.xplanbox.api.dokumente.config;
import de.latlon.xplanbox.api.commons.ObjectMapperContextResolver;
import de.latlon.xplanbox.api.commons.config.ApiConfiguration;
+import de.latlon.xplanbox.api.commons.converter.StringListConverterProvider;
+import de.latlon.xplanbox.api.commons.exception.ConstraintViolationExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.UnsupportedContentTypeExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.ValidatorExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.XPlanApiExceptionMapper;
import de.latlon.xplanbox.api.commons.openapi.OpenApiFilter;
-import de.latlon.xplanbox.api.dokumente.config.DokumentenApiConfiguration;
+import de.latlon.xplanbox.api.dokumente.v1.InfoApi;
+import de.latlon.xplanbox.api.dokumente.v1.StatusApi;
import de.latlon.xplanbox.api.dokumente.v1.DefaultApi;
+import de.latlon.xplanbox.api.dokumente.v1.DokumentApi;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
import io.swagger.v3.oas.models.ExternalDocumentation;
import io.swagger.v3.oas.models.OpenAPI;
@@ -34,7 +41,9 @@ import io.swagger.v3.oas.models.info.License;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.oas.models.tags.Tag;
import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
import org.slf4j.Logger;
+import org.springframework.context.annotation.Configuration;
import javax.servlet.ServletContext;
import javax.ws.rs.ApplicationPath;
@@ -57,20 +66,27 @@ import static org.slf4j.LoggerFactory.getLogger;
* @since 7.0
*/
@ApplicationPath("/xdokumente/api/v1")
-public class ApplicationPathConfig extends ResourceConfig {
+@Configuration
+public class JerseyConfig extends ResourceConfig {
- private static final Logger LOG = getLogger(ApplicationPathConfig.class);
+ private static final Logger LOG = getLogger(JerseyConfig.class);
private static final String APP_PATH = "xdokumente/api/v1";
- public ApplicationPathConfig(@Context ServletContext servletContext, DokumentenApiConfiguration apiConfiguration) {
- super();
+ public JerseyConfig(@Context ServletContext servletContext, DokumentenApiConfiguration apiConfiguration) {
+ property(ServerProperties.WADL_FEATURE_DISABLE, true);
+
register(new ObjectMapperContextResolver());
- packages("de.latlon.xplanbox.api.dokumente.config");
- packages("de.latlon.xplanbox.api.dokumente.handler");
- packages("de.latlon.xplanbox.api.dokumente.v1");
- packages("de.latlon.xplanbox.api.commons.exception");
- packages("de.latlon.xplanbox.api.commons.converter");
+
+ register(InfoApi.class);
+ register(DokumentApi.class);
+ register(StatusApi.class);
+ register(ConstraintViolationExceptionMapper.class);
+ register(UnsupportedContentTypeExceptionMapper.class);
+ register(ValidatorExceptionMapper.class);
+ register(XPlanApiExceptionMapper.class);
+ register(StringListConverterProvider.class);
+
OpenAPI openApi = new OpenAPI();
openApi.setInfo(new Info().title("XPlanDokumentenAPI")
.version("1.0.0")
diff --git a/xplan-api/xplan-api-dokumente/src/main/resources/application.properties b/xplan-api/xplan-api-dokumente/src/main/resources/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..cb50d41a1e27ceed11f114b88b601ad15626c8b2
--- /dev/null
+++ b/xplan-api/xplan-api-dokumente/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+server.servlet.context-path=/xplan-api-dokumente
+
+logging.level.root=warn
+logging.level.de.latlon=debug
+logging.level.org.springframework.web=debug
+logging.level.org.hibernate=error
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/Dockerfile b/xplan-api/xplan-api-manager/Dockerfile
index e412fd0d4ba6117151529a81aba5d3b1e592d30d..1c343ab7e67f4445008e7c8e04f16798759d14dc 100644
--- a/xplan-api/xplan-api-manager/Dockerfile
+++ b/xplan-api/xplan-api-manager/Dockerfile
@@ -5,6 +5,7 @@ FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat-gdal:$XPLANBOX_VERSION
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
+ARG JAR_FILE=target/*.jar
ARG XPLANBOX_VERSION=latest
# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
@@ -19,12 +20,13 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
# 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"
+ENV DEEGREE_WORKSPACE_ROOT=/xplanbox/deegree
-# add xplan-api-manager
-ADD target/xplan-api-manager-*.war /tmp/
-RUN cd /tmp/ && unzip -q xplan-api-manager-*.war -d /usr/local/tomcat/webapps/xplan-api-manager \
- && rm /tmp/*.war
+ENV JAVA_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng"
-# run tomcat
-CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]
+COPY ${JAR_FILE} /xplanbox/app.jar
+COPY run.sh /xplanbox/
+
+USER 1001
+
+ENTRYPOINT ["/bin/sh", "/xplanbox/run.sh"]
diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-api/xplan-api-manager/pom.xml
index e0c708fd0b0cec7c063938cbc81b5d0bea25c82c..34cd529ad514383f274f6cc5751161361e3acd1b 100644
--- a/xplan-api/xplan-api-manager/pom.xml
+++ b/xplan-api/xplan-api-manager/pom.xml
@@ -2,40 +2,50 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>xplan-api-manager</artifactId>
- <packaging>war</packaging>
- <description>xplan-api-manager</description>
+ <packaging>jar</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
<execution>
- <id>unpack</id>
- <phase>generate-resources</phase>
<goals>
- <goal>unpack</goal>
+ <goal>repackage</goal>
</goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>de.xleitstelle.xplanung</groupId>
- <artifactId>regeln</artifactId>
- <overWrite>true</overWrite>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- </configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -59,23 +69,14 @@
<groupId>de.xleitstelle.xplanung</groupId>
<artifactId>regeln</artifactId>
</dependency>
- <!-- Javax -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
- <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -86,38 +87,32 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
- <version>${jersey.version}</version>
</dependency>
+
<!-- Swagger 3 -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
@@ -133,22 +128,18 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
</dependency>
<!-- Bean Validation API support -->
<dependency>
@@ -157,8 +148,14 @@
</dependency>
<!-- spring -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- logging -->
<dependency>
@@ -204,52 +201,44 @@
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
+ <artifactId>xmlunit-assertj</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-assertj</artifactId>
- <version>2.9.1</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-test</artifactId>
- <version>2.7.14</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-inmemory</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/xplan-api/xplan-api-manager/run.sh b/xplan-api/xplan-api-manager/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d12d67ccd8497bb2b4bc582a7eb5b75e5160e792
--- /dev/null
+++ b/xplan-api/xplan-api-manager/run.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ALL_ADDITIONAL_ARGS=$(env | grep ^JAVA_ADDITIONAL_ | sed 's/^JAVA_ADDITIONAL_[[:alnum:]_]*=//' | tr '\n' ' ')
+
+if [ -n "${ALL_ADDITIONAL_ARGS}" ]; then
+ JAVA_OPTS=$(eval "echo $ALL_ADDITIONAL_ARGS")
+ echo "xPlanBox JAVA_OPTS set: $JAVA_OPTS"
+fi
+
+exec java $JAVA_OPTS -jar /xplanbox/app.jar
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationInitializer.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationInitializer.java
deleted file mode 100644
index d43a7189ebd8439176fe0e0bcd4d5bda01d10d3f..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationInitializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * #%L
- * xplan-api-manager - xplan-api-manager
- * %%
- * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- * %%
- * This program is free software: you can redistribute it and/or modify
- * 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%
- */
-package de.latlon.xplanbox.api.manager;
-
-import de.latlon.xplanbox.api.manager.config.ApplicationContext;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
- */
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class ApplicationInitializer implements WebApplicationInitializer {
-
- @Override
- public void onStartup(ServletContext servletContext) throws ServletException {
- AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
- servletContext.addListener(new ContextLoaderListener(context));
- servletContext.setInitParameter("contextConfigLocation", ApplicationContext.class.getCanonicalName());
- }
-
-}
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java
index 0a4417145b66b330f778cb4316b58ccb3bb6f4f4..6eb56edd08f944d53e1dcf719579426f3eedc258 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java
@@ -25,6 +25,7 @@ import de.latlon.xplan.manager.web.shared.XPlan;
import de.latlon.xplan.validator.web.shared.XPlanEnvelope;
import de.latlon.xplanbox.api.commons.v1.model.PlanInfoBbox;
import de.latlon.xplanbox.api.commons.v1.model.VersionEnum;
+import de.latlon.xplanbox.api.manager.config.JerseyConfig;
import de.latlon.xplanbox.api.manager.config.ManagerApiConfiguration;
import de.latlon.xplanbox.api.manager.v1.model.Bereich;
import de.latlon.xplanbox.api.manager.v1.model.Link;
@@ -145,7 +146,7 @@ public class PlanInfoBuilder {
List<String> pathSegments = new ArrayList<>();
if (apiUrl.getPath() != null && !apiUrl.getPath().isEmpty())
pathSegments.addAll(Arrays.asList(apiUrl.getPath().split("/")));
- pathSegments.addAll(Arrays.asList(ApplicationPathConfig.APP_PATH.split("/")));
+ pathSegments.addAll(Arrays.asList(JerseyConfig.APP_PATH.split("/")));
pathSegments.add("plan");
pathSegments.add(xPlan.getId());
uriBuilder.setPathSegments(pathSegments.stream()
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
new file mode 100644
index 0000000000000000000000000000000000000000..922a9b5ae79159d9d4db64adf30c283e2032824c
--- /dev/null
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
@@ -0,0 +1,19 @@
+package de.latlon.xplanbox.api.manager;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackages = { "de.latlon.xplanbox.api.manager.config" })
+@EnableAutoConfiguration(exclude = { QuartzAutoConfiguration.class, LiquibaseAutoConfiguration.class })
+public class SpringBootApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SpringBootApp.class, args);
+ }
+
+}
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
index 2c7f0eebcfcc4bdf4722ffab9370ffbd2f104173..ff89e7d0a42b2bfa48b983c8a7b69666ca261d15 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java
@@ -81,7 +81,6 @@ import de.latlon.xplan.validator.semantic.xquery.XQuerySemanticValidator;
import de.latlon.xplan.validator.syntactic.SyntacticValidator;
import de.latlon.xplan.validator.syntactic.SyntacticValidatorImpl;
import de.latlon.xplanbox.api.commons.handler.SystemConfigHandler;
-import org.deegree.commons.config.DeegreeWorkspace;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
@@ -100,8 +99,6 @@ import java.util.Map;
import java.util.Optional;
import static de.latlon.xplan.manager.workspace.WorkspaceUtils.DEFAULT_XPLANSYN_WMS_WORKSPACE;
-import static de.latlon.xplan.manager.workspace.WorkspaceUtils.DEFAULT_XPLAN_MANAGER_WORKSPACE;
-import static de.latlon.xplan.manager.workspace.WorkspaceUtils.instantiateWorkspace;
/**
* Spring Application Context for initialising XPlanManagerAPI components.
@@ -110,13 +107,11 @@ import static de.latlon.xplan.manager.workspace.WorkspaceUtils.instantiateWorksp
* @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a>
*/
@Configuration
-@ComponentScan(basePackages = { "de.latlon.xplanbox.api.manager" })
+@ComponentScan(basePackages = { "de.latlon.xplanbox.api.manager.handler" })
@Import({ JpaContext.class, RasterStorageContext.class, AmazonS3RasterStorageContext.class,
DocumentStorageContext.class, StorageCleanUpContext.class })
public class ApplicationContext {
- private static final String RULES_DIRECTORY = "/rules";
-
@Autowired
private PlanRepository planRepository;
@@ -192,12 +187,6 @@ public class ApplicationContext {
attachmentUrlHandler.orElse(null), xPlanExporter, applicationEventPublisher);
}
- @Bean
- public ManagerWorkspaceWrapper managerWorkspaceWrapper() throws WorkspaceException {
- DeegreeWorkspace managerWorkspace = instantiateWorkspace(DEFAULT_XPLAN_MANAGER_WORKSPACE);
- return new ManagerWorkspaceWrapper(managerWorkspace);
- }
-
@Bean
public WmsWorkspaceWrapper wmsWorkspaceWrapper() throws WorkspaceException {
DeegreeWorkspaceWrapper wmsWorkspace = new DeegreeWorkspaceWrapper(DEFAULT_XPLANSYN_WMS_WORKSPACE);
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd92c4aacf09236bf8f890996936736e6eb0fda2
--- /dev/null
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java
@@ -0,0 +1,45 @@
+/*-
+ * #%L
+ * xplan-api-manager - xplan-api-manager
+ * %%
+ * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * 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%
+ */
+package de.latlon.xplanbox.api.manager.config;
+
+import static de.latlon.xplan.manager.workspace.WorkspaceUtils.DEFAULT_XPLAN_MANAGER_WORKSPACE;
+import static de.latlon.xplan.manager.workspace.WorkspaceUtils.instantiateWorkspace;
+
+import org.deegree.commons.config.DeegreeWorkspace;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper;
+import de.latlon.xplan.manager.workspace.WorkspaceException;
+
+/**
+ * Simple workaround for circular dependencies in Spring beans.
+ */
+@Configuration
+public class ApplicationContextPart1 {
+
+ @Bean
+ public ManagerWorkspaceWrapper managerWorkspaceWrapper() throws WorkspaceException {
+ DeegreeWorkspace managerWorkspace = instantiateWorkspace(DEFAULT_XPLAN_MANAGER_WORKSPACE);
+ return new ManagerWorkspaceWrapper(managerWorkspace);
+ }
+
+}
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationPathConfig.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java
similarity index 71%
rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationPathConfig.java
rename to xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java
index 2741fdad88795fe53dbfad8e8d5b97cda7342d3c..ed5d31b8935327786f63e1665996fe7a59bfdcb8 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/ApplicationPathConfig.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java
@@ -18,12 +18,29 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-package de.latlon.xplanbox.api.manager;
+package de.latlon.xplanbox.api.manager.config;
import de.latlon.xplanbox.api.commons.ObjectMapperContextResolver;
-import de.latlon.xplanbox.api.manager.config.ManagerApiConfiguration;
+import de.latlon.xplanbox.api.commons.converter.StringListConverterProvider;
+import de.latlon.xplanbox.api.commons.exception.ConstraintViolationExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.UnsupportedContentTypeExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.ValidatorExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.XPlanApiExceptionMapper;
+import de.latlon.xplanbox.api.manager.exception.AmbiguousBereichNummernExceptionMapper;
+import de.latlon.xplanbox.api.manager.exception.PlanNotFoundExceptionMapper;
+import de.latlon.xplanbox.api.manager.exception.UnsupportedPlanExceptionMapper;
import de.latlon.xplanbox.api.manager.openapi.ManagerOpenApiFilter;
import de.latlon.xplanbox.api.manager.v1.DefaultApi;
+import de.latlon.xplanbox.api.manager.v1.InfoApi;
+import de.latlon.xplanbox.api.manager.v1.PlanAenderungenApi;
+import de.latlon.xplanbox.api.manager.v1.PlanApi;
+import de.latlon.xplanbox.api.manager.v1.PlanBasisdatenApi;
+import de.latlon.xplanbox.api.manager.v1.PlanDokumentApi;
+import de.latlon.xplanbox.api.manager.v1.PlanGueltigkeitApi;
+import de.latlon.xplanbox.api.manager.v1.PlanRasterbasisApi;
+import de.latlon.xplanbox.api.manager.v1.PlanTextApi;
+import de.latlon.xplanbox.api.manager.v1.PlansApi;
+import de.latlon.xplanbox.api.manager.v1.Status;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
import io.swagger.v3.oas.models.ExternalDocumentation;
import io.swagger.v3.oas.models.OpenAPI;
@@ -36,6 +53,7 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.server.ServerProperties;
import org.slf4j.Logger;
+import org.springframework.context.annotation.Configuration;
import javax.servlet.ServletContext;
import javax.ws.rs.ApplicationPath;
@@ -58,25 +76,43 @@ import static org.slf4j.LoggerFactory.getLogger;
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
@ApplicationPath("/xmanager/api/v1")
-public class ApplicationPathConfig extends ResourceConfig {
+@Configuration
+public class JerseyConfig extends ResourceConfig {
- private static final Logger LOG = getLogger(ApplicationPathConfig.class);
+ private static final Logger LOG = getLogger(JerseyConfig.class);
public static final String APP_PATH = "xmanager/api/v1";
- public ApplicationPathConfig(@Context ServletContext servletContext,
+ public JerseyConfig(@Context ServletContext servletContext,
@Context ManagerApiConfiguration managerApiConfiguration) {
- super();
+ property(ServerProperties.WADL_FEATURE_DISABLE, true);
register(new ObjectMapperContextResolver());
- packages("de.latlon.xplanbox.api.manager.v1");
- packages("de.latlon.xplanbox.api.manager.exception");
- packages("de.latlon.xplanbox.api.commons.exception");
- packages("de.latlon.xplanbox.api.commons.converter");
- packages("org.glassfish.jersey.examples.multipart");
+
+ register(InfoApi.class);
+ register(PlanAenderungenApi.class);
+ register(PlanApi.class);
+ register(PlanBasisdatenApi.class);
+ register(PlanDokumentApi.class);
+ register(PlanGueltigkeitApi.class);
+ register(PlanRasterbasisApi.class);
+ register(PlansApi.class);
+ register(PlanTextApi.class);
+ register(Status.class);
+ register(ConstraintViolationExceptionMapper.class);
+ register(UnsupportedContentTypeExceptionMapper.class);
+ register(ValidatorExceptionMapper.class);
+ register(XPlanApiExceptionMapper.class);
+ register(StringListConverterProvider.class);
+
+ register(AmbiguousBereichNummernExceptionMapper.class);
+ register(PlanNotFoundExceptionMapper.class);
+ register(UnsupportedPlanExceptionMapper.class);
+
+ // packages("org.glassfish.jersey.examples.multipart");
property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
OpenAPI openApi = new OpenAPI();
openApi.setInfo(new Info().title("XPlanManagerAPI")
- .version("1.3.0")
+ .version("1.4.0")
.description("XPlanManager REST API")
.termsOfService(getTermsOfService(managerApiConfiguration))
.license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")));
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java
index abb1cb65983e6f739858447a4469fe6c784661cb..f146629739d114efcb5ed9a9726ef80893c6a3d9 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java
@@ -27,9 +27,9 @@ import de.latlon.xplan.validator.web.shared.ValidationSettings;
import de.latlon.xplanbox.api.commons.exception.InvalidXPlanGmlOrArchive;
import de.latlon.xplanbox.api.commons.exception.UnsupportedParameterValue;
import de.latlon.xplanbox.api.commons.v1.model.ValidationReport;
-import de.latlon.xplanbox.api.manager.ApplicationPathConfig;
import de.latlon.xplanbox.api.manager.PlanInfoBuilder;
import de.latlon.xplanbox.api.manager.config.DefaultValidationConfiguration;
+import de.latlon.xplanbox.api.manager.config.JerseyConfig;
import de.latlon.xplanbox.api.manager.config.ManagerApiConfiguration;
import de.latlon.xplanbox.api.manager.exception.InvalidApiVersion;
import de.latlon.xplanbox.api.manager.handler.PlanHandler;
@@ -400,7 +400,7 @@ public class PlanApi {
List<String> pathSegments = new ArrayList<>();
if (apiUrl.getPath() != null && !apiUrl.getPath().isEmpty())
pathSegments.addAll(Arrays.asList(apiUrl.getPath().split("/")));
- pathSegments.addAll(Arrays.asList(ApplicationPathConfig.APP_PATH.split("/")));
+ pathSegments.addAll(Arrays.asList(JerseyConfig.APP_PATH.split("/")));
pathSegments.add("plans");
uriBuilder.setPathSegments(pathSegments.stream()
.filter(pathSegment -> pathSegment != null && !pathSegment.isEmpty())
diff --git a/xplan-api/xplan-api-manager/src/main/resources/application.properties b/xplan-api/xplan-api-manager/src/main/resources/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..91b389e97c71552d7ab750020ebb7d4d63b83b3e
--- /dev/null
+++ b/xplan-api/xplan-api-manager/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+server.servlet.context-path=/xplan-api-manager
+
+spring.main.allow-bean-definition-overriding=true
+
+logging.level.root=warn
+logging.level.de.latlon=debug
+logging.level.org.springframework.web=debug
+logging.level.org.hibernate=error
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java b/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
index 196394553a430ec709dc5b65add060be9a501779..1a3d8293e52cbee2974866a016b69abd474765b6 100644
--- a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
+++ b/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java
@@ -57,6 +57,8 @@ import de.latlon.xplanbox.api.manager.v1.DefaultApi;
import de.latlon.xplanbox.api.manager.v1.InfoApi;
import de.latlon.xplanbox.api.manager.v1.PlanApi;
import de.latlon.xplanbox.api.manager.v1.PlansApi;
+import liquibase.integration.spring.SpringLiquibase;
+
import org.deegree.commons.config.DeegreeWorkspace;
import org.deegree.cs.coordinatesystems.ICRS;
import org.deegree.feature.persistence.FeatureStore;
@@ -64,6 +66,9 @@ import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.bridge.SLF4JBridgeHandler;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -108,6 +113,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a>
*/
@Configuration
+@EnableAutoConfiguration(exclude = { QuartzAutoConfiguration.class, LiquibaseAutoConfiguration.class })
public class TestContext {
private static final Logger LOG = getLogger(TestContext.class);
@@ -290,8 +296,8 @@ public class TestContext {
@Bean
@Primary
- public XPlanDao xPlanDao(CategoryMapper categoryMapper, ManagerWorkspaceWrapper managerWorkspaceWrapper,
- ManagerConfiguration managerConfiguration) throws Exception {
+ public XPlanDao xPlanDao(ManagerWorkspaceWrapper managerWorkspaceWrapper, ManagerConfiguration managerConfiguration)
+ throws Exception {
XPlanDao xplanDao = mock(XPlanDao.class);
XPlan mockPlan_1 = new XPlan("bplan_41", "1", "BP_Plan", "XPLAN_41");
XPlan mockPlan_123 = new XPlan("bplan_41", "123", "BP_Plan", "XPLAN_41");
diff --git a/xplan-api/xplan-api-validator/Dockerfile b/xplan-api/xplan-api-validator/Dockerfile
index 0af3d06049d9e76a452d4905f0969d3f43b1a9c6..08da1a86dba0d10e90d838344da30f6a065114de 100644
--- a/xplan-api/xplan-api-validator/Dockerfile
+++ b/xplan-api/xplan-api-validator/Dockerfile
@@ -1,11 +1,13 @@
ARG XPLANBOX_VERSION=latest
ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
-FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION
+FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION as builder
+
+FROM eclipse-temurin:11.0.17_8-jre-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
-ARG WEB_CONTEXT=ROOT
+ARG JAR_FILE=target/*.jar
ARG XPLANBOX_VERSION=latest
# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
@@ -19,18 +21,22 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
+ENV TZ=Europe/Berlin
+
+# copy jmx exporter from xplan-docker-tomcat until we switch to actuator based prometheus publishing
+ENV JMX_EXPORTER_DIR=/xplanbox/prometheus
+RUN mkdir -p $JMX_EXPORTER_DIR
+COPY --from=builder $JMX_EXPORTER_DIR $JMX_EXPORTER_DIR
+
+ENV JAVA_ADDITIONAL_ARG_JMX_EXPORTER='-javaagent:$JMX_EXPORTER_DIR/jmx_prometheus_javaagent-0.19.0.jar=12345:$JMX_EXPORTER_DIR/jmx-exporter.config.yaml'
+
# set environment variables
-ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-validator-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
-ENV TOMCAT_ADDITIONAL_ARG_JAVA17_EXPORTS="--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
+ENV JAVA_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-validator-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
ENV DEEGREE_WORKSPACE_ROOT=/xplanbox/deegree
-USER root
+COPY ${JAR_FILE} /xplanbox/app.jar
+COPY run.sh /xplanbox/
-# add xplan-api-validator
-ADD target/xplan-api-validator-*.war /tmp/
-RUN mkdir /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \
- && cd /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \
- && jar xf /tmp/xplan-api-validator-*.war \
- && rm /tmp/xplan-api-validator-*.war
+USER 1001
-USER 1001
\ No newline at end of file
+ENTRYPOINT ["/bin/sh", "/xplanbox/run.sh"]
diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-api/xplan-api-validator/pom.xml
index bbd4f2e98ec3abe73bc43d6bc2ba3f021ced5e97..0fbe8a8b7b68cd330e3cf35f08d5f535ce745d79 100755
--- a/xplan-api/xplan-api-validator/pom.xml
+++ b/xplan-api/xplan-api-validator/pom.xml
@@ -2,15 +2,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>xplan-api-validator</artifactId>
- <packaging>war</packaging>
- <name>xplan-api-validator</name>
+ <packaging>jar</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
@@ -57,6 +68,28 @@
</executions>
-->
</plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -78,7 +111,6 @@
<dependency>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- XPlanung -->
<dependency>
@@ -86,22 +118,14 @@
<artifactId>regeln</artifactId>
</dependency>
<!-- Javax -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
- <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -112,32 +136,26 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
- <version>${jersey.version}</version>
</dependency>
<!-- Swagger 3 -->
<dependency>
@@ -165,22 +183,18 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
</dependency>
<!-- Bean Validation API support -->
<dependency>
@@ -189,9 +203,10 @@
</dependency>
<!-- spring -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
</dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -218,42 +233,31 @@
<artifactId>log4j-layout-template-json</artifactId>
</dependency>
<!-- test -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-inmemory</artifactId>
- <version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -299,7 +303,7 @@
<docker-image.name>xplan-validator-api</docker-image.name>
</properties>
<dependencies>
- <dependency> <!-- faked maven dependency to be after base docker image in the reactor build -->
+ <dependency> <!-- to copy jmx exporter stuff from docker image -->
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker-tomcat</artifactId>
<version>${project.version}</version>
diff --git a/xplan-api/xplan-api-validator/run.sh b/xplan-api/xplan-api-validator/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d12d67ccd8497bb2b4bc582a7eb5b75e5160e792
--- /dev/null
+++ b/xplan-api/xplan-api-validator/run.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ALL_ADDITIONAL_ARGS=$(env | grep ^JAVA_ADDITIONAL_ | sed 's/^JAVA_ADDITIONAL_[[:alnum:]_]*=//' | tr '\n' ' ')
+
+if [ -n "${ALL_ADDITIONAL_ARGS}" ]; then
+ JAVA_OPTS=$(eval "echo $ALL_ADDITIONAL_ARGS")
+ echo "xPlanBox JAVA_OPTS set: $JAVA_OPTS"
+fi
+
+exec java $JAVA_OPTS -jar /xplanbox/app.jar
diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationInitializer.java b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationInitializer.java
deleted file mode 100644
index 1cc5bd4dbcf29e6159fd281c8b874cadf14668b5..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationInitializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * #%L
- * xplan-api-validator - Modul zur Gruppierung der REST-API
- * %%
- * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- * %%
- * This program is free software: you can redistribute it and/or modify
- * 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%
- */
-package de.latlon.xplanbox.api.validator;
-
-import de.latlon.xplanbox.api.validator.config.ApplicationContext;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
- */
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class ApplicationInitializer implements WebApplicationInitializer {
-
- @Override
- public void onStartup(ServletContext servletContext) throws ServletException {
- AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
- servletContext.addListener(new ContextLoaderListener(context));
- servletContext.setInitParameter("contextConfigLocation", ApplicationContext.class.getCanonicalName());
- }
-
-}
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
new file mode 100644
index 0000000000000000000000000000000000000000..7bb58b188a46c20adc877451e0666e444036fabb
--- /dev/null
+++ b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
@@ -0,0 +1,15 @@
+package de.latlon.xplanbox.api.validator;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackages = { "de.latlon.xplanbox.api.validator.config" })
+public class SpringBootApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SpringBootApp.class, args);
+ }
+
+}
diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java
index b7301d15d2f5985aa7606398ff9cabf253a3fa90..fc4c339c3ca6054578d24b54441598896322275d 100644
--- a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java
+++ b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java
@@ -20,6 +20,22 @@
*/
package de.latlon.xplanbox.api.validator.config;
+import static java.nio.file.Files.createTempDirectory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.io.ResourceLoader;
+
import de.latlon.xplan.commons.configuration.PropertiesLoader;
import de.latlon.xplan.commons.configuration.SystemPropertyPropertiesLoader;
import de.latlon.xplan.manager.web.shared.ConfigurationException;
@@ -41,21 +57,6 @@ import de.latlon.xplan.validator.syntactic.SyntacticValidator;
import de.latlon.xplan.validator.syntactic.SyntacticValidatorImpl;
import de.latlon.xplan.validator.wms.config.ValidatorWmsContext;
import de.latlon.xplanbox.api.commons.handler.SystemConfigHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.io.ResourceLoader;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static java.nio.file.Files.createTempDirectory;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationPathConfig.java b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java
similarity index 78%
rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationPathConfig.java
rename to xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java
index 7704e0bb6d8906da7a8e31d265affc1dce586255..75e2a77594203c6ac0680589bfeaf22d3fff3a91 100644
--- a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/ApplicationPathConfig.java
+++ b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java
@@ -18,12 +18,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-package de.latlon.xplanbox.api.validator;
+package de.latlon.xplanbox.api.validator.config;
import de.latlon.xplanbox.api.commons.ObjectMapperContextResolver;
+import de.latlon.xplanbox.api.commons.converter.StringListConverterProvider;
+import de.latlon.xplanbox.api.commons.exception.ConstraintViolationExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.UnsupportedContentTypeExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.ValidatorExceptionMapper;
+import de.latlon.xplanbox.api.commons.exception.XPlanApiExceptionMapper;
import de.latlon.xplanbox.api.commons.openapi.OpenApiFilter;
-import de.latlon.xplanbox.api.validator.config.ValidatorApiConfiguration;
import de.latlon.xplanbox.api.validator.v1.DefaultApi;
+import de.latlon.xplanbox.api.validator.v1.InfoApi;
+import de.latlon.xplanbox.api.validator.v1.Status;
+import de.latlon.xplanbox.api.validator.v1.ValidateApi;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
import io.swagger.v3.oas.models.ExternalDocumentation;
import io.swagger.v3.oas.models.OpenAPI;
@@ -33,7 +40,9 @@ import io.swagger.v3.oas.models.info.License;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.oas.models.tags.Tag;
import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
import org.slf4j.Logger;
+import org.springframework.context.annotation.Configuration;
import javax.servlet.ServletContext;
import javax.ws.rs.ApplicationPath;
@@ -55,24 +64,31 @@ import static org.slf4j.LoggerFactory.getLogger;
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
@ApplicationPath("/xvalidator/api/v1")
-public class ApplicationPathConfig extends ResourceConfig {
+@Configuration
+public class JerseyConfig extends ResourceConfig {
- private static final Logger LOG = getLogger(ApplicationPathConfig.class);
+ private static final Logger LOG = getLogger(JerseyConfig.class);
private static final String APP_PATH = "xvalidator/api/v1";
- public ApplicationPathConfig(@Context ServletContext servletContext,
- ValidatorApiConfiguration validatorApiConfiguration) {
- super();
+ public JerseyConfig(@Context ServletContext servletContext, ValidatorApiConfiguration validatorApiConfiguration) {
+ property(ServerProperties.WADL_FEATURE_DISABLE, true);
+
register(new ObjectMapperContextResolver());
- packages("de.latlon.xplanbox.api.validator.config");
- packages("de.latlon.xplanbox.api.validator.handler");
- packages("de.latlon.xplanbox.api.validator.v1");
- packages("de.latlon.xplanbox.api.commons.exception");
- packages("de.latlon.xplanbox.api.commons.converter");
+
+ register(InfoApi.class);
+ register(ValidateApi.class);
+ register(Status.class);
+ register(ConstraintViolationExceptionMapper.class);
+ register(ConstraintViolationExceptionMapper.class);
+ register(UnsupportedContentTypeExceptionMapper.class);
+ register(ValidatorExceptionMapper.class);
+ register(XPlanApiExceptionMapper.class);
+ register(StringListConverterProvider.class);
+
OpenAPI openApi = new OpenAPI();
openApi.setInfo(new Info().title("XPlanValidatorAPI")
- .version("1.2.0")
+ .version("1.3.0")
.description("XPlanValidator REST API")
.termsOfService(getTermsOfService(validatorApiConfiguration))
.license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")));
diff --git a/xplan-api/xplan-api-validator/src/main/resources/application.properties b/xplan-api/xplan-api-validator/src/main/resources/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..50e34e6c7b3f56f4245210db1a0226620a521ccc
--- /dev/null
+++ b/xplan-api/xplan-api-validator/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+server.servlet.context-path=/xplan-api-validator
+
+logging.level.root=warn
+logging.level.de.latlon=debug
+logging.level.org.springframework.web=debug
+logging.level.org.hibernate=error
\ No newline at end of file
diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..62ce94216a59ad0c7f53dd83af896d8db9783aa8
--- /dev/null
+++ b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java
@@ -0,0 +1,17 @@
+package de.latlon.xplanbox.api.validator;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import de.latlon.xplanbox.api.validator.config.TestContext;
+
+@SpringBootTest
+@ContextConfiguration(classes = { TestContext.class })
+class SpringBootAppTest {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java
index 68d33eac883adc54bf9b97b67d3ec3aed5acd0d4..11057a44c557c1dd9b5ec24fae1d826ca196f589 100644
--- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java
+++ b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java
@@ -20,29 +20,25 @@
*/
package de.latlon.xplanbox.api.validator.config;
-import de.latlon.xplan.commons.archive.SemanticValidableXPlanArchive;
-import de.latlon.xplan.validator.semantic.configuration.metadata.RulesMetadata;
-import de.latlon.xplan.validator.semantic.profile.SemanticProfileValidator;
-import de.latlon.xplan.validator.semantic.profile.SemanticProfiles;
-import de.latlon.xplan.validator.semantic.report.SemanticValidatorResult;
-import de.latlon.xplanbox.api.validator.v1.DefaultApi;
-import de.latlon.xplanbox.api.validator.v1.InfoApi;
-import de.latlon.xplanbox.api.validator.v1.ValidateApi;
-import org.glassfish.jersey.server.ResourceConfig;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import javax.annotation.PostConstruct;
+
import org.slf4j.Logger;
import org.slf4j.bridge.SLF4JBridgeHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-
-import javax.annotation.PostConstruct;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.slf4j.LoggerFactory.getLogger;
+import de.latlon.xplan.commons.archive.SemanticValidableXPlanArchive;
+import de.latlon.xplan.validator.semantic.configuration.metadata.RulesMetadata;
+import de.latlon.xplan.validator.semantic.profile.SemanticProfileValidator;
+import de.latlon.xplan.validator.semantic.profile.SemanticProfiles;
+import de.latlon.xplan.validator.semantic.report.SemanticValidatorResult;
/**
* Indented to register the JAX-RS resources within Spring Application Context. TODO
@@ -55,16 +51,6 @@ public class TestContext {
private static final Logger LOG = getLogger(TestContext.class);
- @Bean
- @Profile("jaxrs")
- ResourceConfig resourceConfig() {
- ResourceConfig jerseyConfig = new ResourceConfig();
- jerseyConfig.register(ValidateApi.class);
- jerseyConfig.register(InfoApi.class);
- jerseyConfig.register(DefaultApi.class);
- return jerseyConfig;
- }
-
@PostConstruct
void initLoggingAdapter() {
SLF4JBridgeHandler.removeHandlersForRootLogger();
diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java
index c1a646eb213ab0c5dbb0a6855ef2e8dfac483003..67dddf01dc0cd9efab383e566635663a0f1c0898 100644
--- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java
+++ b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import javax.servlet.ServletContext;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;
@@ -37,18 +38,22 @@ import org.glassfish.jersey.test.TestProperties;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mockito;
+import org.springframework.boot.test.json.BasicJsonTester;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import de.latlon.xplan.commons.configuration.DefaultPropertiesLoader;
import de.latlon.xplanbox.api.validator.config.ApplicationContext;
-import de.latlon.xplanbox.api.validator.config.TestContext;
+import de.latlon.xplanbox.api.validator.config.JerseyConfig;
+import de.latlon.xplanbox.api.validator.config.ValidatorApiConfiguration;
/**
* @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a>
*/
-public class DefaultApiTest extends JerseyTest {
+class DefaultApiTest extends JerseyTest {
@TempDir
- public static Path tempFolder;
+ static Path tempFolder;
@BeforeAll
static void setupFakedWorkspace() throws IOException {
@@ -60,9 +65,20 @@ public class DefaultApiTest extends JerseyTest {
@Override
protected Application configure() {
enable(TestProperties.LOG_TRAFFIC);
- final ResourceConfig resourceConfig = new ResourceConfig(DefaultApi.class);
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ApplicationContext.class,
- TestContext.class);
+
+ ResourceConfig resourceConfig;
+ ServletContext mockServletContext = Mockito.mock(ServletContext.class);
+ Mockito.when(mockServletContext.getContextPath()).thenReturn("");
+
+ try {
+ ValidatorApiConfiguration validatorConfig = new ValidatorApiConfiguration(
+ new DefaultPropertiesLoader(getClass()));
+ resourceConfig = new JerseyConfig(mockServletContext, validatorConfig);
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ApplicationContext.class);
resourceConfig.property("contextConfig", context);
return resourceConfig;
}
@@ -79,7 +95,43 @@ public class DefaultApiTest extends JerseyTest {
void verifyThat_Response_ContainsOpenApiDocument() {
final String response = target("/").request(APPLICATION_JSON).get(String.class);
- assertThat(response).contains("\"openapi\":\"3.0.1\"");
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response)).extractingJsonPathStringValue("$.openapi").isEqualTo("3.0.1");
+ }
+
+ @Test
+ void verifyThat_Response_ContainsLicence() {
+ final String response = target("/").request(APPLICATION_JSON).get(String.class);
+
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response)).extractingJsonPathStringValue("$.info.license.name").isEqualTo("Apache 2.0");
+ }
+
+ @Test
+ void verifyThat_Response_Paths() {
+ final String response = target("/").request(APPLICATION_JSON).get(String.class);
+
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response)).extractingJsonPathMapValue("$.paths")
+ .containsOnlyKeys("/", "/info", "/validate");
+ }
+
+ @Test
+ void verifyThat_Response_ContainsTermsOfService() {
+ final String response = target("/").request(APPLICATION_JSON).get(String.class);
+
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response)).extractingJsonPathStringValue("$.info.termsOfService")
+ .isEqualTo("http://xplanbox/api-validator/terms");
+ }
+
+ @Test
+ void verifyThat_Response_ContainsServersUrl() {
+ final String response = target("/").request(APPLICATION_JSON).get(String.class);
+
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response)).extractingJsonPathStringValue("$.servers[0].url")
+ .isEqualTo("http://xplanbox-api-validator/xvalidator/api/v1");
}
}
diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java
index 0fb04f49262950aa7a13bb80bcd0d919e0e55d43..27cd704070b3dd3e25b28f980a013f92363b1c61 100644
--- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java
+++ b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.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%
@@ -38,6 +38,7 @@ import org.glassfish.jersey.test.TestProperties;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+import org.springframework.boot.test.json.BasicJsonTester;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import de.latlon.xplanbox.api.validator.config.ApplicationContext;
@@ -46,7 +47,7 @@ import de.latlon.xplanbox.api.validator.config.TestContext;
/**
* @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a>
*/
-public class InfoApiTest extends JerseyTest {
+class InfoApiTest extends JerseyTest {
@TempDir
public static Path tempFolder;
@@ -74,6 +75,11 @@ public class InfoApiTest extends JerseyTest {
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
assertEquals(APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
+
+ BasicJsonTester json = new BasicJsonTester(getClass());
+ assertThat(json.from(response.readEntity(String.class))).extractingJsonPathStringValue("$.rulesMetadata.source")
+ .startsWith("https://gitlab.opencode.de/xleitstelle/xplanung/validierungsregeln/standard/-/tree/");
+
}
@Test
diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java
index 8bc42a2f0c999f972997a4084908f8390eca15b2..cac5dd6d620dbb412bbf8ed8f979dd4bcadec3c7 100644
--- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java
+++ b/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java
@@ -20,40 +20,51 @@
*/
package de.latlon.xplanbox.api.validator.v1;
-import de.latlon.xplan.validator.semantic.profile.SemanticProfiles;
-import de.latlon.xplanbox.api.validator.config.ApplicationContext;
-import de.latlon.xplanbox.api.validator.config.TestContext;
+import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_X_ZIP;
+import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_X_ZIP_COMPRESSED;
+import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_ZIP;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
+import static javax.ws.rs.core.MediaType.APPLICATION_XML;
+import static javax.ws.rs.core.MediaType.TEXT_XML;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+
import org.apache.http.HttpHeaders;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.TestProperties;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_X_ZIP;
-import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_X_ZIP_COMPRESSED;
-import static de.latlon.xplanbox.api.commons.XPlanBoxMediaType.APPLICATION_ZIP;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
-import static javax.ws.rs.core.MediaType.TEXT_XML;
-import static org.assertj.core.api.Assertions.assertThat;
+import de.latlon.xplan.commons.configuration.DefaultPropertiesLoader;
+import de.latlon.xplan.validator.semantic.profile.SemanticProfiles;
+import de.latlon.xplanbox.api.validator.config.ApplicationContext;
+import de.latlon.xplanbox.api.validator.config.JerseyConfig;
+import de.latlon.xplanbox.api.validator.config.TestContext;
+import de.latlon.xplanbox.api.validator.config.ValidatorApiConfiguration;
/**
* @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a>
*/
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { TestContext.class })
public class ValidateApiTest extends JerseyTest {
@TempDir
@@ -71,14 +82,21 @@ public class ValidateApiTest extends JerseyTest {
@Override
protected Application configure() {
- enable(TestProperties.LOG_TRAFFIC);
- final ResourceConfig resourceConfig = new ResourceConfig(ValidateApi.class);
+ ResourceConfig resourceConfig;
+ ServletContext mockServletContext = Mockito.mock(ServletContext.class);
+ Mockito.when(mockServletContext.getContextPath()).thenReturn("");
+
+ try {
+ ValidatorApiConfiguration validatorConfig = new ValidatorApiConfiguration(
+ new DefaultPropertiesLoader(getClass()));
+ resourceConfig = new JerseyConfig(mockServletContext, validatorConfig);
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);
+ }
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ApplicationContext.class,
TestContext.class);
resourceConfig.property("contextConfig", context);
- resourceConfig.register(this);
- resourceConfig.packages("de.latlon.xplanbox.api.commons.converter");
- resourceConfig.packages("de.latlon.xplanbox.api.commons.exception");
return resourceConfig;
}
diff --git a/xplan-api/xplan-api-validator/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties b/xplan-api/xplan-api-validator/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties
new file mode 100644
index 0000000000000000000000000000000000000000..44ff92733aa80ecaefc2cb448ca5d1088759cb71
--- /dev/null
+++ b/xplan-api/xplan-api-validator/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties
@@ -0,0 +1,32 @@
+###
+# #%L
+# xplan-validator-config - Modul zur Gruppierung der Konfiguration
+# %%
+# Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+# %%
+# This program is free software: you can redistribute it and/or modify
+# 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%
+###
+# URL der XPlanValidatorAPI, die im OpenAPI Dokument ausgegeben wird
+# Default: keine URL, es wird eine relative URL ausgegeben
+apiUrl=http://xplanbox-api-validator/
+
+# Weitere Informationen, die im OpenAPI Dokument ausgegeben werden.
+# Die Angaben sind optional.
+# Kontakt E-Mail Adresse (wenn diese Option fehlt, erfolgt keine Ausgabe)
+contactEMailAddress=test-contact@api-validator.xplanbox
+# URL zu den "Terms of Service" (wenn diese Option fehlt, erfolgt keine Ausgabe)
+termsOfServiceUrl=http://xplanbox/api-validator/terms
+# URL zur Dokumentation der xPlanBox (wenn diese Option fehlt, erfolgt keine Ausgabe)
+documentationUrl=http://xplanbox/api-validator/doc
diff --git a/xplan-cli/pom.xml b/xplan-cli/pom.xml
index 5db5bbeae6a511e1323ed21bdd73bdcb0a75dd48..8454d1047ae6145e364f339127a6016c2450d21a 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/xplan-cli/xplan-cli-docker/Dockerfile b/xplan-cli/xplan-cli-docker/Dockerfile
index 430862d12cb52ba17a99166e70a7185fda86fb23..97cbb4c01b860ff146376a4999d5632d5fe4772b 100644
--- a/xplan-cli/xplan-cli-docker/Dockerfile
+++ b/xplan-cli/xplan-cli-docker/Dockerfile
@@ -21,6 +21,7 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
+ENV TZ=Europe/Berlin
RUN apk --no-cache add bash
COPY target/unpacked-deps/xplan-manager-cli-* /xplanbox/xplan-manager-cli/
diff --git a/xplan-cli/xplan-cli-docker/pom.xml b/xplan-cli/xplan-cli-docker/pom.xml
index 3dc17f0ddb405ab71872de327d2dce6846a4efe1..47bfb11769934deef2578570fceaec444b8979ae 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.0.2</version>
+ <version>7.1-SNAPSHOT</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 50c919749ff2dbfc9d316c354b9556c59b0bb324..b00e4683fc1d3a13c28d30e1c41ceee7a877fbe5 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml
index 09f79d3e7061e2e2c53c161244d30e799dd6190e..0262d40e77c0bbb86e82a2c367656c87d9bb4b4b 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml
index 98f9fc17803797ca0583b5838ad52029d865f77f..daa772796257057b2a3a65334037543b4b62dd18 100644
--- a/xplan-cli/xplan-transform-cli/pom.xml
+++ b/xplan-cli/xplan-transform-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml
index d7b1226785b27d758bbeaac544f36de2ffd78e52..866b40f4fcc833c6369eb31fac26c10f6bf0c2c8 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencyManagement>
diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml
index cb54a93e1be66f1818b3084687669e81524298ba..2338ab9bb0f947149f1b0b302af8d03baa30f473 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml
index b6ecf7e1b527ae39c0401882321e0e2da995b142..119c4ad114863d33817fab19b91a514e3199d1da 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-configuration/pom.xml b/xplan-configuration/pom.xml
index 6e15f21cb6c8a3a15359fb827dc0b9f7eee358cf..abec27419adcc465daebac8d0b19dde5ed6069ab 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
@@ -16,6 +16,7 @@
<module>xplan-validator-config</module>
<module>xplan-dokumenten-config</module>
<module>xplan-mapserver-config</module>
+ <module>xplan-mapproxy-config</module>
</modules>
<build>
diff --git a/xplan-configuration/xplan-dokumenten-config/pom.xml b/xplan-configuration/xplan-dokumenten-config/pom.xml
index 3cd71d7ff77aedde20ed0049070258cad32ffd28..b9fdec02de142ad3206c96e58f6c2565c134431c 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-manager-config/pom.xml b/xplan-configuration/xplan-manager-config/pom.xml
index 494c644dafdb8b82a17591f2363b3b0e34eb316f..6c2a07e7ae04dfe9de76cb0f1327f8563ab8b2bf 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapproxy-config/pom.xml b/xplan-configuration/xplan-mapproxy-config/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..54b51637985abdac581549fe99706b72db638125
--- /dev/null
+++ b/xplan-configuration/xplan-mapproxy-config/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>xplan-mapproxy-config</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>de.latlon.product.xplanbox</groupId>
+ <artifactId>xplan-configuration</artifactId>
+ <version>7.1-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/assembly/assembly.xml b/xplan-configuration/xplan-mapproxy-config/src/main/assembly/assembly.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bda8f86d7e9e3230c3ef1cfb8a5d1ffe80826845
--- /dev/null
+++ b/xplan-configuration/xplan-mapproxy-config/src/main/assembly/assembly.xml
@@ -0,0 +1,35 @@
+<!--
+ #%L
+ xplan-validator-config - Modul zur Gruppierung der Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%
+ -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>xplan-mapproxy-config</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/src/main/resources</directory>
+ <outputDirectory>${file.separator}</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml b/xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c40fd72d3f24f5bd1a959ed7b990111d91c5446c
--- /dev/null
+++ b/xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml
@@ -0,0 +1,281 @@
+parts:
+ wms_cfg: &wms_cfg
+ type: wms
+ wms_opts:
+ featureinfo: true
+ version: 1.3.0
+ supported_srs: ['${XPLAN_SERVICES_DEFAULT_CRS_SRID}']
+ coverage:
+ bbox: [${XPLAN_SERVICES_BBOX_4326}]
+ srs: 'EPSG:4326'
+ cache_cfg: &cache_cfg
+ format: image/png
+ grids: [gdi_de_25832]
+ disable_storage: ${XPLAN_MAPPROXY_CACHE_DISABLE}
+ cache:
+ type: s3
+ directory_layout: reverse_tms
+ md_cfg: &md_cfg
+ online_resource: ${XPLAN_SERVICES_PROVIDER_ONLINERESOURCE}
+ contact:
+ person: ${XPLAN_SERVICES_PROVIDER_CONTACT_NAME}
+ position: ${XPLAN_SERVICES_PROVIDER_CONTACT_POSITIONNAME}
+ organization: ${XPLAN_SERVICES_PROVIDER_NAME}
+ address: ${XPLAN_SERVICES_PROVIDER_CONTACT_ADDRESS_DELIVERYPOINT}
+ city: ${XPLAN_SERVICES_PROVIDER_CONTACT_ADDRESS_CITY}
+ postcode: ${XPLAN_SERVICES_PROVIDER_CONTACT_ADDRESS_POSTALCODE}
+ country: ${XPLAN_SERVICES_PROVIDER_CONTACT_ADDRESS_COUNTRY}
+ phone: ${XPLAN_SERVICES_PROVIDER_CONTACT_PHONE}
+ email: ${XPLAN_SERVICES_PROVIDER_CONTACT_MAIL}
+ access_constraints: Insert license and copyright information for this service.
+ fees: 'None'
+ keyword_list:
+ - vocabulary: GEMET
+ keywords: [land use, land use plan]
+ - keywords: [Bodennutzung, XPlanung]
+services:
+ # für Probes?
+ demo:
+ wms:
+ # TODO XPLAN_SERVICES_QUERY_CRS but with , as delimiter
+ srs: ['EPSG:3857','EPSG:4326','EPSG:25832','EPSG:25833']
+ bbox_srs: ["EPSG:4326"]
+ on_source_errors: raise
+ featureinfo_types: ["text", "html", "xml"]
+ md:
+ title: WMS Cache XPlanung
+ abstract: Gecachter WMS zur Visualisierung von XPlanungsdaten
+ <<: *md_cfg
+ wmts:
+ restful: true
+ restful_template: "/{Layer}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.{Format}"
+ kvp: true
+ md:
+ title: WMTS XPlanung
+ abstract: WMTS zur Visualisierung von XPlanungsdaten
+ <<: *md_cfg
+layers:
+ - name: xplan_bplan
+ title: XPlanung Bebauungspläne
+ layers:
+ - name: bplan_raster
+ title: Rasterdarstellung der Bebauungspläne
+ sources: [bplan_raster_cache]
+ tile_sources: [bplan_raster_cache, bplan_raster_cache_3857]
+ min_res: 1.4
+ max_res: 0.28
+ - name: bplan_vektor
+ title: Vektordarstellung der Bebauungspläne
+ sources: [bplan_vektor_cache]
+ tile_sources: [bplan_vektor_cache, bplan_vektor_cache_3857]
+ min_res: 1.4
+ max_res: 0.28
+ - name: xplan_fplan
+ title: XPlanung Flächennutzungspläne
+ layers:
+ - name: fplan_raster
+ title: Rasterdarstellung der Flächennutzungspläne
+ sources: [fplan_raster_cache]
+ tile_sources: [fplan_raster_cache, fplan_raster_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: fplan_vektor
+ title: Vektordarstellung der Flächennutzungspläne
+ sources: [fplan_vektor_cache]
+ tile_sources: [fplan_vektor_cache, fplan_vektor_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: xplan_lplan
+ title: XPlanung Landschaftspläne
+ layers:
+ - name: lplan_raster
+ title: Rasterdarstellung der Landschaftspläne
+ sources: [lplan_raster_cache]
+ tile_sources: [lplan_raster_cache, lplan_raster_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: lplan_vektor
+ title: Vektordarstellung der Landschaftspläne
+ sources: [lplan_vektor_cache]
+ tile_sources: [lplan_vektor_cache, lplan_vektor_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: xplan_rplan
+ title: XPlanung Regionalpläne
+ layers:
+ - name: rplan_raster
+ title: Rasterdarstellung der Regionalpläne
+ sources: [rplan_raster_cache]
+ tile_sources: [rplan_raster_cache, rplan_raster_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: rplan_vektor
+ title: Vektordarstellung der Regionalpläne
+ sources: [rplan_vektor_cache]
+ tile_sources: [rplan_vektor_cache, rplan_vektor_cache_3857]
+ min_res: 7.0
+ max_res: 1.4
+ - name: xplan_soplan
+ title: XPlanung sonstige raumbezogene Pläne
+ layers:
+ - name: soplan_raster
+ title: Rasterdarstellung der sonstigen raumbezogenen Pläne
+ sources: [soplan_raster_cache]
+ tile_sources: [soplan_raster_cache, soplan_raster_cache_3857]
+ min_res: 1.4
+ max_res: 0.28
+ - name: soplan_vektor
+ title: Vektordarstellung der sonstigen raumbezogenen Pläne
+ sources: [soplan_vektor_cache]
+ tile_sources: [soplan_vektor_cache, soplan_vektor_cache_3857]
+ min_res: 1.4
+ max_res: 0.28
+caches:
+ bplan_raster_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [bplan_raster_cache]
+ bplan_vektor_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [bplan_vektor_cache]
+ fplan_raster_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [fplan_raster_cache]
+ fplan_vektor_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [fplan_vektor_cache]
+ lplan_raster_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [lplan_raster_cache]
+ lplan_vektor_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [lplan_vektor_cache]
+ rplan_raster_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [rplan_raster_cache]
+ rplan_vektor_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [rplan_vektor_cache]
+ soplan_raster_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [soplan_raster_cache]
+ soplan_vektor_cache_3857:
+ grids: [GLOBAL_WEBMERCATOR]
+ sources: [soplan_vektor_cache]
+ bplan_raster_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /bplan_raster/
+ type: s3
+ sources: ['xplan-mapserver:bplanraster']
+ bplan_vektor_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /bplan_vektor/
+ type: s3
+ sources: ['bplan-wms:BP_Planvektor']
+ fplan_raster_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /fplan_raster/
+ type: s3
+ sources: ['xplan-mapserver:fplanraster']
+ fplan_vektor_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /fplan_vektor/
+ type: s3
+ sources: ['fplan-wms:FP_Planvektor']
+ lplan_raster_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /lplan_raster/
+ type: s3
+ sources: ['xplan-mapserver:lplanraster']
+ lplan_vektor_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /lplan_vektor/
+ type: s3
+ sources: ['lplan-wms:LP_Planvektor']
+ rplan_raster_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /rplan_raster/
+ type: s3
+ sources: ['xplan-mapserver:rplanraster']
+ rplan_vektor_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /rplan_vektor/
+ type: s3
+ sources: ['rplan-wms:RP_Planvektor']
+ soplan_raster_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /soplan_raster/
+ type: s3
+ sources: ['xplan-mapserver:soplanraster']
+ soplan_vektor_cache:
+ <<: *cache_cfg
+ cache:
+ directory: /soplan_vektor/
+ type: s3
+ sources: ['soplan-wms:SO_Planvektor']
+sources:
+ xplan-mapserver:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_MAPSERVER_URL_INTERNAL}/mapserver?
+ transparent: true
+ bplan-wms:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/bpwms?
+ transparent: true
+ fplan-wms:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/fpwms?
+ transparent: true
+ lplan-wms:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/lpwms?
+ transparent: true
+ rplan-wms:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/rpwms?
+ transparent: true
+ soplan-wms:
+ <<: *wms_cfg
+ req:
+ url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/sowms?
+ transparent: true
+grids:
+ gdi_de_25832:
+ srs: 'EPSG:25832'
+ tile_size: [512, 512]
+ res: [28.0,14.0,7.0,2.8,1.4,0.7,0.28]
+ bbox: [${XPLAN_SERVICES_BBOX_4326}]
+ bbox_srs: 'EPSG:4326'
+ origin: 'ul'
+globals:
+ cache:
+ lock_dir: "./cache_data/locks"
+ tile_lock_dir: "./cache_data/tile_locks"
+ s3:
+ endpoint_url: https://${XPLAN_S3_ENDPOINT}
+ bucket_name: ${XPLAN_S3_BUCKET_NAME_MAPPROXY_CACHE}
+ region_name: ${XPLAN_S3_REGION}
+ image:
+ paletted: false
+ resampling_method: bicubic
+ formats:
+ image/png:
+ encoding_options:
+ quantizer: fastoctree
+ http:
+ ssl_no_cert_checks: true
+ client_timeout: 300
+ method: GET
\ No newline at end of file
diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml b/xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..21ac90eedb4705a65dc2fe5cfbec8bb4733448fc
--- /dev/null
+++ b/xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml
@@ -0,0 +1,63 @@
+seeds:
+ bpreseed:
+ caches: [bplan_raster_cache,bplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [bpchanges]
+ refresh_before:
+ days: 0
+ fpreseed:
+ caches: [fplan_raster_cache,fplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [fpchanges]
+ refresh_before:
+ days: 0
+ lpreseed:
+ caches: [lplan_raster_cache,lplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [lpchanges]
+ refresh_before:
+ days: 0
+ rpreseed:
+ caches: [rplan_raster_cache,rplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [rpchanges]
+ refresh_before:
+ days: 0
+ soreseed:
+ caches: [soplan_raster_cache,soplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [sochanges]
+ refresh_before:
+ days: 0
+ # wird bei einem frischen Deployment vermutlich gar nicht benötigt?
+ fullseed:
+ caches: [bplan_raster_cache,bplan_vektor_cache,fplan_raster_cache,fplan_vektor_cache,lplan_raster_cache,lplan_vektor_cache,rplan_raster_cache,rplan_vektor_cache,soplan_raster_cache,soplan_vektor_cache]
+ grids: [gdi_de_25832]
+ coverages: [full]
+ refresh_before:
+ days: 0
+coverages:
+ bpchanges:
+ # da die Connection mit PQconnectdb()/libpq gemacht wird, müssten alle Verbindungsparameter über ENVs gesetzt werden können: https://www.postgresql.org/docs/12/libpq-envars.html (ungetestet)
+ datasource: "PG:"
+ where: "select * from xplanmgr.planslog where xp_type='BP_Plan' and (planstatus_new='Festgestellt' or planstatus_old='Festgestellt') and last_update_date > localtimestamp - interval '1 day'"
+ srs: 'EPSG:4326'
+ fpchanges:
+ datasource: "PG:"
+ where: "select * from xplanmgr.planslog where xp_type='FP_Plan' and (planstatus_new='Festgestellt' or planstatus_old='Festgestellt') and last_update_date > localtimestamp - interval '1 day'"
+ srs: 'EPSG:4326'
+ lpchanges:
+ datasource: "PG:"
+ where: "select * from xplanmgr.planslog where xp_type='LP_Plan' and (planstatus_new='Festgestellt' or planstatus_old='Festgestellt') and last_update_date > localtimestamp - interval '1 day'"
+ srs: 'EPSG:4326'
+ rpchanges:
+ datasource: "PG:"
+ where: "select * from xplanmgr.planslog where xp_type='RP_Plan' and (planstatus_new='Festgestellt' or planstatus_old='Festgestellt') and last_update_date > localtimestamp - interval '1 day'"
+ srs: 'EPSG:4326'
+ sochanges:
+ datasource: "PG:"
+ where: "select * from xplanmgr.planslog where xp_type='SO_Plan' and (planstatus_new='Festgestellt' or planstatus_old='Festgestellt') and last_update_date > localtimestamp - interval '1 day'"
+ srs: 'EPSG:4326'
+ full:
+ bbox: [${XPLAN_SERVICES_BBOX_4326}]
+ srs: 'EPSG:4326'
\ No newline at end of file
diff --git a/xplan-configuration/xplan-mapserver-config/pom.xml b/xplan-configuration/xplan-mapserver-config/pom.xml
index b51c5461bd4b591e8881615d4b72c6836c4a2f9f..a19ffdc74af7a05218fa944b3c01d9deccdf5f8d 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-validator-config/pom.xml b/xplan-configuration/xplan-validator-config/pom.xml
index a25b5b1197b97b264532fdd53438cd5026a43c70..4a335ec5fa72cf5ec60f8b918ef4430566a8c0b7 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-core/pom.xml b/xplan-core/pom.xml
index 1a76969526d5a4656a4f77d6362beb7824024aad..39e3686d86383f53cd403c164aef548382e5c8fe 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-core/xplan-commons-cli/pom.xml
index 41a618e7cffc91ea177339f4361143d30f69ed88..de6d1db549f3f6a33f114c36cab12023966221d0 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-commons/pom.xml
index b10cd5d9177a446159a9a5fbc0b0e61d4b2a62a9..8279068d95a49403c0362af52e3a3d69053bb048 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
@@ -52,7 +52,6 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -75,13 +74,19 @@
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
- <artifactId>system-stubs-junit4</artifactId>
- <version>2.0.2</version>
+ <artifactId>system-stubs-jupiter</artifactId>
+ <version>2.1.3</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -102,11 +107,14 @@
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
+ <artifactId>xmlunit-assertj3</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
index 3736abb4465919a00caf29594accda063e698ce6..a04715f1db801242da2e4194536a6cf633046a22 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
@@ -27,24 +27,22 @@ import de.latlon.xplan.commons.feature.XPlanFeatureCollection;
import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder;
import org.deegree.geometry.Envelope;
import org.deegree.geometry.SimpleGeometryFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.text.SimpleDateFormat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.deegree.cs.CRSUtils.EPSG_4326;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class XPlanFeatureCollectionTest {
+class XPlanFeatureCollectionTest {
@Test
- public void testBPlan004_40() throws Exception {
+ void testBPlan004_40() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan40/BPlan004_4-0.zip");
Envelope expectedBbox = createEnvelopeIn4326(10.017888167320903, 53.58286374820989, 10.019250192073962,
53.58380514142527);
@@ -53,28 +51,28 @@ public class XPlanFeatureCollectionTest {
assertEquals("BPlan004_4-0", fc.getPlanName());
assertNull(fc.getPlanNummer());
assertEquals(64, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testBP2070XPlan41() throws Exception {
+ void testBP2070XPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/BP2070.zip");
Envelope expectedBbox = createEnvelopeIn4326(8.677866116091622, 53.13336118980635, 8.71389373561357,
53.149394465922974);
assertEquals("4011000", fc.getPlanGkz());
assertEquals(314, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testBP2135XPlan41() throws Exception {
+ void testBP2135XPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/BP2135.zip");
Envelope expectedBbox = createEnvelopeIn4326(8.868225190603235, 53.02503052421284, 8.898393606163037,
53.03851016123366);
@@ -83,14 +81,14 @@ public class XPlanFeatureCollectionTest {
assertEquals("Bebauungsplan 2135", fc.getPlanName());
assertEquals("2135", fc.getPlanNummer());
assertEquals(241, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testDemoXPlan41() throws Exception {
+ void testDemoXPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/Demo.zip");
Envelope expectedBbox = createEnvelopeIn4326(15.272746104246893, 49.46495151773874, 15.275043422963378,
49.466076083919255);
@@ -99,14 +97,14 @@ public class XPlanFeatureCollectionTest {
assertEquals("BPlan Demo-Gemeinde", fc.getPlanName());
assertNull(fc.getPlanNummer());
assertEquals(20, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testEidelstedt_4_V4XPlan41() throws Exception {
+ void testEidelstedt_4_V4XPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/Eidelstedt_4_V4.zip");
Envelope expectedBbox = createEnvelopeIn4326(9.900051499510967, 53.5915672483709, 9.909280908661561,
53.5981347454368);
@@ -115,25 +113,25 @@ public class XPlanFeatureCollectionTest {
assertEquals("Eidelstedt 4", fc.getPlanName());
assertNull(fc.getPlanNummer());
assertEquals(56, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testFPlanXPlan41() throws Exception {
+ void testFPlanXPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/FPlan.zip");
assertEquals("12062024", fc.getPlanGkz());
assertEquals("FPlan Bad Liebenwerda", fc.getPlanName());
assertNull(fc.getPlanNummer());
assertEquals(3602, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326(), nullValue());
+ assertThat(fc.getBboxIn4326()).isNull();
}
@Test
- public void testLA22XPlan41() throws Exception {
+ void testLA22XPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/LA22.zip");
Envelope expectedBbox = createEnvelopeIn4326(10.000865275035721, 53.667522639460394, 10.016612488700352,
53.677413993384334);
@@ -142,14 +140,14 @@ public class XPlanFeatureCollectionTest {
assertEquals("Bebauungsplan LA 22", fc.getPlanName());
assertEquals("LA 22", fc.getPlanNummer());
assertEquals(1349, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testLA67XPlan41() throws Exception {
+ void testLA67XPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/LA67.zip");
Envelope expectedBbox = createEnvelopeIn4326(9.994207973546764, 53.67757637094817, 10.000593706220158,
53.68050184599885);
@@ -158,14 +156,14 @@ public class XPlanFeatureCollectionTest {
assertEquals("Bebauungsplan LA 22", fc.getPlanName());
assertEquals("LA 22", fc.getPlanNummer());
assertEquals(146, fc.getFeatures().size());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testBPlan001_41() throws Exception {
+ void testBPlan001_41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/BPlan001_4-1.zip");
Envelope expectedBbox = createEnvelopeIn4326(10.008563938531246, 53.538185265541415, 10.01873241781561,
53.5407955356869);
@@ -175,22 +173,22 @@ public class XPlanFeatureCollectionTest {
assertNull(fc.getPlanNummer());
assertEquals(206, fc.getFeatures().size());
assertNull(fc.getPlanReleaseDate());
- assertThat(fc.getBboxIn4326().getMin().get0(), is(expectedBbox.getMin().get0()));
- assertThat(fc.getBboxIn4326().getMin().get1(), is(expectedBbox.getMin().get1()));
- assertThat(fc.getBboxIn4326().getMax().get0(), is(expectedBbox.getMax().get0()));
- assertThat(fc.getBboxIn4326().getMax().get1(), is(expectedBbox.getMax().get1()));
+ assertThat(fc.getBboxIn4326().getMin().get0()).isEqualTo(expectedBbox.getMin().get0());
+ assertThat(fc.getBboxIn4326().getMin().get1()).isEqualTo(expectedBbox.getMin().get1());
+ assertThat(fc.getBboxIn4326().getMax().get0()).isEqualTo(expectedBbox.getMax().get0());
+ assertThat(fc.getBboxIn4326().getMax().get1()).isEqualTo(expectedBbox.getMax().get1());
}
@Test
- public void testFPlanWithWirksamkeitsDatumXPlan41() throws Exception {
+ void testFPlanWithWirksamkeitsDatumXPlan41() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/FPlan-with-wirksamkeitsDatum.zip");
assertEquals("12062024", fc.getPlanGkz());
assertEquals("FPlan Bad Liebenwerda", fc.getPlanName());
assertNull(fc.getPlanNummer());
assertEquals(3602, fc.getFeatures().size());
- assertThat(fc.getPlanReleaseDate(), is(new SimpleDateFormat("yyyy-MM-dd").parse("2015-02-03")));
- assertThat(fc.getBboxIn4326(), nullValue());
+ assertThat(fc.getPlanReleaseDate()).isEqualTo(new SimpleDateFormat("yyyy-MM-dd").parse("2015-02-03"));
+ assertThat(fc.getBboxIn4326()).isNull();
}
private XPlanFeatureCollection getMainFileAsXplanFeatureCollection(String name) throws Exception {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
index a63697f2ba92f7ef5ab2a9b6712567c61d35c7c6..6e142dca18ed021b4e21ad5004671afb8d4ed807 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
@@ -23,7 +23,7 @@ package de.latlon.xplan.commons.archive;
import de.latlon.xplan.ResourceAccessor;
import org.deegree.cs.exceptions.UnknownCRSException;
import org.deegree.cs.persistence.CRSManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.io.IOException;
@@ -36,18 +36,19 @@ import static de.latlon.xplan.commons.XPlanVersion.XPLAN_40;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_41;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_51;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_52;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
* @version $Revision: $, $Date: $
*/
-public class XPlanArchiveCreatorTest {
+class XPlanArchiveCreatorTest {
@Test
- public void testMetadataBP2070XPlan41() throws IOException {
+ void testMetadataBP2070XPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/BP2070.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -55,7 +56,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataBP2135XPlan41() throws IOException {
+ void testMetadataBP2135XPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/BP2135.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -63,7 +64,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataDemoXPlan41() throws IOException {
+ void testMetadataDemoXPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/Demo.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -71,7 +72,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataEidelstedt_4_V4XPlan41() throws IOException {
+ void testMetadataEidelstedt_4_V4XPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/Eidelstedt_4_V4.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -79,7 +80,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataFPlanXPlan41() throws IOException {
+ void testMetadataFPlanXPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/FPlan.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(FP_Plan, archive.getType());
@@ -87,7 +88,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataLA22XPlan41() throws IOException {
+ void testMetadataLA22XPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/LA22.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -95,7 +96,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataLA67XPlan41() throws IOException {
+ void testMetadataLA67XPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/LA67.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -103,7 +104,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataBPlan001_41() throws IOException {
+ void testMetadataBPlan001_41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/BPlan001_4-1.zip");
assertEquals(XPLAN_41, archive.getVersion());
@@ -112,7 +113,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataEidelstedt4V4EimsbuettelXPlan41() throws IOException {
+ void testMetadataEidelstedt4V4EimsbuettelXPlan41() throws IOException {
XPlanArchive archive = getTestArchive("xplan41/Eidelstedt_4_V4-Eimsbuettel.zip");
assertEquals(XPLAN_41, archive.getVersion());
@@ -120,7 +121,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataEidelstedt4V4EimsbuettelXPlan41WithMapper() throws IOException {
+ void testMetadataEidelstedt4V4EimsbuettelXPlan41WithMapper() throws IOException {
XPlanArchive archive = getTestArchiveWithMapper("xplan41/Eidelstedt_4_V4-Eimsbuettel.zip");
assertEquals(XPLAN_41, archive.getVersion());
@@ -128,7 +129,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testMetadataBPlan004_40() throws IOException {
+ void testMetadataBPlan004_40() throws IOException {
XPlanArchive archive = getTestArchive("xplan40/BPlan004_4-0.zip");
assertEquals(XPLAN_40, archive.getVersion());
assertEquals(BP_Plan, archive.getType());
@@ -136,7 +137,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testCreateXPlanArchive_41_SOPlan() throws IOException, UnknownCRSException {
+ void testCreateXPlanArchive_41_SOPlan() throws IOException, UnknownCRSException {
XPlanArchive archive = getTestArchive("xplan41/Erhaltung.zip");
assertEquals(XPLAN_41, archive.getVersion());
assertEquals(0, archive.getDistricts().size());
@@ -144,13 +145,14 @@ public class XPlanArchiveCreatorTest {
assertEquals(CRSManager.lookup("EPSG:25832"), archive.getCrs());
}
- @Test(expected = IllegalArgumentException.class)
- public void testPlanWithWrongGmlFileNameShouldThrowIllegalArgumentException() throws Exception {
- getTestArchive("xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip");
+ @Test
+ void testPlanWithWrongGmlFileNameShouldThrowIllegalArgumentException() throws Exception {
+ assertThrows(IllegalArgumentException.class,
+ () -> getTestArchive("xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip"));
}
@Test
- public void testCreateXPlanArchive_51_GmlFile() throws IOException {
+ void testCreateXPlanArchive_51_GmlFile() throws IOException {
XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper());
InputStream gmlAsStream = ResourceAccessor.readResourceStream("xplan51/BPlan001_5-1.gml");
XPlanArchive archive = archiveCreator.createXPlanArchiveFromGml("BPlan001_5-1.gml", gmlAsStream);
@@ -160,7 +162,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testCreateXPlanArchive_withVerbundenerPlan() throws IOException {
+ void testCreateXPlanArchive_withVerbundenerPlan() throws IOException {
XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper());
InputStream gmlAsStream = XPlanArchiveCreatorTest.class
.getResourceAsStream("../feature/xplan-multipleInstances-withVerbundenerPlan.gml");
@@ -172,7 +174,7 @@ public class XPlanArchiveCreatorTest {
}
@Test
- public void testCreateXPlanArchive_WfsCollection() throws IOException {
+ void testCreateXPlanArchive_WfsCollection() throws IOException {
XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper());
InputStream gmlAsStream = XPlanArchiveCreatorTest.class
.getResourceAsStream("V4_1_ID_103-asWfsFeatureCollection.gml");
@@ -181,20 +183,22 @@ public class XPlanArchiveCreatorTest {
assertEquals(XPLAN_51, archive.getVersion());
}
- @Test(expected = IllegalArgumentException.class)
- public void testCreateXPlanArchive_NoXPlanGml() throws IOException {
+ @Test
+ void testCreateXPlanArchive_NoXPlanGml() throws IOException {
XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper());
InputStream gmlAsStream = XPlanArchiveCreatorTest.class
.getResourceAsStream("V4_1_ID_103-noXPlanGmlCollection.gml");
- archiveCreator.createXPlanArchiveFromGml("V4_1_ID_103-noXPlanGmlCollection.gml", gmlAsStream);
+ assertThrows(IllegalArgumentException.class,
+ () -> archiveCreator.createXPlanArchiveFromGml("V4_1_ID_103-noXPlanGmlCollection.gml", gmlAsStream));
}
- @Test(expected = IllegalArgumentException.class)
- public void testCreateXPlanArchive_withEntity() throws IOException {
+ @Test
+ void testCreateXPlanArchive_withEntity() throws IOException {
XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper());
InputStream zipAsStream = XPlanArchiveCreatorTest.class
.getResourceAsStream("Blankenese29_Test_60_withEntity.zip");
- archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60_withEntity.zip", zipAsStream);
+ assertThrows(IllegalArgumentException.class,
+ () -> archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60_withEntity.zip", zipAsStream));
}
private XPlanArchive getTestArchive(String name) throws IOException {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
index 7f856739ba8b3f5a56b3cec45e3ef6868424362a..dc5089a47744c6ef02a42bba153926d20bcd452c 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
@@ -20,22 +20,20 @@
*/
package de.latlon.xplan.commons.configuration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_40;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_41;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_54;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
*/
-public class SemanticConformityLinkConfigurationTest {
+class SemanticConformityLinkConfigurationTest {
@Test
- public void testRetrieveLink() {
+ void testRetrieveLink() {
SemanticConformityLinkConfiguration linkConfiguration = new SemanticConformityLinkConfiguration();
linkConfiguration.addLink(XPLAN_40, "link1");
linkConfiguration.addLink(XPLAN_41, "link2");
@@ -45,9 +43,9 @@ public class SemanticConformityLinkConfigurationTest {
String overwrittenLink = linkConfiguration.retrieveLink(XPLAN_41);
String unconfiguredLink = linkConfiguration.retrieveLink(XPLAN_54);
- assertThat(firstLink, is("link1"));
- assertThat(overwrittenLink, is("link3"));
- assertThat(unconfiguredLink, nullValue());
+ assertThat(firstLink).isEqualTo("link1");
+ assertThat(overwrittenLink).isEqualTo("link3");
+ assertThat(unconfiguredLink).isNull();
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
index 001ac5dc22b52adfba62ecba8a03b192209aa260..9a37e052c289a1c3dc543066a7f9a42d534f0fcb 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
@@ -20,7 +20,9 @@
*/
package de.latlon.xplan.commons.configuration;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
import static de.latlon.xplan.commons.XPlanType.BP_Plan;
import static de.latlon.xplan.commons.XPlanType.FP_Plan;
@@ -28,17 +30,15 @@ import static de.latlon.xplan.commons.XPlanType.LP_Plan;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_40;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_41;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_50;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
*/
-public class SortConfigurationTest {
+class SortConfigurationTest {
@Test
- public void testRetrieveFeatureType() {
+ void testRetrieveFeatureType() {
SortConfiguration sortConfiguration = new SortConfiguration();
sortConfiguration.addSortField(BP_Plan, XPLAN_40, "ft1", "pn1");
sortConfiguration.addSortField(BP_Plan, XPLAN_41, "ft1", "pn2");
@@ -55,17 +55,17 @@ public class SortConfigurationTest {
String unconfiguredPlanTypeFeatureType = sortConfiguration.retrieveFeatureType(LP_Plan, XPLAN_41);
String unconfiguredVersionFeatureType = sortConfiguration.retrieveFeatureType(BP_Plan, XPLAN_50);
- assertThat(firstFeatureType, is("ft1"));
- assertThat(secondFeatureType, is("ft1"));
- assertThat(thirdFeatureType, is("ft2"));
- assertThat(nullFeatureType, nullValue());
- assertThat(overwrittenFeatureType, is("ft5"));
- assertThat(unconfiguredPlanTypeFeatureType, nullValue());
- assertThat(unconfiguredVersionFeatureType, nullValue());
+ assertThat(firstFeatureType).isEqualTo("ft1");
+ assertThat(secondFeatureType).isEqualTo("ft1");
+ assertThat(thirdFeatureType).isEqualTo("ft2");
+ assertThat(nullFeatureType).isNull();
+ assertThat(overwrittenFeatureType).isEqualTo("ft5");
+ assertThat(unconfiguredPlanTypeFeatureType).isNull();
+ assertThat(unconfiguredVersionFeatureType).isNull();
}
@Test
- public void testRetrievePropertyName() {
+ void testRetrievePropertyName() {
SortConfiguration sortConfiguration = new SortConfiguration();
sortConfiguration.addSortField(BP_Plan, XPLAN_40, "ft1", "pn1");
sortConfiguration.addSortField(BP_Plan, XPLAN_41, "ft1", "pn2");
@@ -82,25 +82,25 @@ public class SortConfigurationTest {
String unconfiguredPlanTypePropertyName = sortConfiguration.retrievePropertyName(LP_Plan, XPLAN_41);
String unconfiguredVersionPropertyName = sortConfiguration.retrievePropertyName(BP_Plan, XPLAN_50);
- assertThat(firstPropertyName, is("pn1"));
- assertThat(secondPropertyName, is("pn2"));
- assertThat(thirdPropertyName, is("pn1"));
- assertThat(nullPropertyName, nullValue());
- assertThat(overwrittenPropertyName, is("pn5"));
- assertThat(unconfiguredPlanTypePropertyName, nullValue());
- assertThat(unconfiguredVersionPropertyName, nullValue());
+ assertThat(firstPropertyName).isEqualTo("pn1");
+ assertThat(secondPropertyName).isEqualTo("pn2");
+ assertThat(thirdPropertyName).isEqualTo("pn1");
+ assertThat(nullPropertyName).isNull();
+ assertThat(overwrittenPropertyName).isEqualTo("pn5");
+ assertThat(unconfiguredPlanTypePropertyName).isNull();
+ assertThat(unconfiguredVersionPropertyName).isNull();
}
- @Test(expected = NullPointerException.class)
- public void testAddSortField_NullPlanType() {
+ @Test
+ void testAddSortField_NullPlanType() {
SortConfiguration sortConfiguration = new SortConfiguration();
- sortConfiguration.addSortField(null, XPLAN_40, "ft1", "pn1");
+ assertThrows(NullPointerException.class, () -> sortConfiguration.addSortField(null, XPLAN_40, "ft1", "pn1"));
}
- @Test(expected = NullPointerException.class)
- public void testAddSortField_NullVersion() {
+ @Test
+ void testAddSortField_NullVersion() {
SortConfiguration sortConfiguration = new SortConfiguration();
- sortConfiguration.addSortField(BP_Plan, null, "ft1", "pn1");
+ assertThrows(NullPointerException.class, () -> sortConfiguration.addSortField(BP_Plan, null, "ft1", "pn1"));
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
index a084a8004237a27248a684fee647f7b08ef94bbd..2dc12da0b1a4170933847fa937dbd5e7b0ec694a 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
@@ -8,22 +8,24 @@
* 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%
*/
package de.latlon.xplan.commons.configuration;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import uk.org.webcompere.systemstubs.rules.SystemPropertiesRule;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+
+import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
+import uk.org.webcompere.systemstubs.properties.SystemProperties;
import java.io.File;
import java.io.IOException;
@@ -33,22 +35,17 @@ import java.nio.file.Paths;
import static de.latlon.xplan.commons.configuration.SystemPropertyPropertiesLoader.CONFIG_SYSTEM_PROPERTY;
import static de.latlon.xplan.commons.configuration.SystemPropertyPropertiesLoader.DEFAULT_SUB_DIIRECTOY;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class SystemPropertyPropertiesLoaderTest {
-
- @Rule
- public TemporaryFolder tmp = new TemporaryFolder();
-
- @Rule
- public SystemPropertiesRule systemProperties = new SystemPropertiesRule();
+@ExtendWith(SystemStubsExtension.class)
+class SystemPropertyPropertiesLoaderTest {
@Test
- public void test_withProperty_XPLANBOX_COFIG() throws IOException {
- File xplanBoxConfig = tmp.newFolder("xplanbox");
+ void test_withProperty_XPLANBOX_COFIG(@TempDir File xplanBoxConfig, SystemProperties systemProperties)
+ throws IOException {
systemProperties.set(CONFIG_SYSTEM_PROPERTY, xplanBoxConfig.toString());
SystemPropertyPropertiesLoader systemPropertyPropertiesLoader = new SystemPropertyPropertiesLoader();
@@ -58,8 +55,7 @@ public class SystemPropertyPropertiesLoaderTest {
}
@Test
- public void test_userhome() throws IOException {
- File userHome = tmp.newFolder("userhome");
+ void test_userhome(@TempDir File userHome, SystemProperties systemProperties) throws IOException {
Path xplanBoxDiectory = Paths.get(userHome.toURI()).resolve(DEFAULT_SUB_DIIRECTOY);
Files.createDirectory(xplanBoxDiectory);
systemProperties.set("user.home", userHome.toString());
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java
index a6dbdafcbef60d630f1db9ad69b9967b44e2b06c..3a7674dc9c433b863fc6e359ca127f9bca96d745 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.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%
@@ -22,8 +22,13 @@ package de.latlon.xplan.commons.feature;
import de.latlon.xplan.commons.XPlanSchemas;
import de.latlon.xplan.commons.XPlanVersion;
+
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.Assert;
+import org.assertj.core.api.Assertions;
import org.deegree.commons.tom.gml.property.Property;
import org.deegree.commons.tom.gml.property.PropertyType;
+import org.deegree.commons.xml.NamespaceBindings;
import org.deegree.feature.Feature;
import org.deegree.feature.FeatureCollection;
import org.deegree.feature.GenericFeatureCollection;
@@ -32,17 +37,15 @@ import org.deegree.feature.types.AppSchema;
import org.deegree.feature.types.FeatureType;
import org.deegree.feature.types.GenericFeatureType;
import org.deegree.feature.types.property.SimplePropertyType;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Iterator;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.deegree.commons.tom.primitive.BaseType.STRING;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* Tests for {@link de.latlon.xplan.commons.feature.FeatureCollectionManipulator}.
@@ -50,7 +53,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
* @author <a href="mailto:stenger@lat-lon.de">Dirk Stenger</a>
* @version $Revision: $, $Date: $
*/
-public class FeatureCollectionManipulatorTest {
+class FeatureCollectionManipulatorTest {
private static final String NAMESPACE_URI = "http://www.xplanung.de/xplangml/4/1";
@@ -66,53 +69,55 @@ public class FeatureCollectionManipulatorTest {
private FeatureCollectionManipulator featureCollectionManipulator = new FeatureCollectionManipulator();
- @Before
- public void initialize() {
+ @BeforeEach
+ void initialize() {
fcWithAllProperties = new GenericFeatureCollection("fc_id1", createFeaturesWithAllProperties());
fcWithoutNameProperty = new GenericFeatureCollection("fc_id2", createFeaturesWithoutNameProperties());
}
@Test
- public void testProcessAdditionOfInternalIdWithBpPlanFeatureShouldContainInternalId() {
+ void testProcessAdditionOfInternalIdWithBpPlanFeatureShouldContainInternalId() {
String internalId = "test_internal_id";
featureCollectionManipulator.addInternalId(fcWithAllProperties, createSchema(), internalId);
- assertThat(fcWithAllProperties, hasNumberOfProperties(FEATURE_NAME_BP_PLAN, 7));
- assertThat(fcWithAllProperties, hasProperty(FEATURE_NAME_BP_PLAN, "internalId", internalId));
+ assertThatFeatureCollection(fcWithAllProperties).hasNumberOfProperties(FEATURE_NAME_BP_PLAN, 7);
+ assertThatFeatureCollection(fcWithAllProperties).hasProperty(FEATURE_NAME_BP_PLAN, "internalId", internalId);
}
@Test
- public void testProcessAdditionOfInternalIdWithTestBpFeaturesShouldNotContainInternalId() {
+ void testProcessAdditionOfInternalIdWithTestBpFeaturesShouldNotContainInternalId() {
String internalId = "test_internal_id";
featureCollectionManipulator.addInternalId(fcWithAllProperties, createSchema(), internalId);
- assertThat(fcWithAllProperties, hasNumberOfProperties(FEATURE_NAME_BP_TEST, 6));
- assertThat(fcWithAllProperties, hasNoProperty(FEATURE_NAME_BP_TEST, "internalId"));
+ assertThatFeatureCollection(fcWithAllProperties).hasNumberOfProperties(FEATURE_NAME_BP_TEST, 6);
+ assertThatFeatureCollection(fcWithAllProperties).hasNoProperty(FEATURE_NAME_BP_TEST, "internalId");
}
@Test
- public void testProcessAdditionOfInternalIdWithBpTestShouldNotContainInternalId() {
+ void testProcessAdditionOfInternalIdWithBpTestShouldNotContainInternalId() {
String internalId = "test_internal_id";
featureCollectionManipulator.addInternalId(fcWithAllProperties, createSchema(), internalId);
- assertThat(fcWithAllProperties, hasNumberOfProperties(FEATURE_NAME_TEST_PLAN, 6));
- assertThat(fcWithAllProperties, hasNoProperty(FEATURE_NAME_TEST_PLAN, "internalId"));
+ assertThatFeatureCollection(fcWithAllProperties).hasNumberOfProperties(FEATURE_NAME_TEST_PLAN, 6);
+ assertThatFeatureCollection(fcWithAllProperties).hasNoProperty(FEATURE_NAME_TEST_PLAN, "internalId");
}
@Test
- public void testProcessAdditionOfInternalIdWithBpPlanFeatureShouldContainInternalIdOnCorrectPosition() {
+ void testProcessAdditionOfInternalIdWithBpPlanFeatureShouldContainInternalIdOnCorrectPosition() {
String propValue = "test_internal_id";
featureCollectionManipulator.addInternalId(fcWithAllProperties, createSchema(), propValue);
- assertThat(fcWithAllProperties, hasProperty(FEATURE_NAME_BP_PLAN, "internalId", propValue, 2));
+ assertThatFeatureCollection(fcWithAllProperties).hasProperty(FEATURE_NAME_BP_PLAN, "internalId", propValue, 2);
+
}
@Test
- public void testProcessAdditionOfInternalIdWithBpPlanFeatureAndReducedPropertiesShouldContainInternalIdOnCorrectPosition() {
+ void testProcessAdditionOfInternalIdWithBpPlanFeatureAndReducedPropertiesShouldContainInternalIdOnCorrectPosition() {
String propValue = "test_internal_id";
featureCollectionManipulator.addInternalId(fcWithoutNameProperty, createSchema(), propValue);
- assertThat(fcWithoutNameProperty, hasProperty(FEATURE_NAME_BP_PLAN, "internalId", propValue, 1));
+ assertThatFeatureCollection(fcWithoutNameProperty).hasProperty(FEATURE_NAME_BP_PLAN, "internalId", propValue,
+ 1);
}
private ArrayList<Feature> createFeaturesWithAllProperties() {
@@ -164,97 +169,77 @@ public class FeatureCollectionManipulatorTest {
return XPlanSchemas.getInstance().getAppSchema(XPlanVersion.XPLAN_41);
}
- private BaseMatcher<FeatureCollection> hasNumberOfProperties(final String featureName, final int noOfProperties) {
- return new BaseMatcher<FeatureCollection>() {
- @Override
- public boolean matches(Object item) {
- Iterator<Feature> iterator = ((FeatureCollection) item).iterator();
- while (iterator.hasNext()) {
- Feature feature = iterator.next();
- if (feature.getType().getName().toString().contains(featureName)) {
- return noOfProperties == feature.getProperties().size();
- }
- }
- throw new IllegalArgumentException("Feature with name " + featureName + " not found!");
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText(
- "Feature with name " + featureName + " should have exactly " + noOfProperties + " properties.");
- }
- };
-
+ FeatureCollectionAssert assertThatFeatureCollection(FeatureCollection actual) {
+ return new FeatureCollectionAssert(actual);
}
- private BaseMatcher<FeatureCollection> hasProperty(final String featureName, final String propertyName,
- final String propertyValue) {
- return hasProperty(featureName, propertyName, propertyValue, -1);
- }
+ static class FeatureCollectionAssert extends AbstractAssert<FeatureCollectionAssert, FeatureCollection> {
- private BaseMatcher<FeatureCollection> hasProperty(final String featureName, final String propertyName,
- final String propertyValue, final int index) {
- return new BaseMatcher<FeatureCollection>() {
-
- @Override
- public boolean matches(Object item) {
- Iterator<Feature> iterator = ((FeatureCollection) item).iterator();
- while (iterator.hasNext()) {
- Feature feature = iterator.next();
- if (feature.getType().getName().toString().contains(featureName)) {
- int position = 0;
- for (Property property : feature.getProperties()) {
- String name = property.getName().getLocalPart();
- if (propertyName.equals(name) && indexIsCorrect(index, position)) {
- return propertyValue.equals(property.getValue().toString());
- }
- position++;
+ protected FeatureCollectionAssert(FeatureCollection actual) {
+ super(actual, FeatureCollectionAssert.class);
+ }
+
+ FeatureCollectionAssert hasNumberOfProperties(final String featureName, final int noOfProperties) {
+ Iterator<Feature> iterator = actual.iterator();
+ while (iterator.hasNext()) {
+ Feature feature = iterator.next();
+ if (feature.getType().getName().toString().contains(featureName)) {
+ Assertions.assertThat(feature.getProperties()).hasSize(noOfProperties);
+ return this;
+ }
+ }
+ throw failure("Feature with name " + featureName + " not found!");
+ }
+
+ FeatureCollectionAssert hasProperty(final String featureName, final String propertyName,
+ final String propertyValue) {
+ return hasProperty(featureName, propertyName, propertyValue, -1);
+ }
+
+ FeatureCollectionAssert hasProperty(final String featureName, final String propertyName,
+ final String propertyValue, final int index) {
+ Iterator<Feature> iterator = actual.iterator();
+ while (iterator.hasNext()) {
+ Feature feature = iterator.next();
+ if (feature.getType().getName().toString().contains(featureName)) {
+ int position = 0;
+ for (Property property : feature.getProperties()) {
+ String name = property.getName().getLocalPart();
+ if (propertyName.equals(name) && indexIsCorrect(index, position)) {
+ Assertions.assertThat(propertyValue).isEqualTo(property.getValue().toString());
+ return this;
}
+ position++;
}
}
- return false;
}
- private boolean indexIsCorrect(final int index, int position) {
- return index == -1 || index == position;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Feature with name " + featureName + " should have a property with name "
- + propertyName + " and value " + propertyValue
- + " at index (0 based, -1 means the index can be ignored) " + index);
- }
- };
-
- }
-
- private BaseMatcher<FeatureCollection> hasNoProperty(final String featureName, final String propertyName) {
- return new BaseMatcher<FeatureCollection>() {
-
- @Override
- public boolean matches(Object item) {
- Iterator<Feature> iterator = ((FeatureCollection) item).iterator();
- while (iterator.hasNext()) {
- Feature feature = iterator.next();
- if (feature.getType().getName().toString().contains(featureName)) {
- for (Property property : feature.getProperties()) {
- String name = property.getName().getLocalPart();
- if (propertyName.equals(name)) {
- return false;
- }
+ throw failure("Feature with name " + featureName + " should have a property with name " + propertyName
+ + " and value " + propertyValue + " at index (0 based, -1 means the index can be ignored) "
+ + index);
+
+ }
+
+ private boolean indexIsCorrect(final int index, int position) {
+ return index == -1 || index == position;
+ }
+
+ FeatureCollectionAssert hasNoProperty(final String featureName, final String propertyName) {
+ Iterator<Feature> iterator = actual.iterator();
+ while (iterator.hasNext()) {
+ Feature feature = iterator.next();
+ if (feature.getType().getName().toString().contains(featureName)) {
+ for (Property property : feature.getProperties()) {
+ String name = property.getName().getLocalPart();
+ if (propertyName.equals(name)) {
+ throw failure("Feature with name " + featureName + " shouldn't have a property with name "
+ + propertyName);
}
}
}
- return true;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText(
- "Feature with name " + featureName + " shouldn't have a property with name " + propertyName);
}
- };
+ return this;
+ }
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
index fb26de35cb06def6e96877280c92d33f9455cb69..ed9a3a0914fea3839e3528ade900038cd49f693c 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
@@ -31,24 +31,22 @@ import org.deegree.filter.FilterEvaluationException;
import org.deegree.filter.IdFilter;
import org.deegree.geometry.primitive.Ring;
import org.deegree.geometry.standard.primitive.DefaultPolygon;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class OrientationFixerTest {
+class OrientationFixerTest {
@Test
- public void testOrientationFixer_validLaufrichtung() throws Exception {
+ void testOrientationFixer_validLaufrichtung() throws Exception {
XPlanArchive testArchive = getArchive("geometryOrientationValid.gml");
XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder()
.build()
@@ -59,12 +57,12 @@ public class OrientationFixerTest {
.build()
.parseXPlanFeatureCollection(testArchive);
Coordinate startPointRepaired = getSecondPoint(xPlanFeatureCollectionFixOrientation);
- assertThat(startPointRepaired.getX(), is(startPointOriginal.getX()));
- assertThat(startPointRepaired.getY(), is(startPointOriginal.getY()));
+ assertThat(startPointRepaired.getX()).isEqualTo(startPointOriginal.getX());
+ assertThat(startPointRepaired.getY()).isEqualTo(startPointOriginal.getY());
}
@Test
- public void testOrientationFixer_invalidLaufrichtung() throws Exception {
+ void testOrientationFixer_invalidLaufrichtung() throws Exception {
XPlanArchive testArchive = getArchive("geometryOrientationInvalid.gml");
XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder()
.build()
@@ -75,8 +73,8 @@ public class OrientationFixerTest {
.build()
.parseXPlanFeatureCollection(testArchive);
Coordinate startPointRepaired = getSecondPoint(xPlanFeatureCollectionFixOrientation);
- assertThat(startPointRepaired.getX(), not(startPointOriginal.getX()));
- assertThat(startPointRepaired.getY(), not(startPointOriginal.getY()));
+ assertThat(startPointRepaired.getX()).isNotEqualTo(startPointOriginal.getX());
+ assertThat(startPointRepaired.getY()).isNotEqualTo(startPointOriginal.getY());
}
private Coordinate getSecondPoint(XPlanFeatureCollection xPlanFeatureCollection) throws FilterEvaluationException {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
index efd16bcb1e309b3a1bdb3138e6e1aa53b3f2d562..2e840c44bc7a3cfb697996908d8f996786c8916d 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
@@ -20,40 +20,26 @@
*/
package de.latlon.xplan.commons.feature;
-import de.latlon.xplan.ResourceAccessor;
-import de.latlon.xplan.commons.archive.XPlanArchive;
-import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import de.latlon.xplan.ResourceAccessor;
+import de.latlon.xplan.commons.archive.XPlanArchive;
+import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-@RunWith(Parameterized.class)
-public class ParameterizedXPlanGmlParserTest {
+class ParameterizedXPlanGmlParserTest {
- private final String resourceUnderTest;
-
- private final String expectedPlanName;
-
- private final String expectedPlanGz;
-
- private final String expectedPlanNumber;
-
- private final int expectedNumberOfFeatures;
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
+ static List<Object[]> data() {
return Arrays.asList(new Object[][] { { "xplan41/BP2070.zip", null, "4011000", null, 314 },
{ "xplan41/BP2135.zip", "Bebauungsplan 2135", "4011000", "2135", 241 },
{ "xplan41/Demo.zip", "BPlan Demo-Gemeinde", "1234567", null, 20 },
@@ -75,33 +61,26 @@ public class ParameterizedXPlanGmlParserTest {
{ "xplan51/LA67.zip", "Bebauungsplan LA 22", "1234567", "LA 22", 146 } });
}
- public ParameterizedXPlanGmlParserTest(String resourceUnderTest, String expectedPlanName, String expectedPlanGz,
- String expectedPlanNumber, int expectedNumberOfFeatures) {
- this.resourceUnderTest = resourceUnderTest;
- this.expectedPlanName = expectedPlanName;
- this.expectedPlanGz = expectedPlanGz;
- this.expectedPlanNumber = expectedPlanNumber;
- this.expectedNumberOfFeatures = expectedNumberOfFeatures;
- }
-
- @Test
- public void testRetrieveGeometricallyValidXPlanFeatures() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ void testRetrieveGeometricallyValidXPlanFeatures(String resourceUnderTest, String expectedPlanName,
+ String expectedPlanGz, String expectedPlanNumber, int expectedNumberOfFeatures) throws Exception {
XPlanArchive archive = getTestArchive(resourceUnderTest);
XPlanFeatureCollection fc = XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive);
if (expectedPlanName == null)
- assertThat(fc.getPlanName(), containsString("Unbenannter XPlan"));
+ assertThat(fc.getPlanName()).contains("Unbenannter XPlan");
else
- assertThat(fc.getPlanName(), is(expectedPlanName));
+ assertThat(fc.getPlanName()).isEqualTo(expectedPlanName);
if (expectedPlanGz == null)
assertNull(fc.getPlanGkz());
else
- assertThat(fc.getPlanGkz(), is(expectedPlanGz));
+ assertThat(fc.getPlanGkz()).isEqualTo(expectedPlanGz);
if (expectedPlanNumber == null)
assertNull(fc.getPlanNummer());
else
- assertThat(fc.getPlanNummer(), is(expectedPlanNumber));
+ assertThat(fc.getPlanNummer()).isEqualTo(expectedPlanNumber);
- assertThat(fc.getFeatures().size(), is(expectedNumberOfFeatures));
+ assertThat(fc.getFeatures().size()).isEqualTo(expectedNumberOfFeatures);
}
private XPlanArchive getTestArchive(String name) throws IOException {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
index 2fb7951be0c94bcd42768d92ef0d3e943c91016b..4dc33de610973b54120e936783b64e1ad296ba17 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
@@ -25,7 +25,7 @@ import de.latlon.xplan.commons.archive.XPlanArchive;
import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
import de.latlon.xplan.commons.configuration.SortConfiguration;
import org.deegree.feature.FeatureCollection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -35,65 +35,64 @@ import static de.latlon.xplan.commons.XPlanType.BP_Plan;
import static de.latlon.xplan.commons.XPlanType.FP_Plan;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_40;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_50;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
*/
-public class SortPropertyReaderTest {
+class SortPropertyReaderTest {
@Test
- public void testReadSortDate() throws Exception {
+ void testReadSortDate() throws Exception {
SortConfiguration sortConfiguration = createSortConfiguration("BP_Plan", "technHerstellDatum");
SortPropertyReader sortPropertyReader = new SortPropertyReader(sortConfiguration);
Date readSortDate = sortPropertyReader.readSortDate(BP_Plan, XPLAN_40, readFeatureCollection());
- assertThat(readSortDate, is(asDate("2001-08-06")));
+ assertThat(readSortDate).isEqualTo(asDate("2001-08-06"));
}
@Test
- public void testReadSortDate_UnmatchingType() throws Exception {
+ void testReadSortDate_UnmatchingType() throws Exception {
SortConfiguration sortConfiguration = createSortConfiguration("BP_Plan", "technHerstellDatum");
SortPropertyReader sortPropertyReader = new SortPropertyReader(sortConfiguration);
Date readSortDate = sortPropertyReader.readSortDate(FP_Plan, XPLAN_40, readFeatureCollection());
- assertThat(readSortDate, nullValue());
+ assertThat(readSortDate).isNull();
}
@Test
- public void testReadSortDate_UnmatchingVersion() throws Exception {
+ void testReadSortDate_UnmatchingVersion() throws Exception {
SortConfiguration sortConfiguration = createSortConfiguration("BP_Plan", "technHerstellDatum");
SortPropertyReader sortPropertyReader = new SortPropertyReader(sortConfiguration);
Date readSortDate = sortPropertyReader.readSortDate(BP_Plan, XPLAN_50, readFeatureCollection());
- assertThat(readSortDate, nullValue());
+ assertThat(readSortDate).isNull();
}
@Test
- public void testReadSortDate_UnavailableFeatureType() throws Exception {
+ void testReadSortDate_UnavailableFeatureType() throws Exception {
SortConfiguration sortConfiguration = createSortConfiguration("BP_PlanNotThere", "technHerstellDatum");
SortPropertyReader sortPropertyReader = new SortPropertyReader(sortConfiguration);
Date readSortDate = sortPropertyReader.readSortDate(BP_Plan, XPLAN_50, readFeatureCollection());
- assertThat(readSortDate, nullValue());
+ assertThat(readSortDate).isNull();
}
@Test
- public void testReadSortDate_UnavailableProperty() throws Exception {
+ void testReadSortDate_UnavailableProperty() throws Exception {
SortConfiguration sortConfiguration = createSortConfiguration("BP_Plan", "notThereDatum");
SortPropertyReader sortPropertyReader = new SortPropertyReader(sortConfiguration);
Date readSortDate = sortPropertyReader.readSortDate(BP_Plan, XPLAN_50, readFeatureCollection());
- assertThat(readSortDate, nullValue());
+ assertThat(readSortDate).isNull();
}
- @Test(expected = NullPointerException.class)
- public void testReadSortDate_NullSortConfiguration() throws Exception {
- new SortPropertyReader(null);
+ @Test
+ void testReadSortDate_NullSortConfiguration() throws Exception {
+ assertThrows(NullPointerException.class, () -> new SortPropertyReader(null));
}
private SortConfiguration createSortConfiguration(String featureType, String propertyName) {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
index 631ad1f143eb15476d33c1421169503f2a12f2bd..92fe08b8df535b67368270c077777c5101c36849 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
@@ -24,69 +24,76 @@ import de.latlon.xplan.ResourceAccessor;
import de.latlon.xplan.commons.archive.XPlanArchive;
import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
import de.latlon.xplan.commons.util.XPlanVersionUtils;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
+import java.util.stream.Collectors;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_51;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class XPlanGmlParserTest {
+class XPlanGmlParserTest {
@Test
- public void testParseFeatureCollection() throws Exception {
+ void testParseFeatureCollection() throws Exception {
XPlanArchive testArchive = getTestArchive("xplan41/Eidelstedt_4_V4.zip");
XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder()
.build()
.parseXPlanFeatureCollection(testArchive);
- assertThat(xPlanFeatureCollection.getFeatures().size(), is(56));
+ assertThat(xPlanFeatureCollection.getFeatures()).hasSize(56);
}
@Test
- public void testParseWfsFeatureCollection() throws Exception {
+ void testParseWfsFeatureCollection() throws Exception {
XPlanArchive testArchive = getArchive("wfs20FeatureCollection.gml");
XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder()
.build()
.parseXPlanFeatureCollection(testArchive);
- assertThat(xPlanFeatureCollection.getFeatures().size(), is(3));
- assertThat(XPlanVersionUtils.determineBaseVersion(xPlanFeatureCollection.getFeatures().getName()),
- is(XPLAN_51));
+ assertThat(xPlanFeatureCollection.getFeatures()).hasSize(3);
+ assertThat(XPlanVersionUtils.determineBaseVersion(xPlanFeatureCollection.getFeatures().getName()))
+ .isEqualTo(XPLAN_51);
}
@Test
- public void testParseWfsFeatureCollectionWithAdditionalObjects() throws Exception {
+ void testParseWfsFeatureCollectionWithAdditionalObjects() throws Exception {
XPlanArchive testArchive = getArchive("wfs20FeatureCollection-additionalObjects.gml");
XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder()
.build()
.parseXPlanFeatureCollection(testArchive);
- assertThat(xPlanFeatureCollection.getFeatures().size(), is(3));
- assertThat(XPlanVersionUtils.determineBaseVersion(xPlanFeatureCollection.getFeatures().getName()),
- is(XPLAN_51));
+ assertThat(xPlanFeatureCollection.getFeatures()).hasSize(3);
+ assertThat(XPlanVersionUtils.determineBaseVersion(xPlanFeatureCollection.getFeatures().getName()))
+ .isEqualTo(XPLAN_51);
}
@Test
- public void testParseFeatureCollectionMultipleInstance() throws Exception {
+ void testParseFeatureCollectionMultipleInstance() throws Exception {
XPlanArchive testArchive = getArchive("xplan-multipleInstances.gml");
XPlanFeatureCollections xPlanFeatureCollections = XPlanGmlParserBuilder.newBuilder()
.build()
.parseXPlanFeatureCollectionAllowMultipleInstances(testArchive);
- assertThat(xPlanFeatureCollections.getxPlanGmlInstances().size(), is(3));
- assertThat(xPlanFeatureCollections, containsInstanceWithNoOFFeatures(5));
- assertThat(xPlanFeatureCollections, containsInstanceWithNoOFFeatures(20));
- assertThat(xPlanFeatureCollections, containsInstanceWithNoOFFeatures(488));
+ assertThat(xPlanFeatureCollections.getxPlanGmlInstances()).hasSize(3);
+
+ List<Integer> featureSizes = xPlanFeatureCollections.getxPlanGmlInstances()
+ .stream() //
+ .map(it -> it.getFeatures().size()) //
+ .collect(Collectors.toList());
+
+ assertThat(featureSizes).contains(5, 20, 488);
}
- @Test(expected = FeatureCollectionParseException.class)
- public void testParseFeatureCollectionMultipleInstanceWithUnreferencedFeature() throws Exception {
+ @Test
+ void testParseFeatureCollectionMultipleInstanceWithUnreferencedFeature() throws Exception {
XPlanArchive testArchive = getArchive("xplan-multipleInstances-withUnreferenced.gml");
- XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollectionAllowMultipleInstances(testArchive);
+ assertThrows(FeatureCollectionParseException.class,
+ () -> XPlanGmlParserBuilder.newBuilder()
+ .build()
+ .parseXPlanFeatureCollectionAllowMultipleInstances(testArchive));
}
private XPlanArchive getTestArchive(String name) throws IOException {
@@ -100,25 +107,4 @@ public class XPlanGmlParserTest {
return archiveCreator.createXPlanArchiveFromGml("multipleInstances", resourceAsStream);
}
- private BaseMatcher<XPlanFeatureCollections> containsInstanceWithNoOFFeatures(int expectedNoOfFeatures) {
- return new BaseMatcher<>() {
-
- @Override
- public boolean matches(Object o) {
- XPlanFeatureCollections collections = (XPlanFeatureCollections) o;
- for (XPlanFeatureCollection collection : collections.getxPlanGmlInstances()) {
- if (collection.getFeatures().size() == expectedNoOfFeatures) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void describeTo(Description description) {
-
- }
- };
- }
-
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
index e9e904a22adaf3589323048b691f35bce0394ea9..c564d9c6c20e898a9041088093632f3c223d330e 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
@@ -20,49 +20,36 @@
*/
package de.latlon.xplan.commons.reference;
-import de.latlon.xplan.ResourceAccessor;
-import de.latlon.xplan.commons.archive.XPlanArchive;
-import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
-import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder;
-import org.deegree.feature.FeatureCollection;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import org.deegree.feature.FeatureCollection;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import de.latlon.xplan.ResourceAccessor;
+import de.latlon.xplan.commons.archive.XPlanArchive;
+import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
+import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-@RunWith(Parameterized.class)
-public class ParameterizedExternalReferenceScannerTest {
-
- private final String resourceUnderTest;
+class ParameterizedExternalReferenceScannerTest {
- private final int noOfExternalRefs;
-
- private final int noOfRasterPlanBaseScans;
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
+ static List<Object[]> data() {
return Arrays.asList(new Object[][] { { "xplan40/BPlan004_4-0.zip", 2, 1 }, { "xplan41/BP2070.zip", 0, 0 },
{ "xplan41/Demo.zip", 2, 0 }, { "xplan41/BPlan001_4-1.zip", 1, 1 },
{ "xplan50/BPlan004_5-0.zip", 2, 1 }, { "xplan51/BPlan002_5-1.zip", 2, 2 },
{ "xplan51/BPlan002_5-1_rasterBasisAlsRefScan.zip", 1, 1 } });
}
- public ParameterizedExternalReferenceScannerTest(String resourceUnderTest, int noOfExternalRefs,
- int noOfRasterPlanBaseScans) {
- this.resourceUnderTest = resourceUnderTest;
- this.noOfExternalRefs = noOfExternalRefs;
- this.noOfRasterPlanBaseScans = noOfRasterPlanBaseScans;
- }
-
- @Test
- public void testValidationOfSingleRule() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ void testValidationOfSingleRule(String resourceUnderTest, int noOfExternalRefs, int noOfRasterPlanBaseScans)
+ throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection(resourceUnderTest);
ExternalReferenceInfo referenceInfo = new ExternalReferenceScanner().scan(fc);
assertEquals(noOfExternalRefs, referenceInfo.getAllReferences().size());
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
index 5c45b66ec96d2134cec62c71ab64f72eb60605dd..7081a9f8e98f48ff09ca11edeb1082466908cba9 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
@@ -20,7 +20,9 @@
*/
package de.latlon.xplan.commons.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.nio.file.Path;
@@ -29,36 +31,38 @@ import java.nio.file.Path;
* @author <a href="mailto:stenger@lat-lon.de">Dirk Stenger</a>
* @since 7.0
*/
-public class ContentTypeCheckerTest {
+class ContentTypeCheckerTest {
@Test
- public void checkContentTypesOfXPlanArchiveOrGml() throws Exception {
+ void checkContentTypesOfXPlanArchiveOrGml() throws Exception {
Path path = new File(getClass().getResource("Blankenese29_Test_60.zip").getFile()).toPath();
ContentTypeChecker.checkContentTypesOfXPlanArchiveOrGml(path);
}
- @Test(expected = UnsupportedContentTypeException.class)
- public void checkContentTypesOfXPlanArchiveOrGml_ExpectException() throws Exception {
+ @Test
+ void checkContentTypesOfXPlanArchiveOrGml_ExpectException() throws Exception {
Path path = new File(getClass().getResource("Blankenese29_Test_60_InvalidContent.zip").getFile()).toPath();
- ContentTypeChecker.checkContentTypesOfXPlanArchiveOrGml(path);
+ assertThrows(UnsupportedContentTypeException.class,
+ () -> ContentTypeChecker.checkContentTypesOfXPlanArchiveOrGml(path));
}
@Test
- public void checkContentTypeOfFileOfXPlanArchiveWithPng() throws Exception {
+ void checkContentTypeOfFileOfXPlanArchiveWithPng() throws Exception {
Path path = new File(getClass().getResource("Blankenese29.png").getFile()).toPath();
ContentTypeChecker.checkContentTypeOfFileOfXPlanArchive(path);
}
@Test
- public void checkContentTypeOfFileOfXPlanArchiveWithPgw() throws Exception {
+ void checkContentTypeOfFileOfXPlanArchiveWithPgw() throws Exception {
Path path = new File(getClass().getResource("Blankenese29.pgw").getFile()).toPath();
ContentTypeChecker.checkContentTypeOfFileOfXPlanArchive(path);
}
- @Test(expected = UnsupportedContentTypeException.class)
- public void checkContentTypeOfFileOfXPlanArchiveWithOdt_ExpectException() throws Exception {
+ @Test
+ void checkContentTypeOfFileOfXPlanArchiveWithOdt_ExpectException() throws Exception {
Path path = new File(getClass().getResource("test.odt").getFile()).toPath();
- ContentTypeChecker.checkContentTypeOfFileOfXPlanArchive(path);
+ assertThrows(UnsupportedContentTypeException.class,
+ () -> ContentTypeChecker.checkContentTypeOfFileOfXPlanArchive(path));
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
index 6d7920d296dab44c4506c793093cb068b32efb8c..884837d48570ac9b3338d2bce2189fd3a16126a0 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
@@ -27,7 +27,7 @@ import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder;
import de.latlon.xplan.manager.web.shared.Bereich;
import org.deegree.feature.Feature;
import org.deegree.feature.FeatureCollection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
@@ -36,9 +36,7 @@ import static de.latlon.xplan.commons.util.FeatureCollectionUtils.findPlanFeatur
import static de.latlon.xplan.commons.util.FeatureCollectionUtils.retrieveBereiche;
import static de.latlon.xplan.commons.util.FeatureCollectionUtils.retrieveDistrict;
import static de.latlon.xplan.commons.util.FeatureCollectionUtils.retrieveRechtsstand;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link FeatureCollectionUtils}.
@@ -46,87 +44,87 @@ import static org.hamcrest.MatcherAssert.assertThat;
* @author <a href="mailto:stenger@lat-lon.de">Dirk Stenger</a>
* @version $Revision: $, $Date: $
*/
-public class FeatureCollectionUtilsTest {
+class FeatureCollectionUtilsTest {
@Test
- public void testFindPlanFeatureWithXPlan40() throws Exception {
+ void testFindPlanFeatureWithXPlan40() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan40/BPlan004_4-0.zip");
Feature planFeature = findPlanFeature(fc, BP_Plan);
String id = planFeature.getId();
String name = planFeature.getName().toString();
String envelope = planFeature.getEnvelope().toString();
- assertThat(id, is("GML_88bfe952-199f-4bba-bea2-c2b441737144"));
- assertThat(name, is("{http://www.xplanung.de/xplangml/4/0}BP_Plan"));
- assertThat(envelope, is(
- "min: (567386.293,5937595.479), max: (567474.996,5937698.959), span0: 88.70300000009593, span1: 103.47999999951571 , crs: {uri=EPSG:25832, resolved=true}"));
+ assertThat(id).isEqualTo("GML_88bfe952-199f-4bba-bea2-c2b441737144");
+ assertThat(name).isEqualTo("{http://www.xplanung.de/xplangml/4/0}BP_Plan");
+ assertThat(envelope).isEqualTo(
+ "min: (567386.293,5937595.479), max: (567474.996,5937698.959), span0: 88.70300000009593, span1: 103.47999999951571 , crs: {uri=EPSG:25832, resolved=true}");
}
@Test
- public void testFindPlanFeatureWithXPlan41() throws Exception {
+ void testFindPlanFeatureWithXPlan41() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan41/Eidelstedt_4_V4.zip");
Feature planFeature = findPlanFeature(fc, BP_Plan);
String id = planFeature.getId();
String name = planFeature.getName().toString();
String envelope = planFeature.getEnvelope().toString();
- assertThat(id, is("GML_671C685B-CE75-4B05-8236-622B0B8A7A5B"));
- assertThat(name, is("{http://www.xplanung.de/xplangml/4/1}BP_Plan"));
- assertThat(envelope, is(
- "min: (559573.142,5938465.032), max: (560174.871,5939188.129), span0: 601.7290000000503, span1: 723.097000000067 , crs: {uri=urn:adv:crs:ETRS89_UTM32, resolved=true}"));
+ assertThat(id).isEqualTo("GML_671C685B-CE75-4B05-8236-622B0B8A7A5B");
+ assertThat(name).isEqualTo("{http://www.xplanung.de/xplangml/4/1}BP_Plan");
+ assertThat(envelope).isEqualTo(
+ "min: (559573.142,5938465.032), max: (560174.871,5939188.129), span0: 601.7290000000503, span1: 723.097000000067 , crs: {uri=urn:adv:crs:ETRS89_UTM32, resolved=true}");
}
@Test
- public void testRetrieveLegislationStatusWithExistingLegislationStatusShouldReturnString() throws Exception {
+ void testRetrieveLegislationStatusWithExistingLegislationStatusShouldReturnString() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan41/Eidelstedt_4_V4.zip");
String legislationStatus = retrieveRechtsstand(fc, BP_Plan);
- assertThat(legislationStatus, is("4000"));
+ assertThat(legislationStatus).isEqualTo("4000");
}
@Test
- public void testRetrieveLegislationStatusWithMissingLegislationStatusShouldReturnNull() throws Exception {
+ void testRetrieveLegislationStatusWithMissingLegislationStatusShouldReturnNull() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan41/LA67.zip");
String legislationStatus = retrieveRechtsstand(fc, BP_Plan);
- assertThat(legislationStatus, nullValue());
+ assertThat(legislationStatus).isNull();
}
@Test
- public void testRetrieveDistrictWithXPlan41ShouldReturnDistrict() throws Exception {
+ void testRetrieveDistrictWithXPlan41ShouldReturnDistrict() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan41/Eidelstedt_4_V4.zip");
String district = retrieveDistrict(fc, BP_Plan);
- assertThat(district, is("Bezirk Eimsbüttel Ortsteil 320"));
+ assertThat(district).isEqualTo("Bezirk Eimsbüttel Ortsteil 320");
}
@Test
- public void testRetrieveDistrictWithXPlan41WithMissingDistrictNameShouldReturnNull() throws Exception {
+ void testRetrieveDistrictWithXPlan41WithMissingDistrictNameShouldReturnNull() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan41/BP2070.zip");
String district = retrieveDistrict(fc, BP_Plan);
- assertThat(district, nullValue());
+ assertThat(district).isNull();
}
@Test
- public void testRetrieveDistrictWithXPlan51WithMultipleDistricts() throws Exception {
+ void testRetrieveDistrictWithXPlan51WithMultipleDistricts() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan51/BP2070_mehrererOrtsteile.zip");
String district = retrieveDistrict(fc, BP_Plan);
- assertThat(district, is("309"));
+ assertThat(district).isEqualTo("309");
}
@Test
- public void testRetrieveBereicheWithXPlan41() throws Exception {
+ void testRetrieveBereicheWithXPlan41() throws Exception {
FeatureCollection fc = getMainFileAsFeatureCollection("xplan52/BPlan001_5-2_Bereiche.zip");
List<Bereich> bereiche = retrieveBereiche(fc);
- assertThat(bereiche.size(), is(2));
+ assertThat(bereiche).hasSize(2);
- assertThat(bereiche.get(0).getNummer(), is("0"));
- assertThat(bereiche.get(0).getName(), is(nullValue()));
+ assertThat(bereiche.get(0).getNummer()).isEqualTo("0");
+ assertThat(bereiche.get(0).getName()).isNull();
- assertThat(bereiche.get(1).getNummer(), is("1"));
- assertThat(bereiche.get(1).getName(), is(nullValue()));
+ assertThat(bereiche.get(1).getNummer()).isEqualTo("1");
+ assertThat(bereiche.get(1).getName()).isNull();
}
private FeatureCollection getMainFileAsFeatureCollection(String name) throws Exception {
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
index 98d7a0ef5e968644a0644a38e4844e66d9296b19..ff90f5247486f01e4d5243cf827c6e13a90e8d9e 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
@@ -20,18 +20,18 @@
*/
package de.latlon.xplan.commons.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static de.latlon.xplan.commons.util.MimeTypeDetector.getArtefactMimeType;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class MimeTypeDetectorTest {
+class MimeTypeDetectorTest {
@Test
- public void testGetArtefactMimeType() {
+ void testGetArtefactMimeType() {
assertEquals("application/xml", getArtefactMimeType("test.xml"));
assertEquals("application/xml", getArtefactMimeType("test.gml"));
assertEquals("application/pdf", getArtefactMimeType("test.pdf"));
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
index 15af1bde039e6407f971b63c11fd785e66d7fbe3..6cefdcaf4a23f32dd07d4bb56e4743e389ed769a 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
@@ -21,113 +21,115 @@
package de.latlon.xplan.commons.util;
import de.latlon.xplan.commons.XPlanVersion;
+
+import org.assertj.core.api.AbstractAssert;
import org.deegree.commons.xml.NamespaceBindings;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.util.function.Predicate;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_40;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_41;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_50;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_51;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class XPlanVersionUtilsTest {
+class XPlanVersionUtilsTest {
@Test
- public void testDetermineBaseVersionFor40() {
+ void testDetermineBaseVersionFor40() {
QName element = new QName(XPLAN_40.getNamespace(), "element");
XPlanVersion version = XPlanVersionUtils.determineBaseVersion(element);
- assertThat(version, is(XPLAN_40));
+ assertThat(version).isEqualTo(XPLAN_40);
}
@Test
- public void testDetermineBaseVersionFor41() {
+ void testDetermineBaseVersionFor41() {
QName element = new QName(XPLAN_41.getNamespace(), "element");
XPlanVersion version = XPlanVersionUtils.determineBaseVersion(element);
- assertThat(version, is(XPLAN_41));
+ assertThat(version).isEqualTo(XPLAN_41);
}
@Test
- public void testDetermineBaseVersionFor50() {
+ void testDetermineBaseVersionFor50() {
QName element = new QName(XPLAN_50.getNamespace(), "element");
XPlanVersion version = XPlanVersionUtils.determineBaseVersion(element);
- assertThat(version, is(XPLAN_50));
+ assertThat(version).isEqualTo(XPLAN_50);
}
@Test
- public void testDetermineBaseVersionFor51() {
+ void testDetermineBaseVersionFor51() {
QName element = new QName(XPLAN_51.getNamespace(), "element");
XPlanVersion version = XPlanVersionUtils.determineBaseVersion(element);
- assertThat(version, is(XPLAN_51));
+ assertThat(version).isEqualTo(XPLAN_51);
}
- @Test(expected = IllegalArgumentException.class)
- public void testDetermineBaseVersionForUnknownNamespaceShouldFail() {
+ @Test
+ void testDetermineBaseVersionForUnknownNamespaceShouldFail() {
QName element = new QName("http://unknown.namespaceuri.de", "element");
- XPlanVersionUtils.determineBaseVersion(element);
+ assertThrows(IllegalArgumentException.class, () -> XPlanVersionUtils.determineBaseVersion(element));
}
@Test
- public void testRetrieveNamespaceBindingsFor40() {
+ void testRetrieveNamespaceBindingsFor40() {
QName element = new QName(XPLAN_40.getNamespace(), "element");
NamespaceBindings namespaceBindings = XPlanVersionUtils.retrieveNamespaceBindings(element);
- assertThat(namespaceBindings, hasNamespace(XPLAN_40.getNamespace(), "xplan"));
- assertThat(namespaceBindings, hasNamespace(XPLAN_40.getGmlVersion().getNamespace(), "gml"));
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_40.getNamespace(), "xplan");
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_40.getGmlVersion().getNamespace(), "gml");
}
@Test
- public void testRetrieveNamespaceBindingsFor41() {
+ void testRetrieveNamespaceBindingsFor41() {
QName element = new QName(XPLAN_41.getNamespace(), "element");
NamespaceBindings namespaceBindings = XPlanVersionUtils.retrieveNamespaceBindings(element);
- assertThat(namespaceBindings, hasNamespace(XPLAN_41.getNamespace(), "xplan"));
- assertThat(namespaceBindings, hasNamespace(XPLAN_41.getGmlVersion().getNamespace(), "gml"));
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_41.getNamespace(), "xplan");
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_41.getGmlVersion().getNamespace(), "gml");
}
@Test
- public void testRetrieveNamespaceBindingsFor50() {
+ void testRetrieveNamespaceBindingsFor50() {
QName element = new QName(XPLAN_50.getNamespace(), "element");
NamespaceBindings namespaceBindings = XPlanVersionUtils.retrieveNamespaceBindings(element);
- assertThat(namespaceBindings, hasNamespace(XPLAN_50.getNamespace(), "xplan"));
- assertThat(namespaceBindings, hasNamespace(XPLAN_50.getGmlVersion().getNamespace(), "gml"));
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_50.getNamespace(), "xplan");
+
+ assertThatNamespaceBindings(namespaceBindings).hasNamespace(XPLAN_50.getGmlVersion().getNamespace(), "gml");
}
- @Test(expected = IllegalArgumentException.class)
- public void testRetrieveNamespaceBindingsForUnknownNamespace() {
+ @Test
+ void testRetrieveNamespaceBindingsForUnknownNamespace() {
QName element = new QName("http://unknown.namespaceuri.de", "element");
- XPlanVersionUtils.retrieveNamespaceBindings(element);
+ assertThrows(IllegalArgumentException.class, () -> XPlanVersionUtils.retrieveNamespaceBindings(element));
}
- private Matcher<? super NamespaceBindings> hasNamespace(final String namespace, final String prefix) {
- return new TypeSafeMatcher<NamespaceBindings>() {
-
- @Override
- protected boolean matchesSafely(NamespaceBindings bindings) {
- Iterator<String> prefixes = bindings.getPrefixes();
- while (prefixes.hasNext()) {
- if (prefix.equals(prefixes.next())) {
- String namespaceURI = bindings.getNamespaceURI(prefix);
- if (namespace.equals(namespaceURI))
- return true;
- }
+ static class NamespaceBindingsAssert extends AbstractAssert<NamespaceBindingsAssert, NamespaceBindings> {
+
+ protected NamespaceBindingsAssert(NamespaceBindings actual) {
+ super(actual, NamespaceBindingsAssert.class);
+ }
+
+ NamespaceBindingsAssert hasNamespace(final String namespace, final String prefix) {
+ Iterator<String> prefixes = actual.getPrefixes();
+ while (prefixes.hasNext()) {
+ if (prefix.equals(prefixes.next())) {
+ String namespaceURI = actual.getNamespaceURI(prefix);
+ if (namespace.equals(namespaceURI))
+ return this;
}
- return false;
}
- @Override
- public void describeTo(Description description) {
- description
- .appendText("NamespaceBindings must contain namespace " + namespace + " with prefix " + prefix);
- }
- };
+ throw failure("NamespaceBindings must contain namespace " + namespace + " with prefix " + prefix);
+ }
+
+ }
+
+ static NamespaceBindingsAssert assertThatNamespaceBindings(NamespaceBindings actual) {
+ return new NamespaceBindingsAssert(actual);
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
index e148f29bac5e24f702ed5417b726fae7f02f9f16..bdfb232cde2db9d3fb53697461f5b1ebe62a235e 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
@@ -20,33 +20,33 @@
*/
package de.latlon.xplan.manager.web.shared;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a>
* @version $Revision: $, $Date: $
*/
-public class PlanStatusTest {
+class PlanStatusTest {
@Test
- public void testFindByMessage() {
+ void testFindByMessage() {
PlanStatus planStatus = PlanStatus.FESTGESTELLT;
PlanStatus foundPlanStatus = PlanStatus.findByMessage(planStatus.getMessage());
- assertThat(foundPlanStatus, is(planStatus));
+ assertThat(foundPlanStatus).isEqualTo(planStatus);
}
- @Test(expected = IllegalArgumentException.class)
- public void testFindByMessageUnknownMessage() {
- PlanStatus.findByMessage("UNKNOWN_MESSAGE");
+ @Test
+ void testFindByMessageUnknownMessage() {
+ assertThrows(IllegalArgumentException.class, () -> PlanStatus.findByMessage("UNKNOWN_MESSAGE"));
}
- @Test(expected = IllegalArgumentException.class)
- public void testFindByMessageNullMessage() {
- PlanStatus.findByMessage(null);
+ @Test
+ void testFindByMessageNullMessage() {
+ assertThrows(IllegalArgumentException.class, () -> PlanStatus.findByMessage(null));
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
index 9e92aad509f11aa8e45d1a2fd3043ef850faa430..01d149851d90c7180c272837aa6bc99f3111049e 100644
--- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
+++ b/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
@@ -8,19 +8,21 @@
* 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%
*/
package de.latlon.xplan.manager.web.shared.edit;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
import static de.latlon.xplan.commons.XPlanType.BP_Plan;
import static de.latlon.xplan.commons.XPlanType.LP_Plan;
@@ -31,31 +33,29 @@ import static de.latlon.xplan.commons.XPlanVersion.XPLAN_60;
import static de.latlon.xplan.manager.web.shared.edit.TextRechtscharacterType.BP_FESTSETZUNG;
import static de.latlon.xplan.manager.web.shared.edit.TextRechtscharacterType.LP_GEPLANT;
import static de.latlon.xplan.manager.web.shared.edit.TextRechtscharacterType.XP_NACHRICHTLICHEUEBERNAHME;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class TextRechtscharacterTypeTest {
+class TextRechtscharacterTypeTest {
@Test
- public void testFromCode() {
- assertThat(TextRechtscharacterType.fromCode(1000, XPLAN_50.name(), BP_Plan.name()), is(BP_FESTSETZUNG));
- assertThat(TextRechtscharacterType.fromCode(2000, XPLAN_52.name(), LP_Plan.name()), is(LP_GEPLANT));
- assertThat(TextRechtscharacterType.fromCode(2000, XPLAN_60.name(), LP_Plan.name()),
- is(XP_NACHRICHTLICHEUEBERNAHME));
+ void testFromCode() {
+ assertThat(TextRechtscharacterType.fromCode(1000, XPLAN_50.name(), BP_Plan.name())).isEqualTo(BP_FESTSETZUNG);
+ assertThat(TextRechtscharacterType.fromCode(2000, XPLAN_52.name(), LP_Plan.name())).isEqualTo(LP_GEPLANT);
+ assertThat(TextRechtscharacterType.fromCode(2000, XPLAN_60.name(), LP_Plan.name()))
+ .isEqualTo(XP_NACHRICHTLICHEUEBERNAHME);
}
@Test
- public void testIsCodeFor() {
- assertThat(BP_FESTSETZUNG.isCodeFor(XPLAN_50.name(), BP_Plan.name()), is(true));
- assertThat(LP_GEPLANT.isCodeFor(XPLAN_52.name(), LP_Plan.name()), is(true));
- assertThat(XP_NACHRICHTLICHEUEBERNAHME.isCodeFor(XPLAN_60.name(), LP_Plan.name()), is(true));
-
- assertThat(BP_FESTSETZUNG.isCodeFor(XPLAN_50.name(), RP_Plan.name()), is(false));
- assertThat(LP_GEPLANT.isCodeFor(XPLAN_60.name(), LP_Plan.name()), is(false));
- assertThat(XP_NACHRICHTLICHEUEBERNAHME.isCodeFor(XPLAN_52.name(), LP_Plan.name()), is(false));
+ void testIsCodeFor() {
+ assertThat(BP_FESTSETZUNG.isCodeFor(XPLAN_50.name(), BP_Plan.name())).isTrue();
+ assertThat(LP_GEPLANT.isCodeFor(XPLAN_52.name(), LP_Plan.name())).isTrue();
+ assertThat(XP_NACHRICHTLICHEUEBERNAHME.isCodeFor(XPLAN_60.name(), LP_Plan.name())).isTrue();
+
+ assertThat(BP_FESTSETZUNG.isCodeFor(XPLAN_50.name(), RP_Plan.name())).isFalse();
+ assertThat(LP_GEPLANT.isCodeFor(XPLAN_60.name(), LP_Plan.name())).isFalse();
+ assertThat(XP_NACHRICHTLICHEUEBERNAHME.isCodeFor(XPLAN_52.name(), LP_Plan.name())).isFalse();
}
}
diff --git a/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java b/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java
index 057e467d7e25696d5937410227ce2d8e0b093b8f..4df7ffd4db5a8cc976f8270649dda159dff79992 100644
--- a/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java
+++ b/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.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%
@@ -26,7 +26,8 @@ import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
import de.latlon.xplan.commons.feature.XPlanFeatureCollection;
import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder;
import org.deegree.cs.exceptions.UnknownCRSException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.xmlunit.assertj3.XmlAssert;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
@@ -36,23 +37,20 @@ import java.util.HashMap;
import java.util.Map;
import static de.latlon.xplan.commons.XPlanVersion.XPLAN_41;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
/**
* @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
*/
-public class XPlanGmlFeatureWriterTest {
+class XPlanGmlFeatureWriterTest {
@Test
- public void testWrite() throws Exception {
+ void testWrite() throws Exception {
XPlanFeatureCollection fc = getMainFileAsXplanFeatureCollection("xplan41/Eidelstedt_4_V4.zip");
String xPlanFeatureCollection = writeXPlanFeatureCollection(fc);
- assertThat(xPlanFeatureCollection, hasXPath("/xplan:XPlanAuszug").withNamespaceContext(nsContext()));
+ XmlAssert.assertThat(xPlanFeatureCollection).withNamespaceContext(nsContext()).hasXPath("/xplan:XPlanAuszug");
}
- private String writeXPlanFeatureCollection(XPlanFeatureCollection xPlanFeatureCollection)
- throws XMLStreamException, UnknownCRSException, org.deegree.cs.exceptions.TransformationException {
+ private String writeXPlanFeatureCollection(XPlanFeatureCollection xPlanFeatureCollection) throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter xmlStream = XMLOutputFactory.newFactory().createXMLStreamWriter(os);
GMLStreamWriter gmlStreamWriter = new XPlanGmlWriter(XPLAN_41, xmlStream);
diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml
index 2363ac56f3cb3450c03dbaefae4f97ed6708ec8f..e0ebea9c6d95c354ec2474876f1c14f1a9edc3b6 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.0.2</version>
+ <version>7.1-SNAPSHOT</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 26446eb0e95370023e1bc4c0647e1b3dc09536d9..df2a30936fa87797c3257722776d14db46a360c6 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-core-manager-deegree/pom.xml b/xplan-core/xplan-core-manager-deegree/pom.xml
index 622f29e71d8047c5a19426dc5a1708beaab2e32a..13dfc19164b74d5c044241027a3df5e4f8bdd887 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-inspireplu-transformation/pom.xml
index 2838bca09e3b6e5f05533cd6b0ca64e6bf1284d1..8d2cd27d435c172f078c3133ae9f2f7f797921c9 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-manager-core/pom.xml
index 14ecedb778aa71c01aea51d7ce99a6a1219389a8..3e14a297a3039cb933419bb25073c71f8ff0c309 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
@@ -181,7 +181,7 @@
<dependency>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core-manager-deegree</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
index c1ae2cf858874161f45849992bf5eaa223beca62..f5e0c79192b532664a87852f952d23c02a443c14 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
@@ -168,7 +168,7 @@ public class XPlanDao {
* @return id of plan with minimal release date
* @throws SQLException
*/
- public String getPlanIdOfMoreRecentRasterPlan(Date releaseDate) {
+ public int getPlanIdOfMoreRecentRasterPlan(Date releaseDate) {
return xPlanDbAdapter.selectXPlanIdOfMoreRecentRasterPlan(releaseDate);
}
@@ -237,6 +237,16 @@ public class XPlanDao {
return xPlanDbAdapter.selectInternalId(planId);
}
+ /**
+ * Retrieve internalId by the manager id from xplanmgr.plans.
+ * @param planId the planId of the plan, never <code>null</code>
+ * @return the internal id of a plan (if available), <code>null</code> if an error
+ * occurred
+ */
+ public Date retrieveSortDate(int planId) {
+ return xPlanDbAdapter.selectSortDate(planId);
+ }
+
/**
* Updates the district column of the table xplanmgr.plans.
* @param plan the plan to update, never <code>null</code>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
index dafd12faaa2417753b0f740644a1b3e82ea5f8d0..1e8dd82999613e58a64f5caef396a9ff85ce27cb 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
@@ -313,15 +313,17 @@ public class XPlanDbAdapter {
/**
* retrieves the id of the plan closest in future to the date passed
* @param releaseDate minimal release date
- * @return id of plan with minimal release date
+ * @return id of plan with minimal release date, -1 if no such plan exists
* @throws SQLException
*/
@Transactional(readOnly = true)
- public String selectXPlanIdOfMoreRecentRasterPlan(Date releaseDate) {
+ public int selectXPlanIdOfMoreRecentRasterPlan(Date releaseDate) {
+ if (releaseDate == null)
+ return -1;
List<Plan> plan = planRepository.findByPlanWithMoreRecentRasterPlan(releaseDate);
if (plan.isEmpty())
- return null;
- return Integer.toString(plan.get(0).getId());
+ return -1;
+ return plan.get(0).getId();
}
/**
@@ -377,6 +379,20 @@ public class XPlanDbAdapter {
return null;
}
+ /**
+ * Retrieve sortDate by the manager id from xplanmgr.plans.
+ * @param planId the planId of the plan, never <code>null</code>
+ * @return the sortDate of a plan (if available), otherwise <code>null</code>
+ */
+ @Transactional(readOnly = true)
+ public Date selectSortDate(int planId) {
+ Optional<Plan> plan = planRepository.findById(planId);
+ if (plan.isPresent()) {
+ return plan.get().getWmssortdate();
+ }
+ return null;
+ }
+
private File retrieveUploadedArtefact(String refFileName, List<File> uploadedArtefacts) {
if (uploadedArtefacts != null) {
for (File uploadedArtefact : uploadedArtefacts) {
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
index e2eeff41292775006d4d46ad337df095c5750105..0cc84699c65cd24e8564ffe8a76d2435d6ddc7b1 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
@@ -150,6 +150,7 @@ public class XPlanEditManager extends XPlanTransactionManager {
reassignFids(modifiedPlanFc);
FeatureCollection synFc = createSynFeatures(modifiedPlanFc, version);
String internalId = xplanDao.retrieveInternalId(planId);
+ Date oldSortDate = xplanDao.retrieveSortDate(planId);
// TODO: Validation required?
PlanStatus newPlanStatus = detectNewPlanStatus(type, xPlanToEdit, oldLegislationStatus, oldPlanStatus);
@@ -160,7 +161,7 @@ public class XPlanEditManager extends XPlanTransactionManager {
synFc, xPlanMetadata, sortDate, internalId);
startCreationIfPlanNameHasChanged(planId, type, modifiedPlanFc, oldPlanName, oldDescription);
updateRasterConfiguration(planId, makeRasterConfig, uploadedArtefacts, type, oldPlanStatus, editedArtefacts,
- newPlanStatus, sortDate);
+ newPlanStatus, sortDate, oldSortDate);
LOG.info("XPlanGML wurde erfolgreich editiert. ID: {}", planId);
}
}
@@ -173,13 +174,18 @@ public class XPlanEditManager extends XPlanTransactionManager {
private void updateRasterConfiguration(int planId, boolean makeRasterConfig, List<File> uploadedArtefacts,
XPlanType type, PlanStatus oldPlanStatus, EditedArtefacts editedArtefacts, PlanStatus newPlanStatus,
- Date sortDate) throws JAXBException, IOException, ConfigurationException {
+ Date sortDate, Date oldSortDate) throws JAXBException, IOException, ConfigurationException {
List<String> removedRefFileNames = editedArtefacts.getFileNames(REMOVED, RASTER, RASTER_GEOREFERENCE);
xPlanRasterManager.removeRasterLayers(planId, removedRefFileNames);
if (makeRasterConfig) {
XPlanArchiveContentAccess archive = new XPlanPartArchive(uploadedArtefacts);
List<String> addedRefFileNames = editedArtefacts.getFileNames(ADDED, RASTER);
createRasterConfiguration(archive, addedRefFileNames, planId, type, oldPlanStatus, newPlanStatus, sortDate);
+ if (sortDateHasChanged(sortDate, oldSortDate)) {
+ int moreRecentPlanId = xplanDao.getPlanIdOfMoreRecentRasterPlan(sortDate);
+ xPlanRasterManager.updateSortOrderOfRasterLayers(planId, moreRecentPlanId, oldPlanStatus, newPlanStatus,
+ type);
+ }
reloadWorkspace(planId);
}
else {
@@ -188,6 +194,15 @@ public class XPlanEditManager extends XPlanTransactionManager {
LOG.info("Rasterkonfiguration für den Plan mit der ID {} wurde ausgetauscht (falls vorhanden).", planId);
}
+ private boolean sortDateHasChanged(Date sortDate, Date oldSortDate) {
+ if (oldSortDate == null && sortDate == null)
+ return false;
+ if (oldSortDate != null && sortDate != null) {
+ return !sortDate.equals(oldSortDate);
+ }
+ return true;
+ }
+
private PlanStatus detectNewPlanStatus(XPlanType type, XPlanToEdit xPlanToEdit, String oldLegislationStatus,
PlanStatus oldPlanStatus) {
int newLegislationStatusCode = xPlanToEdit.getBaseData().getLegislationStatusCode();
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
index a7a85f0ca374a77552eca23fd870d1712277cee3..cba90b5f1ef8c0bfb4e7230e5a3e9181dc789580 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
@@ -101,10 +101,7 @@ public abstract class XPlanTransactionManager {
protected List<String> createRasterConfiguration(XPlanArchiveContentAccess archive,
List<String> rasterRefsFileNamesToAdd, int planId, XPlanType type, PlanStatus planStatus,
PlanStatus newPlanStatus, Date sortDate) {
- String moreRecentPlanId = null;
- if (sortDate != null) {
- moreRecentPlanId = xplanDao.getPlanIdOfMoreRecentRasterPlan(sortDate);
- }
+ int moreRecentPlanId = xplanDao.getPlanIdOfMoreRecentRasterPlan(sortDate);
return xPlanRasterManager.updateWmsWorkspaceWithRasterLayers(archive, rasterRefsFileNamesToAdd, planId,
moreRecentPlanId, type, planStatus, newPlanStatus, sortDate);
}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
index ee487ed69fae8b9da42572ac287badb07436404a..09f5adca014248e5003a3bc9077c243ce517f782 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
@@ -130,8 +130,7 @@ public class WmsWorkspaceWrapper {
return configFile;
}
- private void checkTheme(String type, File config, Themes themes)
- throws JAXBException, IOException, ConfigurationException {
+ private void checkTheme(String type, File config, Themes themes) throws ConfigurationException {
ThemeType theme = themes.getTheme();
if (theme == null) {
throw new ConfigurationException("Datei '" + config + "' enthält kein Theme-Element.");
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
index 3493ca30086d3e1308bcd962df3d1ee512c72f36..531483c2dd05f5120c7b8ba2339afb8f8bf1f533 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
@@ -102,8 +102,8 @@ public class XPlanRasterManager {
}
}
catch (Exception e) {
- LOG.trace("Rasterlayers of plan with id " + planId + " could not be removed!", e);
LOG.error("Rasterlayers of plan with id " + planId + " could not be removed: {}", e.getMessage());
+ LOG.trace("Rasterlayers of plan with id " + planId + " could not be removed!", e);
}
finally {
applicationEventPublisher.publishEvent(storageEvent);
@@ -128,7 +128,7 @@ public class XPlanRasterManager {
* layer was created, but never <code>null</code>
*/
public List<String> updateWmsWorkspaceWithRasterLayers(XPlanArchiveContentAccess archive,
- List<String> rasterRefsFileNamesToAdd, int planId, String moreRecentPlanId, XPlanType type,
+ List<String> rasterRefsFileNamesToAdd, int planId, int moreRecentPlanId, XPlanType type,
PlanStatus planStatus, PlanStatus newPlanStatus, Date sortDate) {
long begin = System.currentTimeMillis();
@@ -149,8 +149,8 @@ public class XPlanRasterManager {
return rasterIds;
}
catch (Exception e) {
- LOG.error("Rasterconfiguration could not be created!", e);
- LOG.trace("Rasterconfiguration could not be created: {} ", e.getMessage());
+ LOG.error("Rasterconfiguration could not be created: {} ", e.getMessage());
+ LOG.trace("Rasterconfiguration could not be created!", e);
throw new RuntimeException("Fehler beim Erzeugen der Rasterkonfigurationen: " + e.getLocalizedMessage());
}
finally {
@@ -158,6 +158,13 @@ public class XPlanRasterManager {
}
}
+ public void updateSortOrderOfRasterLayers(int planId, int moreRecentPlan, PlanStatus oldPlanStatus,
+ PlanStatus newPlanStatus, XPlanType type) throws ConfigurationException, JAXBException, IOException {
+ if (newPlanStatus.equals(oldPlanStatus)) {
+ rasterConfigManager.reorderWmsLayers(planId, moreRecentPlan, newPlanStatus, type);
+ }
+ }
+
/**
* Updates the existing raster layer configuration, if the planStatus and
* newPlanStatus differs, the configuration is moved from one theme to another.
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
index 27f5f9135b1aa767f16c833b0a84c8ca6eeebcec..ebd93d94c53ad9209b0a91ec61588bc6cffce3a5 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
@@ -58,7 +58,7 @@ public class DeegreeRasterConfigManager implements RasterConfigManager {
}
@Override
- public void insertRasterLayers(int planId, String moreRecentPlanId, XPlanType type, PlanStatus planStatus,
+ public void insertRasterLayers(int planId, int moreRecentPlanId, XPlanType type, PlanStatus planStatus,
PlanStatus newPlanStatus, List<String> rasterIds, Date sortDate)
throws JAXBException, IOException, ConfigurationException {
String statusType = detectType(type, planStatus);
@@ -140,6 +140,22 @@ public class DeegreeRasterConfigManager implements RasterConfigManager {
rasterThemeManager.reorderWmsLayers(planId2sortDate, managerConfiguration.getRasterConfigurationCrs());
}
+ /**
+ * Reorders the wms layer configuration of the raster configurations of plan with the
+ * passed id planId.
+ * @param planId of the plan to reorder
+ * @param moreRecentPlan the id of the more recent plan
+ * @param planStatus
+ * @param xPlanType
+ * @throws Exception
+ */
+ @Override
+ public void reorderWmsLayers(int planId, int moreRecentPlan, PlanStatus planStatus, XPlanType xPlanType)
+ throws ConfigurationException, JAXBException, IOException {
+ String statusType = detectType(xPlanType, planStatus);
+ rasterThemeManager.reorderWmsLayers(planId, moreRecentPlan, statusType);
+ }
+
@Override
public void createConfiguration(String rasterId, String rasterFileName) throws IOException, JAXBException {
rasterLayerManager.createRasterConfigurations(rasterId, rasterFileName,
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
index 61f6e14d5dc1599a79070f4086836b66941e0a31..9e863766b95cf4323479adb1601dfff7ac7fbac0 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
@@ -33,7 +33,7 @@ import java.util.Map;
public class NoConfigRasterConfigManager implements RasterConfigManager {
@Override
- public void insertRasterLayers(int planId, String moreRecentPlanId, XPlanType type, PlanStatus planStatus,
+ public void insertRasterLayers(int planId, int moreRecentPlanId, XPlanType type, PlanStatus planStatus,
PlanStatus newPlanStatus, List<String> rasterIds, Date sortDate) {
}
@@ -53,6 +53,10 @@ public class NoConfigRasterConfigManager implements RasterConfigManager {
public void reorderWmsLayers(Map<String, Date> planId2sortDate) {
}
+ @Override
+ public void reorderWmsLayers(int planId, int moreRecentPlan, PlanStatus planStatus, XPlanType xPlanType) {
+ }
+
@Override
public void createConfiguration(String rasterId, String rasterFileName) {
}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
index f4a4a684a49f386ea94af07e3e22393c56556ce5..8931fc7515e0e23834e1f21d9cb486e457566df1 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
@@ -35,7 +35,7 @@ import java.util.Map;
*/
public interface RasterConfigManager {
- void insertRasterLayers(int planId, String moreRecentPlanId, XPlanType type, PlanStatus planStatus,
+ void insertRasterLayers(int planId, int moreRecentPlanId, XPlanType type, PlanStatus planStatus,
PlanStatus newPlanStatus, List<String> rasterIds, Date sortDate)
throws JAXBException, IOException, ConfigurationException;
@@ -48,6 +48,9 @@ public interface RasterConfigManager {
void reorderWmsLayers(Map<String, Date> planId2sortDate) throws Exception;
+ void reorderWmsLayers(int planId, int moreRecentPlan, PlanStatus planStatus, XPlanType xPlanType)
+ throws ConfigurationException, JAXBException, IOException;
+
void createConfiguration(String rasterId, String rasterFileName) throws IOException, JAXBException;
}
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
index 213ae02ad17e066309c703452b023300df29539e..5eeb862e21bee83aa7b4a3a679a56a4c302cfc43 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static de.latlon.xplan.manager.wmsconfig.WmsWorkspaceWrapper.supportedTypes;
import static java.lang.Boolean.TRUE;
@@ -81,7 +82,7 @@ public class WorkspaceRasterThemeManager {
* @throws ConfigurationException
*/
public synchronized void insertLayersRightBefore(String type, String crs, List<String> rasterLayerIds,
- String succeedingPlanId) throws JAXBException, IOException, ConfigurationException {
+ int succeedingPlanId) throws JAXBException, IOException, ConfigurationException {
checkIfTypeIsSupported(type);
WmsThemesConfig themesConfig = wmsWorkspaceWrapper.retrieveThemesForType(type, crs);
@@ -208,6 +209,22 @@ public class WorkspaceRasterThemeManager {
}
}
+ public void reorderWmsLayers(int planId, int moreRecentPlan, String statusType)
+ throws ConfigurationException, JAXBException, IOException {
+ WmsThemesConfig themesConfig = wmsWorkspaceWrapper.retrieveThemesForType(statusType);
+ Themes themes = themesConfig.getThemes();
+
+ ThemeType sortedTheme = themes.getTheme().getTheme().get(0);
+ List<Layer> layers = sortedTheme.getLayer();
+ List<Layer> layersToChangeIndex = layers.stream()
+ .filter(layer -> layer.getValue().startsWith(planId + "_"))
+ .collect(Collectors.toList());
+ layers.removeAll(layersToChangeIndex);
+ int index = findIndex(layers, moreRecentPlan);
+ layers.addAll(index, layersToChangeIndex);
+ persist(themes, themesConfig.getConfig());
+ }
+
private void reorderWmsLayers(List<String> sortedByDate, String crs, String supportedType)
throws JAXBException, IOException, ConfigurationException {
WmsThemesConfig themesConfig = wmsWorkspaceWrapper.retrieveThemesForType(supportedType, crs);
@@ -228,8 +245,8 @@ public class WorkspaceRasterThemeManager {
marshaller.marshal(themes, config);
}
- private int findIndex(List<Layer> layers, String succedingPlanId) {
- if (succedingPlanId != null) {
+ private int findIndex(List<Layer> layers, int succedingPlanId) {
+ if (succedingPlanId > -1) {
String prefix = succedingPlanId + "_";
for (int i = 0; i < layers.size(); i++) {
if (layers.get(i).getLayerStore().startsWith(prefix)) {
diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-synthesizer/pom.xml
index 5b32faaf65748fb0f07e1059392acb81373c4bd8..2191a0fa62fc59c74f30576b1083671ec1e37665 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn
index 72bdf9fd42d56c59891fa19a2a1b8f00d9fa749f..be3fbdfa9ad896dded529823326db2870ce14f1c 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
BP_AbgrabungsFlaeche/endeBedingung=xplanFlatten(xpath('xplan:endeBedingung'))
BP_AbgrabungsFlaeche/flaechenschluss=xpath('xplan:flaechenschluss')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn
index 3778bf28d5ecdc8a9ebe6fd2afe81af2e0e17fc0..3405390fea197d2a8d4b862450fdee806eef37c5 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
BP_AbgrabungsFlaeche/endeBedingung=xplanFlatten(xpath('xplan:endeBedingung'))
BP_AbgrabungsFlaeche/flaechenschluss=xpath('xplan:flaechenschluss')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn
index 560334b5f6682a5dc3625ce87446717008a17fc0..c264fda8635bdd288ed1e5d4431bfbab010c1a69 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
BP_AbgrabungsFlaeche/endeBedingung=xplanFlatten(xpath('xplan:endeBedingung'))
BP_AbgrabungsFlaeche/externeReferenz=xplanFlatten(xpath('xplan:externeReferenz'))
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn
index 2cbcd870c933bb8416b9c348aedf8a40c58a3f6c..b3d1d79d5f27c822f2f10ab76b68434dea35d28e 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/abbaugut=xpath('xplan:abbaugut')
BP_AbgrabungsFlaeche/aufschrift=xpath('xplan:aufschrift')
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn
index a49b01c1e41190ad14e5bb76d62a96b6652d30ce..77ca00c4812e1a510e8b47e96d38f7909e96689d 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/abbaugut=xpath('xplan:abbaugut')
BP_AbgrabungsFlaeche/aufschrift=xpath('xplan:aufschrift')
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn
index 394326c84fe5ca97b66873e3daff50837fb0de0b..683d97a1d67abe2eed42d472499e1841bc9c95a3 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/abbaugut=xpath('xplan:abbaugut')
BP_AbgrabungsFlaeche/aufschrift=xpath('xplan:aufschrift')
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn
index a95b5f19ffba295dfd66a93a98ef12f338735e36..74a03f630a9a2d8238673a6970a26644ee3cc39c 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/abbaugut=xpath('xplan:abbaugut')
BP_AbgrabungsFlaeche/aufschrift=xpath('xplan:aufschrift')
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn
index 1a1bf222fec45f11111e09dd1aaa111f3c7edf93..e511755be51c61c377ea167f9343642c90c88571 100644
--- a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn
+++ b/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn
@@ -13,10 +13,10 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
BP_AbgrabungsFlaeche/abbaugut=xpath('xplan:abbaugut')
BP_AbgrabungsFlaeche/aufschrift=xpath('xplan:aufschrift')
BP_AbgrabungsFlaeche/ebene=xpath('xplan:ebene')
diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-validator-core/pom.xml
index ea4fec0edb248089c0578b517bc3b6fd827f5f49..ffe163a3602a0251b20e98b335f766d81e00c0f4 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
index e55240c8a86f5e002753adb229c182e1695465f0..15aacc4706e6b55ceed91e850acd65f15dca7037 100644
--- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
+++ b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
@@ -182,6 +182,7 @@ public class XPlanValidator {
report.setArchiveName(archiveName);
report.setDate(new Date());
report.setXPlanVersion(archive.getVersion());
+ report.setXPlanType(archive.getType());
List<ValidationType> validationType = getValidationType(validationSettings);
validateSyntactic(archive, report);
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
index 6d0db0903b085e7814ece9a6b4bd5ed63021be8b..a365649da7e6e18798a113d1787c728e1cfff2c9 100644
--- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
+++ b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
@@ -20,6 +20,7 @@
*/
package de.latlon.xplan.validator.report;
+import de.latlon.xplan.commons.XPlanType;
import de.latlon.xplan.commons.XPlanVersion;
import de.latlon.xplan.validator.geometric.report.GeometricValidatorResult;
import de.latlon.xplan.validator.report.reference.ExternalReferenceReport;
@@ -60,6 +61,8 @@ public class ValidatorReport {
private XPlanVersion xPlanVersion;
+ private XPlanType xPlanType;
+
private Envelope bboxIn4326;
public ValidatorReport() {
@@ -217,6 +220,21 @@ public class ValidatorReport {
this.xPlanVersion = xPlanVersion;
}
+ /**
+ * @return the type of the validated XPlanGML, may be <code>null</code> if not known
+ */
+ public XPlanType getXPlanType() {
+ return xPlanType;
+ }
+
+ /**
+ * @param xPlanType the type of the validated XPlanGML, may be <code>null</code> if
+ * not known
+ */
+ public void setXPlanType(XPlanType xPlanType) {
+ this.xPlanType = xPlanType;
+ }
+
/**
* @param bboxIn4326 bbox of the plan in EPSG:4326, may be <code>null</code>
*/
diff --git a/xplan-distribution/pom.xml b/xplan-distribution/pom.xml
index 727702b07e0ffd118e36a663714c28377f55c981..5aba162d96bc3057345d55d38d723d30b19d8324 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
@@ -200,6 +200,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xplan-mapproxy-config</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xplan-workspaces</artifactId>
diff --git a/xplan-distribution/src/main/assembly/assembly.xml b/xplan-distribution/src/main/assembly/assembly.xml
index fc1bb471c64fa34312b75e791f00f90cc8e409e6..396181b3e2eaf946ec1a29050d379b65f272382b 100644
--- a/xplan-distribution/src/main/assembly/assembly.xml
+++ b/xplan-distribution/src/main/assembly/assembly.xml
@@ -77,6 +77,7 @@
<include>de.latlon.product.xplanbox:xplan-validator-config:zip:*</include>
<include>de.latlon.product.xplanbox:xplan-dokumenten-config:zip:*</include>
<include>de.latlon.product.xplanbox:xplan-mapserver-config:zip:*</include>
+ <include>de.latlon.product.xplanbox:xplan-mapproxy-config:zip:*</include>
<include>de.latlon.product.xplanbox:xplan-workspaces:zip:*</include>
</includes>
</dependencySet>
diff --git a/xplan-docker/pom.xml b/xplan-docker/pom.xml
index d18713ae0bccc9adf8d1f3740888fa9d6fb7ddbd..25d87878084e97cc3572cabfb085cce652c8bdc8 100644
--- a/xplan-docker/pom.xml
+++ b/xplan-docker/pom.xml
@@ -8,10 +8,11 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
+ <module>xplan-docker-mapproxy</module>
<module>xplan-docker-mapserver</module>
<module>xplan-docker-tomcat</module>
<module>xplan-docker-tomcat-gdal</module>
diff --git a/xplan-docker/xplan-docker-mapproxy/Dockerfile b/xplan-docker/xplan-docker-mapproxy/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0131e94c838c2fbdb260b8f3001e322850d1483a
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/Dockerfile
@@ -0,0 +1,59 @@
+FROM python:3.10-slim
+
+ARG MAPPROXY_VERSION=1.16.0
+ARG BUILD_DATE=?
+ARG DOCKER_IMAGE_NAME=?
+ARG GIT_REVISION=?
+ARG XPLANBOX_VERSION=latest
+
+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" \
+ "maintainer"=""
+
+ENV TZ=Europe/Berlin \
+ PATH=/srv/mapproxy/venv/bin:$PATH \
+ XPLAN_MAPPROXY_PATH=xplan-mapproxy \
+ XPLAN_MAPPROXY_MINPROC=2 \
+ XPLAN_MAPPROXY_MAXPROC=4 \
+ XPLAN_MAPPROXY_RESEED_CONCURRENCY=4 \
+ XPLAN_MAPPROXY_ROOT_LOGLEVEL=ERROR \
+ XPLAN_MAPPROXY_SOURCES_LOGLEVEL=INFO \
+ XPLAN_MAPPROXY_THREADS=10
+
+RUN apt update && apt -y install --no-install-recommends \
+ gcc \
+ python3-venv \
+ libgdal-dev \
+ libgeos-dev \
+ gettext-base && \
+ apt-get -y --purge autoremove && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/* && \
+ python -m venv --system-site-packages /srv/mapproxy/venv && \
+ pip install mapproxy==$MAPPROXY_VERSION uwsgi pyproj pillow pyyaml boto3 shapely==1.7.1 && \
+ pip cache purge && \
+ addgroup --gid 1001 mapproxy && \
+ adduser --uid 1001 --shell /bin/false --gid 1001 --no-create-home --disabled-login mapproxy && \
+ chown -R 1001:1001 /srv/mapproxy
+
+COPY --chown=1001:1001 ./uwsgi.ini /srv/mapproxy/uwsgi.ini
+COPY --chown=1001:1001 ./app.py /srv/mapproxy/app.py
+COPY --chown=1001:1001 ./log.ini /srv/mapproxy/log.ini
+
+ADD target/xplan-docker-mapproxy-*.tgz /
+ADD docker-entrypoint.sh /docker-entrypoint.sh
+
+WORKDIR /srv/mapproxy
+USER 1001
+
+EXPOSE 8080
+
+ENTRYPOINT [ "/docker-entrypoint.sh"]
+CMD ["webserver"]
\ No newline at end of file
diff --git a/xplan-docker/xplan-docker-mapproxy/app.py b/xplan-docker/xplan-docker-mapproxy/app.py
new file mode 100644
index 0000000000000000000000000000000000000000..12e5dc0351d45f933e665d5e13d482031c47a060
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/app.py
@@ -0,0 +1,6 @@
+import os
+from logging.config import fileConfig
+fileConfig(r'/srv/mapproxy/log.ini', defaults={'rootLoglevel': os.environ['XPLAN_MAPPROXY_ROOT_LOGLEVEL'], 'sourceLoglevel': os.environ['XPLAN_MAPPROXY_SOURCES_LOGLEVEL']})
+
+from mapproxy.wsgiapp import make_wsgi_app
+application = make_wsgi_app(r'/srv/mapproxy/mapproxy.yaml')
\ No newline at end of file
diff --git a/xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh b/xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..df30462e6b5f7e43893a145209f90bfa4cecb569
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+executionMode=$1
+
+echo "[$(date -Iseconds)] MapProxy config initialization..."
+
+defined_envs="$(printf '${%s} ' $(env | cut -d'=' -f1))"
+envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/mapproxy.yaml > /srv/mapproxy/mapproxy.yaml
+envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/seed.yaml > /srv/mapproxy/seed.yaml
+
+if [ "$executionMode" == "seed" ]
+then
+ echo "[$(date -Iseconds)] MapProxy seed..."
+ exec mapproxy-seed -f /srv/mapproxy/mapproxy.yaml -s /srv/mapproxy/seed.yaml -c $XPLAN_MAPPROXY_RESEED_CONCURRENCY --seed bpreseed,fpreseed,lpreseed,rpreseed,soreseed
+else
+ echo "[$(date -Iseconds)] MapProxy startup..."
+ exec uwsgi --ini /srv/mapproxy/uwsgi.ini
+fi
diff --git a/xplan-docker/xplan-docker-mapproxy/log.ini b/xplan-docker/xplan-docker-mapproxy/log.ini
new file mode 100644
index 0000000000000000000000000000000000000000..a668271729e6a1d9c8192457ead82331968c7e52
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/log.ini
@@ -0,0 +1,34 @@
+[loggers]
+keys=root,source_requests
+
+[handlers]
+keys=mapproxy,source_requests
+
+[formatters]
+keys=default,requests
+
+[logger_root]
+level=%(rootLoglevel)s
+handlers=mapproxy
+
+[logger_source_requests]
+level=%(sourceLoglevel)s
+qualname=mapproxy.source.request
+propagate=0
+handlers=source_requests
+
+[handler_mapproxy]
+class=StreamHandler
+formatter=default
+args=(sys.stdout,)
+
+[handler_source_requests]
+class=StreamHandler
+formatter=requests
+args=(sys.stdout,)
+
+[formatter_default]
+format=[%(name)s] %(message)s", "level": "%(levelname)s
+
+[formatter_requests]
+format=[%(name)s] %(message)s
\ No newline at end of file
diff --git a/xplan-docker/xplan-docker-mapproxy/pom.xml b/xplan-docker/xplan-docker-mapproxy/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11485f3471498f9c6cde03730b530740535c8bcc
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>xplan-docker-mapproxy</artifactId>
+ <packaging>pom</packaging>
+ <description>XPlan Docker for MapProxy</description>
+
+ <parent>
+ <groupId>de.latlon.product.xplanbox</groupId>
+ <artifactId>xplan-docker</artifactId>
+ <version>7.1-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <docker-image.skip>false</docker-image.skip>
+ <docker-image.name>xplan-mapproxy</docker-image.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/xplan-docker-mapproxy.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xplan-mapproxy-config</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml b/xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8a104cb6ab862f68719359344e90ceb92488d5d
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml
@@ -0,0 +1,20 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>xplan-docker-mapproxy</id>
+ <formats>
+ <format>tgz</format>
+ </formats>
+ <baseDirectory>xplan-docker-mapproxy</baseDirectory>
+ <dependencySets>
+ <!--xplan-manager-config-->
+ <dependencySet>
+ <outputDirectory>/xplan-mapproxy-config</outputDirectory>
+ <includes>
+ <include>${project.groupId}:xplan-mapproxy-config</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/xplan-docker/xplan-docker-mapproxy/uwsgi.ini b/xplan-docker/xplan-docker-mapproxy/uwsgi.ini
new file mode 100644
index 0000000000000000000000000000000000000000..8dfdabd16ddc446d77a4fe6408fa3ce708d4c5a7
--- /dev/null
+++ b/xplan-docker/xplan-docker-mapproxy/uwsgi.ini
@@ -0,0 +1,47 @@
+[uwsgi]
+;https://www.bloomberg.com/company/stories/configuring-uwsgi-production-deployment/
+;strict = true
+pyargv = /srv/mapproxy/mapproxy.yaml
+mount = /$(XPLAN_MAPPROXY_PATH)=app.py
+manage-script-name = true
+virtualenv = /srv/mapproxy/venv
+pidfile = /tmp/mapproxy.pid
+http-socket = 0.0.0.0:8080
+processes = $(XPLAN_MAPPROXY_MAXPROC) ; Maximum number of workers allowed
+cheaper = $(XPLAN_MAPPROXY_MINPROC) ; Minimum number of workers allowed
+enable-threads = true
+threads = $(XPLAN_MAPPROXY_THREADS)
+master = true
+vacuum = true
+die-on-term = true ; Shutdown when receiving SIGTERM (default is respawn)
+need-app = true
+max-requests = 1000 ; Restart workers after this many requests
+max-worker-lifetime = 3600 ; Restart workers after this many seconds
+reload-on-as = 1024
+reload-on-rss = 512
+worker-reload-mercy = 60 ; How long to wait before forcefully killing workers
+;wsgi-disable-file-wrapper = true
+harakiri = 60
+py-callos-afterfork = true ; allow workers to trap signals
+cheaper-algo = busyness
+cheaper-initial = $(XPLAN_MAPPROXY_MINPROC) ; Workers created at startup
+cheaper-overload = 1 ; Length of a cycle in seconds
+cheaper-step = $(XPLAN_MAPPROXY_MINPROC) ; How many workers to spawn at a time
+cheaper-busyness-multiplier = 30 ; How many cycles to wait before killing workers
+cheaper-busyness-min = 20 ; Below this threshold, kill workers (if stable for multiplier cycles)
+cheaper-busyness-max = 70 ; Above this threshold, spawn new workers
+cheaper-busyness-backlog-alert = $(XPLAN_MAPPROXY_MINPROC) ; Spawn emergency workers if more than this many requests are waiting in the queue
+cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if there are too many requests in the queue
+uid = 1001
+gid = 1001
+http-uid = 1001
+http-gid = 1001
+disable-logging = true
+log-4xx = true
+log-5xx = true
+single-interpreter = true
+;thunder-lock = true
+stats = 0.0.0.0:9000
+stats-http = true
+log-encoder = format {"time": "${strftime:%%Y-%%m-%%dT%%H:%%M:%%S %%z}", "message": "${msg}"}
+log-encoder = nl
\ No newline at end of file
diff --git a/xplan-docker/xplan-docker-mapserver/Dockerfile b/xplan-docker/xplan-docker-mapserver/Dockerfile
index 5bad0be394a228ed83457bcff2dfaf11fe49a01a..a5f5eea79945a88268038e7fdd0a753d3c67ac9c 100644
--- a/xplan-docker/xplan-docker-mapserver/Dockerfile
+++ b/xplan-docker/xplan-docker-mapserver/Dockerfile
@@ -16,8 +16,11 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
-RUN mkdir -p /xplan-docker-mapserver
-RUN chown 1001 /etc/mapserver
+ENV TZ=Europe/Berlin
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata
+
+RUN mkdir -p /xplan-docker-mapserver \
+ && chown 1001 /etc/mapserver
ADD target/xplan-docker-mapserver-*.tgz /
ADD startupWithConfiguredMapserver.sh /xplan-docker-mapserver/
diff --git a/xplan-docker/xplan-docker-mapserver/pom.xml b/xplan-docker/xplan-docker-mapserver/pom.xml
index 9aacd34088e4e5c501f9e3d9fff92732bd0a000a..df85daebc1b2b63795c5da6a72dbc499c2db724f 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat-gdal/Dockerfile b/xplan-docker/xplan-docker-tomcat-gdal/Dockerfile
index 1365ee19c038a5600db792bcbaa9b07ce1ad536f..695c2db0cc43f39d300b8885ea1bfd30232c2015 100644
--- a/xplan-docker/xplan-docker-tomcat-gdal/Dockerfile
+++ b/xplan-docker/xplan-docker-tomcat-gdal/Dockerfile
@@ -17,11 +17,13 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
# set environment variables
+ENV TZ=Europe/Berlin
ENV LD_LIBRARY_PATH="/usr/lib/jni"
# apt-transport-https (needed to install java 11)
RUN apt update && apt -y install apt-transport-https unzip wget
+
# install jdk
RUN DEBIAN_FRONTEND=noninteractive apt -y install openjdk-11-jdk
diff --git a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
index a8ac1fee60c99257cb93ed92af8c44f56f3b87bf..168861911d0752856783bcff80be557b7c13bbb6 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat/Dockerfile b/xplan-docker/xplan-docker-tomcat/Dockerfile
index e378cc1ed42eea895cd03430a5c4ebb17bdbd240..eff296d3ca9a4c6bc5cb5eacf7852ce09a30f5cd 100644
--- a/xplan-docker/xplan-docker-tomcat/Dockerfile
+++ b/xplan-docker/xplan-docker-tomcat/Dockerfile
@@ -21,6 +21,8 @@ ENV ALLOW_EMPTY_PASSWORD=yes
USER root
+ENV TZ=Europe/Berlin
+
# see https://github.com/adoptium/temurin-build/issues/693
RUN apt-get update && apt-get -y install fontconfig
diff --git a/xplan-docker/xplan-docker-tomcat/pom.xml b/xplan-docker/xplan-docker-tomcat/pom.xml
index 103754ed97e34187b51dfa7aa9f82fce0b614dee..1ab54354f4699002f8cbc2d7faf2e544363646cf 100644
--- a/xplan-docker/xplan-docker-tomcat/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat/pom.xml
@@ -3,17 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>xplan-docker-tomcat</artifactId>
+ <packaging>pom</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
<docker-image.skip>false</docker-image.skip>
<maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
</properties>
<dependencies>
diff --git a/xplan-docker/xplan-docker-volume-init/Dockerfile b/xplan-docker/xplan-docker-volume-init/Dockerfile
index 42d8fcc351daca65c98da54e31022084c76813a2..ebc2cf0da5b08fea890c4c148f5f233877c21b12 100644
--- a/xplan-docker/xplan-docker-volume-init/Dockerfile
+++ b/xplan-docker/xplan-docker-volume-init/Dockerfile
@@ -15,7 +15,8 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
-RUN apk --no-cache add bash curl unzip
+RUN apk --no-cache add bash curl tzdata unzip
+ENV TZ=Europe/Berlin
# TODO: update
RUN mkdir -p /xplan-volume-init
diff --git a/xplan-docker/xplan-docker-volume-init/pom.xml b/xplan-docker/xplan-docker-volume-init/pom.xml
index c523cc794a0def1e4a055d51a589a6bc79037cef..165fa52767e922dc39e8bfcd8d998cea4c64bd67 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-documentation/pom.xml b/xplan-documentation/pom.xml
index 6fb7e3fdfd53cdd3067e1782b9cfc5960d7f2489..c4965e3617c3e2656594dce8d5920244ca5226d9 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/Dockerfile b/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
index 170f8d01bd00f803c76b5b9e308d2dce90512ebd..1f96ab781e72575643073c4c85b1d67a516dd5ef 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
+++ b/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
@@ -16,5 +16,7 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
+ENV TZ=Europe/Berlin
+
RUN mkdir /usr/share/nginx/html/xPlanBox-Benutzerhandbuch
COPY target/html/ /usr/share/nginx/html/xPlanBox-Benutzerhandbuch/
\ No newline at end of file
diff --git a/xplan-documentation/xplan-benutzerhandbuch/pom.xml b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
index a57a11fd61e2a5f0c4a15e6bef97ede8fbd6501f..51f5a48fba9acacb989889b60247c04242cb7aab 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
index da41d6ce6e9ca6f848e3e7c06f67c8ee27f73c0d..96a3a6aaba015ccd5a6565137af35d0b2ae790e8 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/bekannteProbleme.adoc
@@ -63,11 +63,6 @@ Wird ein Text, Dokument oder eine Rasterbasis mit dem Namen _xplan.gml_ über di
IMPORTANT: Der Fehler kann nicht in der xPlanBox behoben werden! Das XPlanArchiv muss aus der Datenhaltung entfernt, korrigiert und dann erneut über den XPlanManager importiert werden.
-=== XPlanManagerWeb und XPlanManagerAPI - Sortierung der Rasterdaten wird nach Änderungen nicht aktualisiert
-
-Wird über den XPlanManager ein für die Sortierung der Pläne in der Darstellung im XPlanWMS verwendete Datumsfeld angepasst, erfolgt derzeit keine automatische Aktualisierung der Konfiguration des XPlanWMS.
-Für eine Aktualisierung der Konfiguration des XPlanWMS steht ein Kommandozeilenwerkzeug für den Administrator zur Verfügung, weitere Hinweise zur Verwendung finden sich im Betriebshandbuch.
-
=== XPlanValidatorAPI - Verwendung von vollqualifizierten Pfaden im HTTP-Header "X-Filename"
Wird der HTTP-Header "X-Filename" mit einem vollqualifizierten Pfad angegeben, kommt es bei der Anfrage eines Reports im Format PDF zu einem HTTP-Statusfehler 500.
diff --git a/xplan-documentation/xplan-betriebshandbuch/Dockerfile b/xplan-documentation/xplan-betriebshandbuch/Dockerfile
index 7c744bc5ca3af3d61accc6260dbc31d391daff73..beee3def20108ecee7d8d5c10a2510a83d57addb 100644
--- a/xplan-documentation/xplan-betriebshandbuch/Dockerfile
+++ b/xplan-documentation/xplan-betriebshandbuch/Dockerfile
@@ -16,5 +16,7 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
+ENV TZ=Europe/Berlin
+
RUN mkdir /usr/share/nginx/html/xPlanBox-Betriebshandbuch
COPY target/html/ /usr/share/nginx/html/xPlanBox-Betriebshandbuch/
\ No newline at end of file
diff --git a/xplan-documentation/xplan-betriebshandbuch/pom.xml b/xplan-documentation/xplan-betriebshandbuch/pom.xml
index 9cc4de0b4ba9908dd31737d841e4115370f80b0f..569f2ca047610320e32ade1a4677abd5a087f04a 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_gml.properties b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_gml.properties
index 53524afad0c4f1bfb6806ec77bb3e9925628f77a..d2655bbdafa9ed472d98600a4b0f9a0df045c83d 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_gml.properties
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_gml.properties
@@ -13,11 +13,11 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
-#Wed Mar 15 10:58:04 CET 2023
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
+#Thu Nov 02 10:41:42 CET 2023
{http\://www.opengis.net/gml/3.2}AbstractCoverage=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.opengis.net/gml/3.2}AbstractDiscreteCoverage=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.opengis.net/gml/3.2}AbstractFeature=epsg\:4326,5.7,47.2,15.1,55.1
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_syn.properties b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_syn.properties
index d8aec6b104f90ef40ca7f9b3d65775e7480299a2..2859f02cb7af4e329f7a587d468f664f99504bd7 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_syn.properties
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/downloads/bbox_cache_syn.properties
@@ -13,11 +13,11 @@
# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
-#Wed Mar 15 10:58:04 CET 2023
+# 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%
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
+#Thu Nov 02 10:41:42 CET 2023
{http\://www.deegree.org/xplanung/1/0}BP_AbgrabungsFlaeche=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.deegree.org/xplanung/1/0}BP_AbstandsFlaeche=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.deegree.org/xplanung/1/0}BP_AbstandsMass=epsg\:4326,5.7,47.2,15.1,55.1
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
index 355a8d1e08e8b23306e26a98b4529a3e8b3efed7..b192d5eb3f4d41ca25a9c851c944842e44912d77 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc
@@ -84,7 +84,7 @@ Die Kommandozeilenkomponenten (s. <<installationskomponenten>>) können an belie
** _xplan-update-data-cli/bin/bereichUpdate_ - ermöglicht die Aktualisierung der in der Datenbank gespeicherten Informationen zu den Bereichen einzelner Pläne (nur für ein Update auf Version 5.0.2 erforderlich). Der Aufruf des Tools mit `--help` liefert Hinweise zur Verwendung.
** _xplan-update-data-cli/bin/districtUpdate_ - ermöglicht die Aktualisierung der in der Datenbank gespeicherten Ortsteilnamen. Der Aufruf des Tools mit `--help` liefert Hinweise zur Verwendung.
** _xplan-update-data-cli/bin/reSynthesizer_ - ermöglicht die Aktualisierung der im XPlanSyn-Schema gespeicherten Daten. Der Aufruf des Tools mit `--help` liefert Hinweise zur Verwendung.
-** _xplan-update-data-cli/bin/sortDateUpdate_ - ermöglicht die Aktualisierung der in der Datenbank gespeicherten Sortierfelder. Der Aufruf des Tools mit `--help` liefert Hinweise zur Verwendung.
+** _xplan-update-data-cli/bin/sortDateUpdate_ - ermöglicht die Aktualisierung der in der Datenbank gespeicherten Sortierfelder und die Sortierung der Rasterdaten in der Themes Konfiguration, sofern deegree für die Bereitstellung der Rasterdaten verwendet wird. Der Aufruf des Tools mit `--help` liefert Hinweise zur Verwendung.
TIP: Um die Kommandozeilenwerkzeuge von einem beliebigen Ort aufrufen zu können, empfiehlt es sich, die Pfade in die `PATH` Variable mit aufzunehmen.
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/main.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/main.adoc
index 42a02f9a920aa9ec68da81c3389bc5eba64afc9b..4628a975de86ac63b4969a3470efe90d8fe7fba7 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/main.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/main.adoc
@@ -19,4 +19,6 @@ include::hale-cli.adoc[]
include::mapserver.adoc[]
+include::mapproxy.adoc[]
+
include::startApplikationsserver.adoc[]
\ No newline at end of file
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapproxy.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapproxy.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7ee6b5e3fb04bf385c1f8a0bb8c33d18a7ee6ee2
--- /dev/null
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapproxy.adoc
@@ -0,0 +1,10 @@
+[[installation-mapproxy]]
+=== Installation und Konfiguration des MapProxy
+
+Die Installation von MapProxy ist optional und erfordert zusätzlich die Installation von https://www.python.org/[Python] in der Version 3.10 oder höher.
+
+Weitere Informationen zur Installation sind in der https://mapproxy.org/documentation[Dokumentation] beschrieben.
+
+Die Konfigurationsdateien _mapproxy.yaml_ und _seed.yaml_ sind im Distributionspaket _xplan-mapproxy-config-<VERSION>.zip_ enthalten und müssen in das entsprechende Verzeichnis kopiert werden.
+
+In der http://mapproxy.github.io/mapproxy/seed.html[Dokumention von MapProxy] ist auch die Verwendung des Skripts `mapproxy-seed` beschrieben, um nach einer Änderung des Datenbestands den Cache des MapProxy zu aktualisieren.
\ No newline at end of file
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapserver.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapserver.adoc
index 41a3845d0e7c25d67ba62b7dea0f2bb25520e6c3..ad1d2696111888b9b2dacc7d4bf74e2a6d83b217 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapserver.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/mapserver.adoc
@@ -1,12 +1,16 @@
[[installation-mapserver]]
=== Installation und Konfiguration von MapServer
-Die xPlanBox unterstützt für die Darstellung von Rasterdaten über einen WMS zusätzlich zum deegreeWMS den MapServer. Die Installation von MapServer ist optional. Die Konfiguration ist im Abschnitt <<konfiguration-xplanwms-mapserver>> beschrieben.
+Die xPlanBox unterstützt für die Darstellung von Rasterdaten über einen WMS zusätzlich zum deegreeWMS den MapServer WMS. Die Installation von MapServer ist optional und in der https://mapserver.org/installation/unix.html#installation[Dokumentation] beschrieben.
+
+Die Konfigurationsdatei _mapserver.map_ ist im Distributionspaket _xplan-mapserver-config-<VERSION>.zip_ enthalten und muss in das entsprechende Verzeichnis kopiert werden.
+
+Die Konfiguration des XPlanWMS mit MapServer ist im Abschnitt <<konfiguration-xplanwms-mapserver>> beschrieben.
[[installation-mapserver-linux]]
==== Linux
-MapServer 8.0 kann aus einer Paketquelle installiert werden. Weitere Hinweise zur Installation ist in der https://mapserver.org/installation/unix.html#installation[Dokumentation des MapServer] zu finden.
+MapServer 8.0 kann über den Paketmanager der Linux-Distribution installiert werden. Weitere Hinweise zur Installation sind in der https://mapserver.org/installation/unix.html#installation[Installationsanleitung des MapServer] zu finden.
[[installation-mapserver-windows]]
==== Windows
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
index e3fda99b10fea148642afbe01e8cf2d86d0d5a57..23c1d8fa0765dc231fd52a29a4417b197b08dbe2 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc
@@ -30,6 +30,9 @@ Die xPlanBox umfasst die folgenden Komponenten, die zusammengenommen die Liefere
* MapServer Konfiguration
** xplan-mapserver-config-<VERSION>.zip
+* MapProxy Konfiguration
+ ** xplan-mapproxy-config-<VERSION>.zip
+
* Dokumentation (in HTML und PDF-Format):
** XPlanBenutzerhandbuch - Benutzerhandbuch für die Komponenten der xPlanBox
** XPlanBetriebshandbuch - Betriebshandbuch und Installationsanleitung für die xPlanBox
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ueberblick.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ueberblick.adoc
index 025e87a743b8c20467eaffc1cc5abd7d9df62012..58d7bd0337fed4a70e3630c1a80742b5d8f56cf5 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ueberblick.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ueberblick.adoc
@@ -101,10 +101,20 @@ IMPORTANT: Erforderlich ist GDAL 3.0+.
[[mapserver]]
=== MapServer
-Optional kann der https://mapserver.org[MapServer] installiert werden. Wenn für die Bereitstellung von Rasterdaten der MapServer verwendet werden soll, dann muss dieser zusammen mit <<gdal, GDAL>> installiert werden. Weitere Informationen zur Installation befinden sich im Abschnitt <<installation-mapserver>>.
+Optional kann https://mapserver.org[MapServer] installiert werden. Wenn für die Bereitstellung von Rasterdaten MapServer verwendet werden soll, dann muss die Software zusammen mit <<gdal, GDAL>> installiert werden. Weitere Informationen zur Installation befinden sich im Abschnitt <<installation-mapserver>>.
IMPORTANT: Erforderlich ist MapServer 8.0.0.
+[[mapproxy]]
+=== MapProxy
+
+Optional kann https://mapproxy.org/[MapProxy] installiert werden. MapProxy kann als Proxy kaskadierend für den XPlanWMS und MapServer mit Cache-Funktion verwendet werden, um den Zugriff auf Raster- und Vektorebenen des XPlanWMS und MapServer zu beschleunigen. Der Zugriff auf MapProxy kann über die Standardschnittstellen WMS und WMTS erfolgen.
+
+Weitere Informationen zur Installation befinden sich im Abschnitt <<installation-mapproxy>>.
+
+IMPORTANT: Erforderlich ist MapProxy 1.16.0.
+
+[[halecli]]
=== HALE CLI
Optional kann das https://github.com/halestudio/hale-cli/[HALE CLI] installiert werden. Wenn Daten der xPlanBox transformiert werden sollen, dann ist der Einsatz des HALE CLI erforderlich. Weitere Informationen zur Installation befinden sich im Abschnitt <<installation-hale-cli>>.
diff --git a/xplan-resources/pom.xml b/xplan-resources/pom.xml
index b8ef6252ec3ea70010fed7918ae4701c281450e6..613288fe88015d147f00257aecd64b1d69b3f5bd 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/xplan-resources/xplan-database-scripts/Dockerfile b/xplan-resources/xplan-database-scripts/Dockerfile
index 334e1a7cf4243390164fa0a1873db3313b3d8bf0..c6721f7abd7462fa077371d0a7a49a7e89bbcd10 100644
--- a/xplan-resources/xplan-database-scripts/Dockerfile
+++ b/xplan-resources/xplan-database-scripts/Dockerfile
@@ -16,9 +16,14 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
+ENV TZ=Europe/Berlin \
+ LC_TIME=en_US \
+ LC_ALL=
+
# Install PSQL (probably not really needed)
USER root
RUN apt-get update -y \
+ && locale-gen de_DE \
&& apt-get install --no-install-recommends -y postgresql-client \
&& rm -rf /var/lib/apt/lists/*
diff --git a/xplan-resources/xplan-database-scripts/pom.xml b/xplan-resources/xplan-database-scripts/pom.xml
index b231537fad91ca110757b815502478f9e26d3f13..261f5c5ea3a0277a8949a16389b69510470f6004 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
@@ -486,10 +486,11 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<configuration>
- <propertyFile>${project.basedir}/src/main/resources/liquibase-diff.properties</propertyFile>
+ <searchPath>${project.basedir}/src/main/resources</searchPath>
+ <propertyFile>liquibase-diff.properties</propertyFile>
<diffTypes>tables,views,columns,indexes,primarykeys,foreignkeys,uniqueconstraints,data</diffTypes>
<verbose>true</verbose>
- <changeLogFile>${project.basedir}/src/main/resources/changelog_v60.yaml</changeLogFile>
+ <changeLogFile>${project.basedir}/src/main/resources/changelog_xplandb.yaml</changeLogFile>
<diffIncludeSchema>true</diffIncludeSchema>
</configuration>
<executions>
@@ -506,6 +507,19 @@
</diffChangeLogFile>
</configuration>
</execution>
+ <execution>
+ <id>xplanvalidator</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>diff</goal>
+ </goals>
+ <configuration>
+ <defaultSchemaName>xplanvalidator</defaultSchemaName>
+ <referenceDefaultSchemaName>xplanvalidator</referenceDefaultSchemaName>
+ <diffChangeLogFile>${project.basedir}/target/generated-resources/changelog_xplanvalidator.yaml
+ </diffChangeLogFile>
+ </configuration>
+ </execution>
<execution>
<id>xplansyn</id>
<phase>generate-resources</phase>
diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml b/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2725f8630e26f59eb0800ffb5216239f3b3e31ea
--- /dev/null
+++ b/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml
@@ -0,0 +1,29 @@
+###
+# #%L
+# xplan-database-scripts - Liquibase Changelogs zum Aufsetzen/Aktualisieren der Datenhaltung.
+# %%
+# Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+# %%
+# This program is free software: you can redistribute it and/or modify
+# 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%
+###
+databaseChangeLog:
+ - include:
+ file: 7.1/changelog_xplanvalidator.yaml
+ - changeSet:
+ id: tagDatabase-v71
+ author: latlon
+ changes:
+ - tagDatabase:
+ tag: v_7.1
diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml b/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5608e501b13ab30ad17e0c673dc67c41dd050807
--- /dev/null
+++ b/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml
@@ -0,0 +1,2801 @@
+databaseChangeLog:
+- changeSet:
+ id: 1699259368412-3
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-4
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-5
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-6
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-7
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-8
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-9
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-10
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-11
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-12
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-13
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-14
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-15
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-16
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-17
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-18
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-19
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-20
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-21
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-22
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-23
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-24
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-25
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-26
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-27
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-28
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-29
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-30
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-31
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-32
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-33
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-34
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-35
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-36
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-37
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-38
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-39
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-40
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-41
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-42
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-43
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-44
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-45
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-46
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-47
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-48
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-49
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-50
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-51
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-52
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-53
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-54
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-55
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-56
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-57
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-58
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-59
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-60
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-61
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-62
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-63
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-64
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-65
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-66
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-67
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-68
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-69
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-70
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-71
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-72
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-73
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-74
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-75
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-76
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-77
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-78
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-79
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-80
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-81
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-82
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-83
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-84
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-85
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-86
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-87
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-88
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-89
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-90
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-91
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-92
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-93
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-94
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-95
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-96
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-97
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-98
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-99
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-100
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-101
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_generischesobjekt
+- changeSet:
+ id: 1699259368412-102
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-103
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-104
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-105
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-106
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_vongenehmigungausgenommen
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-107
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-108
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-109
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-110
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-111
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-112
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-113
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-114
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-115
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-116
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-117
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-118
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-119
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-120
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-121
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-122
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-123
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-124
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-125
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-126
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-127
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-128
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-129
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-130
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-131
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-132
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-133
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-134
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-135
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-136
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-137
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-138
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-139
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-140
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-141
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-142
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-143
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-144
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-145
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-146
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-147
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-148
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-149
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-150
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-151
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-152
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-153
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-154
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-155
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-156
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-157
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-158
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchfpspe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-159
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-160
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-161
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-162
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-163
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-164
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-165
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-166
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-167
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-168
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-169
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-170
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-171
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-172
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-173
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-174
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-175
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-176
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-177
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-178
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-179
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-180
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-181
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-182
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpabe
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-183
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-184
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-185
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-186
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-187
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-188
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-189
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-190
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-191
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-192
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-193
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-194
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-195
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-196
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-197
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_biotopverbundbiotopvernetzung
+- changeSet:
+ id: 1699259368412-198
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_eingriffsregelung
+- changeSet:
+ id: 1699259368412-199
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_schutzbestimmterteilevonnaturundlandschaft
+- changeSet:
+ id: 1699259368412-200
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_textabschnittobjekt
+- changeSet:
+ id: 1699259368412-201
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_flaechenschluss
+ type: bool
+ schemaName: xplanvalidator
+ tableName: xplan_lp_zieleerfordernissemassnahmen
+- changeSet:
+ id: 1699259368412-202
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_bodenschutzrecht
+- changeSet:
+ id: 1699259368412-203
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_denkmalschutzrecht
+- changeSet:
+ id: 1699259368412-204
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_forstrecht
+- changeSet:
+ id: 1699259368412-205
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gebiet
+- changeSet:
+ id: 1699259368412-206
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gelaendemorphologie
+- changeSet:
+ id: 1699259368412-207
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_gewaesser
+- changeSet:
+ id: 1699259368412-208
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_grenze
+- changeSet:
+ id: 1699259368412-209
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_linienobjekt
+- changeSet:
+ id: 1699259368412-210
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_luftverkehrsrecht
+- changeSet:
+ id: 1699259368412-211
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_objekt
+- changeSet:
+ id: 1699259368412-212
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schienenverkehrsrecht
+- changeSet:
+ id: 1699259368412-213
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_schutzgebietwasserrecht
+- changeSet:
+ id: 1699259368412-214
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sonstigesrecht
+- changeSet:
+ id: 1699259368412-215
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserrecht
+- changeSet:
+ id: 1699259368412-216
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-217
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-218
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-219
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-220
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspemassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-221
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-222
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-223
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-224
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-225
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpspeflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-226
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-227
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-228
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-229
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-230
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_wirdausgeglichendurchbpmassnahme
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-231
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-232
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-233
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-234
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-235
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-236
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-237
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-238
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-239
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-240
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_laermkontingentgebiet
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-241
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-242
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-243
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-244
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-245
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingent
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-246
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-247
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-248
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-249
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-250
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_zusatzkontingentflaeche
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-251
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_baubeschraenkung
+- changeSet:
+ id: 1699259368412-252
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_sichtflaeche
+- changeSet:
+ id: 1699259368412-253
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_strassenverkehr
+- changeSet:
+ id: 1699259368412-254
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_textabschnittflaeche
+- changeSet:
+ id: 1699259368412-255
+ author: lyn (generated)
+ changes:
+ - addColumn:
+ columns:
+ - column:
+ name: xplan_richtungssektorgrenze
+ type: text
+ schemaName: xplanvalidator
+ tableName: xplan_so_wasserwirtschaft
+- changeSet:
+ id: 1699259368412-1
+ author: lyn (generated)
+ changes:
+ - setTableRemarks:
+ remarks: Feature ids for plans
+ schemaName: xplanvalidator
+ tableName: features
+- changeSet:
+ id: 1699259368412-2
+ author: lyn (generated)
+ changes:
+ - setTableRemarks:
+ remarks: Validated plans
+ schemaName: xplanvalidator
+ tableName: plans
+
diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml b/xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml
index 13c662996d31cb202b79e819c8ca3d0d9f84b45b..c1160e76e8e4a47ff7748313bcb8e5ea27232cc3 100755
--- a/xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml
+++ b/xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml
@@ -25,3 +25,5 @@ databaseChangeLog:
file: 6.0.1/changelog_v601.yaml
- include:
file: 7.0/changelog_v70.yaml
+ - include:
+ file: 7.1/changelog_v71.yaml
diff --git a/xplan-resources/xplan-schemas/pom.xml b/xplan-resources/xplan-schemas/pom.xml
index 5a6d76fb9370536ddcf173d1ba6b718255de56d6..f82f3bd4320333c199a4aa7424410bee5432f79c 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd b/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd
index 5fe5ea63128a8f745df201d32ac3a2ec69987f3d..03ccf16bb63fe58481f15be9f5252840293546e6 100644
--- a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd
+++ b/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd
@@ -13,10 +13,10 @@
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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58-->
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://www.deegree.org/xplanung/1/0" elementFormDefault="qualified" attributeFormDefault="unqualified">
<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
<element name="BP_AbgrabungsFlaeche" substitutionGroup="gml:AbstractFeature">
diff --git a/xplan-resources/xplan-sql-scripts/Dockerfile b/xplan-resources/xplan-sql-scripts/Dockerfile
index 9c566e1542f701103488ff60e15d7a7382b492a2..7ad79cbe2aaf2201b7416c6ae01b765d95ab8039 100644
--- a/xplan-resources/xplan-sql-scripts/Dockerfile
+++ b/xplan-resources/xplan-sql-scripts/Dockerfile
@@ -16,6 +16,11 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
+ENV TZ=Europe/Berlin
+ENV LC_TIME=en_US
+ENV LC_ALL="en_US.UTF-8"
+ENV LC_CTYPE="en_US.UTF-8"
+
# sets superuser and password for PG instance
ENV POSTGRES_USER=postgres
ENV POSTGRES_PASSWORD=postgres
diff --git a/xplan-resources/xplan-sql-scripts/pom.xml b/xplan-resources/xplan-sql-scripts/pom.xml
index 7143bd94ecb0eb25d5b561185092a3163c95ed3e..944b2a53a1883546e08b2f92ac0bc81e9bccbde4 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql
index bd63e68b9f161ebefddd63faa085b4321cda1475..3dc84eee65889f71bd2979ad4b6269da718ac347 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql
@@ -18,7 +18,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- #L%
---
--- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
CREATE SCHEMA xplansynarchive;
SET search_path TO xplansynarchive,public;
CREATE TABLE xplansynarchive.xplan_bp_abgrabungsflaeche (
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/create.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/create.sql
index d0f692c36f7799a36c39f4c2ca534d9803d894b3..46f94480eb79d1b30dc373e236ee0bdc7a133873 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/create.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/create.sql
@@ -48,3 +48,6 @@
\i xplanmgr/create.sql
\i xplanmgr/planslog.sql
\i changelog/databasechangelog_v60.sql
+\i xplanvalidator/01_create_xplanvalidator_schema.sql
+\i xplanvalidator/03_create_plansAndFeatures.sql
+\i xplanvalidator/create.sql
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql
index a3eb5294ff77541c8369d6c15467005da80f505c..34dc896d239c3dacacbd8588cb00afcffa8b3e89 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql
@@ -18,7 +18,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- #L%
---
--- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
CREATE SCHEMA xplansyn;
SET search_path TO xplansyn,public;
CREATE TABLE xplansyn.xplan_bp_abgrabungsflaeche (
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql
index 5b92de6a133c58d6d3105a75cb3c8bd30b1b644a..7989098e6c8f9e4592d11117bec15a1dedaa1f94 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql
@@ -18,7 +18,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- #L%
---
--- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
CREATE SCHEMA xplansynpre;
SET search_path TO xplansynpre,public;
CREATE TABLE xplansynpre.xplan_bp_abgrabungsflaeche (
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql
index c65e4546d95b13027cf3996666d36de3215b971d..f88e3a0da600316b401ba3ced0946307cbb1c496 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql
@@ -22,7 +22,7 @@ SET search_path TO xplanvalidator,public;
CREATE TABLE plans (
id serial PRIMARY KEY,
- insertDate timestamp NOT NULL
+ import_date timestamp NOT NULL
);
COMMENT ON TABLE plans IS 'Validated plans';
diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql b/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql
index f41dec4c923508dfbc2d26e66ff8b95ca11c926e..4c6d2fccde0e6399e880f5915e331ba43cc0bc7b 100644
--- a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql
+++ b/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql
@@ -18,7 +18,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- #L%
---
--- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
CREATE SCHEMA xplanvalidator;
SET search_path TO xplanvalidator,public;
CREATE TABLE xplanvalidator.xplan_bp_abgrabungsflaeche (
@@ -7849,6 +7849,7 @@ CREATE TABLE xplanvalidator.xplan_lp_biotopverbundbiotopvernetzung (
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
xplan_nordwinkeluom text,
@@ -8050,6 +8051,7 @@ CREATE TABLE xplanvalidator.xplan_lp_eingriffsregelung (
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
xplan_nordwinkeluom text,
@@ -8211,6 +8213,7 @@ CREATE TABLE xplanvalidator.xplan_lp_generischesobjekt (
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_konkretisierung text,
xplan_rechtscharakter text,
@@ -8598,6 +8601,7 @@ CREATE TABLE xplanvalidator.xplan_lp_schutzbestimmterteilevonnaturundlandschaft
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
xplan_nordwinkeluom text,
@@ -8901,6 +8905,7 @@ CREATE TABLE xplanvalidator.xplan_lp_textabschnittobjekt (
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
xplan_nordwinkeluom text,
@@ -9202,6 +9207,7 @@ CREATE TABLE xplanvalidator.xplan_lp_zieleerfordernissemassnahmen (
xplan_vorschlagintegrationro text,
xplan_referenziertlpobjekt text,
xplan_wirdreferenziertvon text,
+ xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
xplan_nordwinkeluom text,
@@ -12374,6 +12380,19 @@ CREATE TABLE xplanvalidator.xplan_so_baubeschraenkung (
xplan_reftextinhalt text,
xplan_sonstrechtscharakter text,
xplan_sonstrechtscharakterwert text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
@@ -12503,6 +12522,19 @@ CREATE TABLE xplanvalidator.xplan_so_bodenschutzrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_istverdachtsflaeche boolean,
@@ -12559,6 +12591,19 @@ CREATE TABLE xplanvalidator.xplan_so_denkmalschutzrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_weltkulturerbe boolean,
@@ -12615,6 +12660,19 @@ CREATE TABLE xplanvalidator.xplan_so_forstrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -12674,6 +12732,19 @@ CREATE TABLE xplanvalidator.xplan_so_gebiet (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_gemeinde text,
xplan_aufstellungsbeschhlussdatum date,
@@ -12733,6 +12804,19 @@ CREATE TABLE xplanvalidator.xplan_so_gelaendemorphologie (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -12782,6 +12866,19 @@ CREATE TABLE xplanvalidator.xplan_so_gewaesser (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -12831,6 +12928,19 @@ CREATE TABLE xplanvalidator.xplan_so_grenze (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_textschluessel text,
xplan_textschluesselbegruendung text,
xplan_rechtsverbindlich text,
@@ -12880,6 +12990,19 @@ CREATE TABLE xplanvalidator.xplan_so_linienobjekt (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_textschluessel text,
xplan_textschluesselbegruendung text,
xplan_rechtsverbindlich text,
@@ -12925,6 +13048,19 @@ CREATE TABLE xplanvalidator.xplan_so_luftverkehrsrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -12982,6 +13118,19 @@ CREATE TABLE xplanvalidator.xplan_so_objekt (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_textschluessel text,
xplan_textschluesselbegruendung text,
xplan_rechtsverbindlich text,
@@ -13110,6 +13259,19 @@ CREATE TABLE xplanvalidator.xplan_so_schienenverkehrsrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -13281,6 +13443,19 @@ CREATE TABLE xplanvalidator.xplan_so_schutzgebietwasserrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_name text,
@@ -13345,6 +13520,19 @@ CREATE TABLE xplanvalidator.xplan_so_sichtflaeche (
xplan_reftextinhalt text,
xplan_sonstrechtscharakter text,
xplan_sonstrechtscharakterwert text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_art text,
xplan_artwert text,
@@ -13384,6 +13572,19 @@ CREATE TABLE xplanvalidator.xplan_so_sonstigesrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nummer text,
@@ -13446,6 +13647,19 @@ CREATE TABLE xplanvalidator.xplan_so_strassenverkehr (
xplan_reftextinhalt text,
xplan_sonstrechtscharakter text,
xplan_sonstrechtscharakterwert text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
@@ -13635,6 +13849,19 @@ CREATE TABLE xplanvalidator.xplan_so_textabschnittflaeche (
xplan_reftextinhalt text,
xplan_sonstrechtscharakter text,
xplan_sonstrechtscharakterwert text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
CONSTRAINT xplan_so_textabschnittflaeche_pkey PRIMARY KEY (attr_gml_id)
);
@@ -13667,6 +13894,19 @@ CREATE TABLE xplanvalidator.xplan_so_wasserrecht (
xplan_endebedingung text,
xplan_aufschrift text,
xplan_reftextinhalt text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_istnatuerlichesuberschwemmungsgebiet boolean,
@@ -13730,6 +13970,19 @@ CREATE TABLE xplanvalidator.xplan_so_wasserwirtschaft (
xplan_reftextinhalt text,
xplan_sonstrechtscharakter text,
xplan_sonstrechtscharakterwert text,
+ xplan_vongenehmigungausgenommen boolean,
+ xplan_wirdausgeglichendurchfpflaeche text,
+ xplan_wirdausgeglichendurchfpspe text,
+ xplan_wirdausgeglichendurchbpflaeche text,
+ xplan_wirdausgeglichendurchbpabe text,
+ xplan_wirdausgeglichendurchbpspemassnahme text,
+ xplan_wirdausgeglichendurchbpspeflaeche text,
+ xplan_wirdausgeglichendurchbpmassnahme text,
+ xplan_laermkontingent text,
+ xplan_laermkontingentgebiet text,
+ xplan_zusatzkontingent text,
+ xplan_zusatzkontingentflaeche text,
+ xplan_richtungssektorgrenze text,
xplan_flaechenschluss boolean,
xplan_flussrichtung boolean,
xplan_nordwinkel text,
diff --git a/xplan-tests/pom.xml b/xplan-tests/pom.xml
index aa5aa2ea4e81d37a8a63a3fa7b546addfe175dd3..f069d4a44aa45a8f531c7373d0d9f00ed85f16ad 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-tests/xplan-tests-manual/pom.xml b/xplan-tests/xplan-tests-manual/pom.xml
index 6222151da7121b8caf1738893c154928e5b91765..ecc9c74c334cc37110114a4558c0edfd02a80389 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
</project>
diff --git a/xplan-tests/xplan-tests-resources/pom.xml b/xplan-tests/xplan-tests-resources/pom.xml
index 737275bd3ddc7bcb6d485a2045486be97323e986..17d42e260a7cab8562978d10c8cf1501c5f2af3d 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
</project>
\ No newline at end of file
diff --git a/xplan-tests/xplan-tests-soapui/Dockerfile b/xplan-tests/xplan-tests-soapui/Dockerfile
index 1d9212318831fa3c7ea5ef7a2c4c708e6ddab408..12f92144509c91a60cb4a49a95fc910a5358b70a 100644
--- a/xplan-tests/xplan-tests-soapui/Dockerfile
+++ b/xplan-tests/xplan-tests-soapui/Dockerfile
@@ -15,6 +15,8 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
+ENV TZ=Europe/Berlin
+
RUN apk add py3-pip py3-pillow py3-cffi py3-brotli gcc musl-dev python3-dev pango pango-tools aws-cli
RUN pip install weasyprint
@@ -30,5 +32,4 @@ RUN mvn validate \
&& mvn surefire-report:report-only \
&& rm -rf target
-
ENTRYPOINT ["/xplanbox/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh"]
\ No newline at end of file
diff --git a/xplan-tests/xplan-tests-soapui/README.md b/xplan-tests/xplan-tests-soapui/README.md
index e5f6caf2bd5a1226e0eab66e8955110ac13e60e6..3cec7c2e1023b1e2c8bbec38e69469706ec1e721 100644
--- a/xplan-tests/xplan-tests-soapui/README.md
+++ b/xplan-tests/xplan-tests-soapui/README.md
@@ -8,7 +8,7 @@
### xplan-api-manager-soapui-project
-> mvn clean test -Psystem-tests -DtestFileName=xplan-api-manager-soapui-project.xml -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlServices=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
+> mvn clean test -Psystem-tests -DtestFileName=xplan-api-manager-soapui-project.xml -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlServices=https://xplanbox.lat-lon.de -DjdbcUrl=jdbc:postgresql://localhost:5433/xplanbox?user=xplanbox&password=xplanbox -Dusername=xplanbox -Dpassword='PWD'
### xplan-api-dokumente-soapui-project
@@ -20,7 +20,7 @@
### xplan-webservices-soapui-project
-> mvn clean test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=https://xplanbox.lat-lon.de -DbaseUrlInspirePlu=https://xplanbox.lat-lon.de -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlMapServer=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
+> mvn clean test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=https://xplanbox.lat-lon.de -DbaseUrlInspirePlu=https://xplanbox.lat-lon.de -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlMapServer=https://xplanbox.lat-lon.de -DbaseUrlMapProxy=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
@@ -49,11 +49,20 @@ docker run --env ... xplanbox/xplan-tests-soapui
- `XPLAN_BASE_URL_DIENSTE`
- `XPLAN_BASE_URL_INSPIRE_PLU`
- `XPLAN_BASE_URL_MAPSERVER`
+- `XPLAN_BASE_URL_MAPPROXY`
- `XPLAN_SERVICES_API_KEY`
+Optional, wenn die Tests der XPlanDB bei Ausführung der XPlanManagerAPI-SopaUI-Tests ausgeführt werden sollen:
-Der Report im PDF Format kann zu einem S3 Bucket hochgeladen werden, dafür müssen folgende Umgebungsvariable gesetzt werden:
+- `XPLAN_DB_HOSTNAME`
+- `XPLAN_DB_PORT`
+- `XPLAN_DB_NAME`
+- `XPLAN_DB_USER`
+- `XPLAN_DB_PASSWORD`
+
+
+Der Report im PDF Format kann zu einem S3 Bucket hochgeladen werden, dafür müssen folgende Umgebungsvariablen gesetzt werden:
- `XPLAN_UPLOAD_TEST_REPORT`: muss auf `true` gesetzt werden
- `XPLAN_S3_ENDPOINT_URL`: die S3 Url, z.B. https://the.s3.url
@@ -68,7 +77,13 @@ Der Report kann aus S3 lokal kopiert werden, z,B. mit:
aws s3 cp s3://my-bucket/test-reports/report-2023-05-26T08:57:15.pdf report.pdf --endpoint-url https://the.s3.url
-Eine Notification kann nach der Ausführung der Tests zu einem Slack Chanel geschickt werden. Dafür müssen folgende Umgebungsvariable gesetzt werden:
+Eine Notification kann nach der Ausführung der Tests zu einem Slack Chanel geschickt werden. Dafür müssen folgende Umgebungsvariablen gesetzt werden:
- `XPLAN_NOTIFY_SLACK_CHANNEL`: der Slack Kanal
-- `XPLAN_NOTIFY_SLACK_TOKEN`: das Slack Authorisierungstoken
\ No newline at end of file
+- `XPLAN_NOTIFY_SLACK_TOKEN`: das Slack Authorisierungstoken
+
+## Konventionen für Entwickler
+
+ * Um die von den SoapUI-Tests verwendeten Plänen identifizieren zu können, werden alle Pläne, die importiert werden nach folgendem Schema umbenannt: _\<NAME>\_SoapUI-\<KOMPONENTE>_. Mit folgenden Platzhaltern:
+ * _\<NAME>_: Name des Plans
+ * _\<KOMPONENTE>_: Name der zu testenden Komponente, z.B.: XPlanManagerAPI, XPlanValidatorAPI, XPlanDokumentenAPI
\ 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 ccbe6619dc79d3d3a337b14b2e9592878a7fbd03..cb2cb464956f5ab467c78e02021f294257fc5fcd 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
@@ -55,9 +55,11 @@
<baseUrlDokumentenApi />
<baseUrlServices />
<baseUrlMapServer />
+ <baseUrlMapProxy />
<username />
<password />
<apiKey />
+ <jdbcUrl />
<endpoint />
</properties>
<build>
@@ -71,6 +73,11 @@
<artifactId>forms</artifactId>
<version>1.2.1</version>
</dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.6.0</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -94,14 +101,23 @@
<value>baseUrlDokumentenApi=${baseUrlDokumentenApi}</value>
<value>baseUrlServices=${baseUrlServices}</value>
<value>baseUrlMapServer=${baseUrlMapServer}</value>
+ <value>baseUrlMapProxy=${baseUrlMapProxy}</value>
<value>username=${username}</value>
<value>password=${password}</value>
<value>apiKey=${apiKey}</value>
+ <value>jdbcUrl=${jdbcUrl}</value>
</projectProperties>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>io.github.git-commit-id</groupId>
+ <artifactId>git-commit-id-maven-plugin</artifactId>
+ <configuration> <!-- to run "isolated"" in docker container -->
+ <skipPoms>true</skipPoms>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
index 50d5b5583738a48e114df9121841245d784be2da..c199bb8c10ca63dd3f5ec8847f3df61b389b0f83 100755
--- a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
+++ b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
@@ -1,7 +1,24 @@
#!/bin/bash
+set -e
+
+function sendSlackMessage() {
+ local message=$1
+ curl -d "text=$message" -d "channel=$XPLAN_NOTIFY_SLACK_CHANNEL" -H "Authorization: Bearer $XPLAN_NOTIFY_SLACK_TOKEN" -X POST https://slack.com/api/chat.postMessage
+}
+
+if [ -n "$XPLAN_NOTIFY_SLACK_CHANNEL" ] && [ -n "$XPLAN_NOTIFY_SLACK_TOKEN" ]; then
+ sendSlackMessage "Starting SoapUI tests for $XPLAN_API_MANAGER_BASE_URL and Co..."
+fi
+
+if [ -z ${XPLAN_DB_HOSTNAME+x} ]; then
+ echo "XPLAN_DB_HOSTNAME is not set. jdbcUrl is not used in xplan-api-manager SoapUI Tests"
+else
+ echo "XPLAN_DB_HOSTNAME is set, jdbcUrl is created and used for xplan-api-manager SoapUI Tests"
+ JDBC_URL="jdbc:postgresql://$XPLAN_DB_HOSTNAME:$XPLAN_DB_PORT/$XPLAN_DB_NAME?user=$XPLAN_DB_USER&password=$XPLAN_DB_PASSWORD"
+fi
echo "Executing tests..."
-mvn test -Psystem-tests -DtestFileName=xplan-api-manager-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_API_MANAGER_BASE_URL -DbaseUrlServices=$XPLAN_BASE_URL_DIENSTE -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD
+mvn test -Psystem-tests -DtestFileName=xplan-api-manager-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_API_MANAGER_BASE_URL -DbaseUrlServices=$XPLAN_BASE_URL_DIENSTE -DjdbcUrl=$JDBC_URL -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD
mvn test -Psystem-tests -DtestFileName=xplan-api-validator-soapui-project.xml -Dendpoint=$XPLAN_API_VALIDATOR_ENDPOINT -Dusername=$XPLAN_API_VALIDATOR_USERNAME -Dpassword=$XPLAN_API_VALIDATOR_PASSWORD
@@ -9,15 +26,17 @@ if [ -z ${XPLAN_API_DOKUMENTE_BASE_URL+x} ];
then
echo "XPlanDokumentenAPI Tests are skipped!"
else
- mvn test -Psystem-tests -DtestFileName=xplan-api-dokumente-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_API_MANAGER_BASE_URL -DbaseUrlDokumentenApi=$XPLAN_API_DOKUMENTE_BASE_URL -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD
+ mvn test -Psystem-tests -DtestFileName=xplan-api-dokumente-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_API_MANAGER_BASE_URL -DbaseUrlDokumentenApi=$XPLAN_API_DOKUMENTE_BASE_URL -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD
fi
mvn test -Psystem-tests -DtestFileName=xplan-manager-web-soapui-project.xml -Dendpoint=$XPLAN_MANAGER_WEB_ENDPOINT -Dusername=$XPLAN_MANAGER_WEB_USERNAME -Dpassword=$XPLAN_MANAGER_WEB_PASSWORD
-mvn test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${XPLAN_BASE_URL_DIENSTE} -DbaseUrlInspirePlu=${XPLAN_BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${XPLAN_API_MANAGER_BASE_URL} -DbaseUrlMapServer=${XPLAN_BASE_URL_MAPSERVER} -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD -DapiKey=$XPLAN_SERVICES_API_KEY
+mvn test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${XPLAN_BASE_URL_DIENSTE} -DbaseUrlInspirePlu=${XPLAN_BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${XPLAN_API_MANAGER_BASE_URL} -DbaseUrlMapServer=${XPLAN_BASE_URL_MAPSERVER} -DbaseUrlMapProxy=${XPLAN_BASE_URL_MAPPROXY} -Dusername=$XPLAN_API_MANAGER_USERNAME -Dpassword=$XPLAN_API_MANAGER_PASSWORD -DapiKey=$XPLAN_SERVICES_API_KEY
echo -e "\n"
-find target/soapui/ -name 'TEST-*TestSuite.xml' | xargs cat | grep "<testsuite" | sed 's/>.*/>/'
+echo "Results:"
+results=`find target/soapui/ -name 'TEST-*.xml' | xargs cat | grep "<testsuite" | sed 's/>.*/>/' | sed -e 's/[">]//g' -e 's/.*name=//'`
+echo -e "$results"
echo -e "\n"
@@ -29,7 +48,7 @@ echo "Transforming to PDF $REPORT_PATH_PDF..."
sed -i 's/display:none;//' target/site/surefire-report.html
weasyprint file://$PWD/target/site/surefire-report.html $REPORT_PATH_PDF
REPORT_PATH_TAR=target/test-report.tar.gz
-tar -cvzf $REPORT_PATH_TAR -C target/site .
+tar cfz $REPORT_PATH_TAR -C target/site .
if [ "$XPLAN_UPLOAD_TEST_REPORT" = "true" ];
then
@@ -39,10 +58,11 @@ then
XPLAN_S3_REPORT_ID="${XPLAN_S3_REPORT_ID:-`date +%y-%m-%dT%H:%m:%S`}"
XPLAN_S3_REPORT_PATH="${XPLAN_S3_REPORT_PATH:-test-reports}"
- S3_PATH_REPORT_PATH_TAR="s3://$XPLAN_S3_BUCKET_NAME/$XPLAN_S3_REPORT_PATH/report-$XPLAN_S3_REPORT_ID.tar.gz"
+ S3_PATH_TAR="s3://$XPLAN_S3_BUCKET_NAME/$XPLAN_S3_REPORT_PATH/report-$XPLAN_S3_REPORT_ID.tar.gz"
S3_PATH_PDF="s3://$XPLAN_S3_BUCKET_NAME/$XPLAN_S3_REPORT_PATH/report-$XPLAN_S3_REPORT_ID.pdf"
- echo "Uploading report to $S3_PATH..."
- aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $REPORT_PATH_TAR $S3_PATH_REPORT_PATH_TAR
+ echo "Uploading $REPORT_PATH_TAR to $S3_PATH_TAR..."
+ aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $REPORT_PATH_TAR $S3_PATH_TAR
+ echo "Uploading report to $XPLAN_S3_REPORT_PATH..."
aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $REPORT_PATH_PDF $S3_PATH_PDF
else
echo "No upload to S3 configured"
@@ -51,11 +71,16 @@ fi
if [ -n "$XPLAN_NOTIFY_SLACK_CHANNEL" ] && [ -n "$XPLAN_NOTIFY_SLACK_TOKEN" ]; then
echo "Sending slack notification to $XPLAN_NOTIFY_SLACK_CHANNEL"
- message="Finished SoapUI tests for $XPLAN_API_MANAGER_BASE_URL and Co."
+ formattedResults=`echo -e "$results" | sed 's/^/%0A* /'`
+ message="Finished SoapUI tests for $XPLAN_API_MANAGER_BASE_URL and Co.%0A\
+$formattedResults"
if [ -n "$S3_PATH_PDF" ]; then
- message="$message%0A%0ATest Report available at $S3_PATH_PDF"
+ message="$message%0A%0A\
+Get test reports from S3 bucket with:%0A\
+\`\`\`aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $S3_PATH_PDF .%0A\
+aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $S3_PATH_TAR .\`\`\`"
fi
- curl -d "text=$message" -d "channel=$XPLAN_NOTIFY_SLACK_CHANNEL" -H "Authorization: Bearer $XPLAN_NOTIFY_SLACK_TOKEN" -X POST https://slack.com/api/chat.postMessage
+ sendSlackMessage "$message"
fi
echo "Ready"
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/README.md b/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
index a42203c86b05f83a2dcf05d81f19ea9b466243d5..d57ff2e3235551d02c66f439543a690c61f2bbbe 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
@@ -2,81 +2,100 @@
Dieses Dokument beinhaltet Hinweise zur Benutzung der einzelnen SoapUI Projekte.
-## xplan-api-manager Projekt
+## Beschreibung der Projekte
+
+Im Folgenden werden die einzelnen Projekte beschrieben.
+
+### xplan-api-manager Projekt
Dieses SoapUI Projekt testet die Komponente XPlanManagerAPI.
-### Ausführung
+#### Ausführung
Die zu testenden Endpunkte können folgendermaßen geändert werden:
1. Projekt in SoapUI laden.
-2. Service-Komponente (wird mit zwei gegensätzlichen Pfeilen dargestellt) öffnen.
-3. Reiter `Service Endpoints` öffnen.
-4. Entweder einen der vorkonfigurierten Endpoints auswählen oder einen neuen hinzufügen.
-5. `Assign` auswählen.
-6. `All Requests and TestRequests` in der Drop-Down-Liste auswählen.
-7. Auswahl mit `OK` bestätigen.
-8. Nun können die TestSuites über die üblichen Wege ausgeführt werden.
+2. Projekt auswählen.
+3. Reiter `Custom Properties` öffnen (unten links).
+4. Dort aufgelistete Parameterwerte auf die zu testende Umgebung anpassen.
+ * Weitere Hinweise zu den einzelnen Parametern gibt es, wenn das Projekt geöffnet wird, `Overview` und anschließend `Description` (ganz unten) ausgewählt werden.
+5. Anschließend können die verschiedenen TestSuites über die üblichen Wege ausgeführt werden.
***Hinweise***
- Die TestCases der einzelnen TestSuites bauen teilweise aufeinander auf. Dies bedeutet, dass eine TestSuite immer komplett ausgeführt werden sollte.
-- Das SoapUI Projekt kann gegen eine frische Installation ausgeführt werden, welche keinerlei Daten beinhaltet. Somit eignet sich diese zum Verifizieren einer Neuinstallation.
+- Das SoapUI Projekt kann gegen eine frische Installation ausgeführt werden, welche keinerlei Daten beinhaltet. Somit eignet sich dieses zum Verifizieren einer Neuinstallation.
+
+#### TestSuite "XPlanManagerAPI TestSuite"
+
+Diese Testsuite beinhaltet Datenbanktests, die nur verwendet werden können, wenn auf die Datenbank über eine JDBC URL zugegriffen werden kann.
+
+> **_ACHTUNG:_** Wenn die Datenbanktests verwendet werden sollen, muss der PostgreSQL JDBC-Treiber der SoapUI-Installation, wie unter [Datenbanktests](#Datenbanktests) beschrieben, hinzugefügt werden.
+
+Die JDBC URL zu der von der xPlanBox verwendeten Datenbank muss durch Auswahl des Projekts und Öffnen des Reiters `Custom Properties` (unten links) über das Property `jdbcUrl` gesetzt werden.
-### TestSuite "Codelists TestSuite"
+Beispiel für eine JDBC URL: `jdbc:postgresql://localhost:5433/xplanbox?user=xplanbox&password=xplanbox`
-Diese TestSuite prüft ob externe Codelisten beim Import über die XPlanManagerAPI übersetzt werden. Es werden per default folgende Übersetzungen angenommen:
+Wenn keine JDBC URL konfiguriert ist, werden die Datenbanktests übersprungen.
+
+#### TestSuite "Codelists TestSuite"
+
+Diese TestSuite prüft, ob externe Codelisten beim Import über die XPlanManagerAPI übersetzt werden. Es werden per Default folgende Übersetzungen angenommen:
* BP_SonstPlanArt, Code 11002 => TeilbebauungsPlan
* BP_Status, Code 19999 => 19999
-Um diesen Zustand zu erreichen ist eine entsprechende Konfiguration der externen Codeliste **BP_SonstPlanArt** für die XPlanGML Version 5.2 in der Installation der XPlanManagerAPI notwendig. Für die Codeliste **BP_Status** wird angenommen, dass **keine** externe Codeliste konfiguriert ist.
+Um diesen Zustand zu erreichen, ist eine entsprechende Konfiguration der externen Codeliste **BP_SonstPlanArt** für die XPlanGML Version 5.2 in der Installation der XPlanManagerAPI notwendig. Für die Codeliste **BP_Status** wird angenommen, dass **keine** externe Codeliste konfiguriert ist.
Die default Werte können durch Auswahl der TestSuite und Öffnen des Reiters `Custom Properties` (unten links) angepasst werden. Es handelt sich um folgende Properties:
* codelistValue_BP_SonstPlanArt_11002
* codelistValue_BP_Status_19999
-Für die Ausführung ist auch die Konfiguration der XPlanDienste URL erforderlich. Dies erfolgt ebenfalls unter durch Auswahl der TestSuite und Öffnen des Reiters `Custom Properties` (unten links). Dort sind folgende Properties anzupassen:
+Für die Ausführung ist auch die Konfiguration der XPlanDienste URL erforderlich. Dies erfolgt durch Auswahl des Projekts und Öffnen des Reiters `Custom Properties` (unten links). Dort sind folgende Properties anzupassen:
* servicesBaseUrl
* username (optional)
* password (optional)
----
-
-## xplan-api-validator Projekt
+### xplan-api-validator Projekt
Dieses SoapUI Projekt testet die Komponente XPlanValidatorAPI.
-Die Ausführung des SoapUI Projekt erfolgt, wie in der [xplan-api-manager Projekt](#xplan-api-manager-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
+Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-api-manager Projekt](#xplan-api-manager-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
-## xplan-webservices Projekt
+### xplan-api-dokumente Projekt
-Dieses SoapUI Projekt testet die Komponente XPlanDienste.
+Dieses SoapUI Projekt testet die Komponente XPlanDokumentenAPI.
-### Ausführung
+Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-api-manager Projekt](#xplan-api-manager-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
-Die zu testenden Endpunkte können folgendermaßen geändert werden:
+### xplan-webservices Projekt
-1. Projekt in SoapUI laden.
-2. Projekt auswählen.
-3. Reiter `Custom Properties` öffnen (unten links).
-4. Dort aufgelistete Parameterwerte auf die zu testende Umgebung anpassen.
- * Weitere Hinweise zu den einzelnen Parametern gibt es, wenn das Projekt geöffnet wird, `Overview` und anschließend `Description` (ganz unten) ausgewählt werden.
-5. Anschließend können die verschiedenen TestSuites über die üblichen Wege ausgeführt werden.
+Dieses SoapUI Projekt testet die Komponente XPlanDienste.
+
+Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-api-manager Projekt](#xplan-api-manager-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
***Hinweise***
- Die TestCases aller TestSuites können individuell genutzt werden und es gibt keine Abhängigkeiten zwischen diesen. Nur die einzelnen TestSteps bauen teilweise aufeinander auf.
- Das SoapUI Projekt kann gegen eine frische Installation ausgeführt werden, welche keinerlei Daten beinhaltet. Somit eignet sich diese zum Verifizieren einer Neuinstallation.
-## xplan-manager-web Projekt
+### xplan-manager-web Projekt
Dieses SoapUI Projekt testet Teile der REST API des XPlanManagerWeb.
-Die Ausführung des SoapUI Projekt erfolgt, wie in der [xplan-api-manager projekt](#xplan-api-manager-projekt) beschrieben.
+#### Ausführung
+Die zu testenden Endpunkte können folgendermaßen geändert werden:
-# Generelle Hinweise
+1. Projekt in SoapUI laden.
+2. Service-Komponente (wird mit zwei gegensätzlichen Pfeilen dargestellt) öffnen.
+3. Reiter `Service Endpoints` öffnen.
+4. Entweder einen der vorkonfigurierten Endpoints auswählen oder einen neuen hinzufügen.
+5. `Assign` auswählen.
+6. `All Requests and TestRequests` in der Drop-Down-Liste auswählen.
+7. Auswahl mit `OK` bestätigen.
+8. Nun können die TestSuites über die üblichen Wege ausgeführt werden.
+
+## Generelle Hinweise
### Nutzung von SoapUI mit Windows
@@ -85,17 +104,23 @@ Um diese zu beheben, muss in der Datei _<SoapUI>\bin\SoapUI-<Version>.vmoptions_
> -Dfile.encoding=utf-8
----
-
### Verwendung von HTTP BASIC Authentication
Sind für den Zugriff auf den Server Credentials erforderlich, so müssen diese je Projekt angegeben werden.
-Für die Projekte [xplan-api-manager](#xplan-api-manager-projekt) und [xplan-api-validator](#xplan-api-validator-projekt) in SoapUI die Ansicht "Show Service Viewer > Service Endpoints" öffnen. Dort müssen Username und Password für den Endpoint eingetragen und dann mit `All Requests and TestRequests` aus der Drop-Down-Liste auf alle Test angewendet werden.
+Für das Projekt [xplan-manager-web](#xplan-manager-web-projekt) in SoapUI die Ansicht "Show Service Viewer > Service Endpoints" öffnen. Dort müssen Username und Password für den Endpoint eingetragen und dann mit `All Requests and TestRequests` aus der Drop-Down-Liste auf alle Test angewendet werden.
+
+Für die Projekte [xplan-api-manager](#xplan-api-manager-projekt), [xplan-api-validator](#xplan-api-validator-projekt), [xplan-api-dokumente](#xplan-api-dokumente-projekt) und [xplan-webservices](#xplan-webservices-projekt) in SoapUI das Projekt auswählen und den Reiter `Custom Properties` auswählen. Dort die Properties `username` und `password` setzen.
-Für das Projekt [xplan-webservices](#xplan-webservices-projekt) in SoapUI das Projekt auswählen und den Reiter `Custom Properties` auswählen. Dort die Properties `username` und `password` setzen.
+### Datenbanktests
----
+Damit Datenbanktests gegen PostgreSQL ausgeführt werden können, muss der SoapUI-Installation der JDBC-Treiber von PostgreSQL hinzugefügt werden.
+
+Dieser kann auf folgender Seite heruntergeladen werden: https://jdbc.postgresql.org/download/
+
+Die JAR-Datei muss anschließend in das lib-Verzeichnis von der SoapUI-Installation kopiert werden (`<SOAPUI_INSTALLATION>/lib/`).
+
+Nach einem Neustart von SoapUI ist der neu hinzugefügte Datenbanktreiber nutzbar.
### Anpassungen an den SoapUI Projekten durchführen (für Entwickler)
@@ -103,9 +128,9 @@ Wenn Änderungen an einem SoapUI Projekt vorgenommen werden, dann muss die Datei
> **_ACHTUNG:_** Vor jedem Commit muss geprüft werden, dass keine Passwörter in den SoapUI Projekten gespeichert sind.
-Die Namenskonvention für die TestSteps der SoapUI Projekte xplan-api-manager und xplan-api-validator folgen diesem Pattern:
+Die Namenskonvention für die TestSteps der SoapUI Projekte xplan-api-manager und xplan-api-validator folgen diesem Muster:
-> `HTTPMETHODE PLANART XPLANGMLVERSION QUERYPARAMETER ADDITIONALINFORMATION`
+> `HTTPMETHODE|PROTOKOLL PLANART XPLANGMLVERSION QUERYPARAMETER ADDITIONALINFORMATION`
Beispiel für ein Pattern: `POST BP 5.3 sG importPlan`
@@ -124,6 +149,12 @@ Die zu nutzenden Abkürzungen werden im folgenden Glossar definiert.
| **PUT** | Methode um Daten an den Server zu senden und Ressourcen zu erstellen oder zu modifizieren, entgegen zu POST idempotent |
| **DEL** | Methode um Daten vom Server zu löschen |
+### PROTOKOLL
+
+| Abkürzung | Beschreibung |
+|-----------|----------------------------------------------|
+| **JDBC** | Anfragen über das jdbc:postgresql: Protokoll |
+
### PLANART
| Abkürzung | Beschreibung |
@@ -172,4 +203,3 @@ Die zu nutzenden Abkürzungen werden im folgenden Glossar definiert.
### ADDITIONALINFORTAMTION
- Derzeit keine genaue Festlegung
-
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-dokumente-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-dokumente-soapui-project.xml
index 3ace22e6831b5532cd7d605e51efe104276e5eeb..5b543ab915ff90ecf8c1a89287fa6c5ac73b9873 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-dokumente-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-dokumente-soapui-project.xml
@@ -17,7 +17,7 @@
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%-->
-<con:soapui-project id="c0330194-e671-4de1-89fb-fd5cd92eb5af" activeEnvironment="Default" name="xplan-api-dokumente" resourceRoot="" soapui-version="5.7.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project id="c0330194-e671-4de1-89fb-fd5cd92eb5af" activeEnvironment="Default" name="xplan-api-dokumente" resourceRoot="" soapui-version="5.7.2" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
<con:description>For local execution use following property values:
baseUrlManagerApi=http://localhost:8086/xplan-api-manager
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager-soapui-project.xml
index e0ae5287d7ad63d3222177db781d439823e6ffd5..abcedb878f9160f01bfd08f16a8cb75bc7ba24a5 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager-soapui-project.xml
@@ -17,7 +17,12 @@
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%-->
-<con:soapui-project id="adcdfd3f-0f4e-4107-8d7e-086010676cb7" activeEnvironment="Default" name="xplan-api-manager" resourceRoot="" soapui-version="5.7.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project id="adcdfd3f-0f4e-4107-8d7e-086010676cb7" activeEnvironment="Default" name="xplan-api-manager" resourceRoot="" soapui-version="5.7.2" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
+ <con:description>For local execution use following property values:
+
+baseUrlManagerApi=http://localhost:8086/xplan-api-manager
+baseUrlServices=http://localhost:8083
+jdbcUrl=jdbc:postgresql://localhost:5433/xplanbox?user=xplanbox&password=xplanbox</con:description>
<con:settings/>
<con:interface xsi:type="con:RestService" id="4c3b4b1f-f0cd-4a9f-bbc4-433948e85871" wadlVersion="http://wadl.dev.java.net/2009/02" name="XPlanManagerAPI" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:description>XPlanManager REST API</con:description>
@@ -2302,7 +2307,7 @@ assert actualHeader != null</scriptText>
<con:assertion type="JsonPath Match" id="727c0fd3-5cab-490a-a799-0465207ecae1" name="name">
<con:configuration>
<path>$[0].xplanModelData.name</path>
- <content>Eidelstedt4_SoapUI-XPlanManagerAPI</content>
+ <content>BPlan004_4-1_SoapUI-XPlanManagerAPI</content>
<allowWildcards>false</allowWildcards>
<ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
<ignoreComments>false</ignoreComments>
@@ -2325,11 +2330,11 @@ assert actualHeader != null</scriptText>
<con:authType>Preemptive</con:authType>
</con:credentials>
<con:attachment>
- <con:name>BP_4.1_MimeTypeV2.zip</con:name>
+ <con:name>BPlan004_4-1.zip</con:name>
<con:contentType>application/octet-stream</con:contentType>
- <con:contentId>BP_4.1_MimeTypeV2.zip</con:contentId>
+ <con:contentId>BPlan004_4-1.zip</con:contentId>
<con:part xsi:nil="true"/>
- <con:url>${projectDir}/xplan-api-manager/plans/BP_4.1_MimeTypeV2.zip</con:url>
+ <con:url>${projectDir}/xplan-api-manager/plans/BPlan004_4-1.zip</con:url>
<con:id>a9a8ee6f-17f6-421c-bab9-e60905d0f606</con:id>
</con:attachment>
<con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
@@ -3188,7 +3193,7 @@ assert actualHeader != null</scriptText>
<con:assertion type="JsonPath Match" id="727c0fd3-5cab-490a-a799-0465207ecae1" name="name">
<con:configuration>
<path>$.xplanModelData.name</path>
- <content>HafenCity13-Test_SoapUI-XPlanManagerAPI</content>
+ <content>BPlan002_5-3_1_SoapUI-XPlanManagerAPI</content>
<allowWildcards>false</allowWildcards>
<ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
<ignoreComments>false</ignoreComments>
@@ -6773,6 +6778,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="db238d44-b072-46ec-8202-37ad1b2ca84b">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 5.0 XX checkDokument" id="117d190d-9422-42d7-b410-7bb44698f785">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="98d0cb2d-a0db-49d1-972b-84429fbdbcd1" name="Exists postDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdDokument}' and ARTEFACTS.FILENAME = 'postDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET BP 5.0 pI verifyStatus" id="8db5e539-a6c1-4052-bb83-45c18942ab5c">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/dokument" methodName="getDokumente" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -6988,6 +7023,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="8c171648-051a-4ee9-8168-da900714d641">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkDokument" id="8ac0ffbe-0e5b-4cb6-bde7-378d1c5aa0b6">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="441bf229-7310-47fa-8d8e-5f27c2264cf3" name="Exists postDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'postDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET FP 5.0 pI verifyStatus" id="b3dc53fd-8db1-44bf-a1d0-d65d59c6e94d">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/dokument" methodName="getDokumente" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -7160,6 +7225,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="ff5e0113-44c4-41d8-a0e2-c369b335616a">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkDokument" id="1246a265-f847-472e-9e9f-eaf6b501f7e2">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="b1c4834c-e946-4835-9616-832ddaa36485" name="Exists postDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'postDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET LP 6.0 pI verifyStatus" id="4b0c6044-d58b-4738-a9b7-22d7b17db8f4">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/dokument" methodName="getDokumente" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -7332,6 +7427,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="74115bfd-1998-43e8-ab2b-0d0462a81cb2">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkDokument" id="d36823a5-7328-4102-aa88-00248fff31a0">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="cfe80694-b126-4701-8507-19fc449ace58" name="Exists postDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'postDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET RP 5.1 pI verifyStatus" id="913b49a1-b4c8-4c97-ae57-b04519d7f59d">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/dokument" methodName="getDokumente" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -7503,6 +7628,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="4e6cf4c6-1598-4f25-a512-4391c7f400a5">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkDokument" id="b4a95a3b-7e2c-4b53-8a8b-76c4db662f65">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="ebe75739-97b6-43bf-9e62-c21814fb89ec" name="Exists postDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'postDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET SO 5.3 pI verifyStatus" id="b24cda6d-61ce-4bd6-b2ce-ae8f9d2dbb79">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/dokument" methodName="getDokumente" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -7780,6 +7935,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="d6596f26-4b2b-4552-8e7f-3257e99817f3">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 5.0 XX checkDokument" id="0cc03699-da29-4361-95e1-040fbe5a481c">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="c4bfdfb2-e437-4923-998d-7c975e292d77" name="Exists putDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdDokument}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Property Transfer BP 5.0" id="43d347ca-b625-401c-adc4-0f0a60d811a3">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -7987,6 +8172,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="854c8adc-acc7-4e6d-860a-3ffb8ea4decd">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkDokument" id="0790fc1e-d557-498a-ae4b-d73f5705f083">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="2af97643-5bfb-4362-8fb4-299e131928ed" name="Exists putDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Property Transfer FP 5.0" id="0eaf1e74-ff0c-4eae-8b09-2b329c35d3f7">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -8206,6 +8421,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="93befa11-baa5-43fc-a55d-b60cb5fa53e1">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkDokument" id="55f82061-745d-41fa-b50d-30b32986c943">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="01ec9c4c-fceb-480d-bde4-419fcd5e4f2a" name="Exists putDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Property Transfer LP 6.0" id="196bddc7-ab6a-44a5-8e1e-3d9041251dbd">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -8426,6 +8671,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="da1b1606-2e98-419d-af8b-ba35d38acd82">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkDokument" id="1e09342a-f8cd-4d63-8369-b331ab962934">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="c448352e-0d9a-48a8-81a7-bf46e61c2fc0" name="Exists putDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Property Transfer RP 5.1" id="b43eb4fa-427b-4b68-86b1-303fc2113d81">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -8645,6 +8920,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="384c3652-a961-4f2d-9648-d78d24206f47">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkDokument" id="d2a026f7-282a-4322-b35b-882a6f9cd469">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="Exists putDok.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Property Transfer SO 5.3" id="385d5409-fd1a-456f-8f18-3f5344e329ba">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -8803,6 +9108,72 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 6" id="3680758b-0964-452d-84d2-8a6ef9f9bd87">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC XX XX XX checkDokumentDelete" id="458e82f9-127d-4171-9e91-10ef2a09af8b">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putDok.pdf BP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdDokument}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putDok.pdf SO">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putDok.pdf FP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putDok.pdf LP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putDok.pdf RP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putDok.pdf'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Cleanup" id="23d0275a-0754-4617-a373-0a2547e961fa">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -9096,7 +9467,7 @@ if (documentUrl != "null"){
</con:assertion>
<con:assertion type="JsonPath Match" id="6fb132e6-927b-47e8-a7e3-76d0d028a6ed" name="referenzURL, id and bereichNummer">
<con:configuration>
- <path>$[?(@.referenzURL contains 'HafenCity13.png' && @.id contains 'HafenCity13png')].bereichNummer</path>
+ <path>$[?(@.referenzURL contains 'BPlan002_5-3.png' && @.id contains 'BPlan002_5-3png')].bereichNummer</path>
<content>[0]</content>
<allowWildcards>false</allowWildcards>
<ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
@@ -9246,6 +9617,45 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="38eb4441-0bf9-4b19-b963-14a1e8486455">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 5.3 XX checkRasterbasis" id="3b92ff13-83ad-4872-8ea2-96f72f3551b7">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="c626c665-ca92-4af6-8419-b36cb3dd893c" name="Exists postImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'postImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="5710fe1e-6f12-4181-8694-e6c0b83b5cf2" name="Exists postImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'postImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="POST BP 5.2 pI modifyStatusWithoutBereichExpectError" id="bfb952fb-ed75-42cf-8df8-0ce90f697dcf">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="addRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -9993,6 +10403,45 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="07e78993-0c92-41ee-a4b8-77a0a28c34e2">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkRasterbasis" id="0188822c-b441-451e-acfb-a9189ece535d">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="518f9564-7d7c-43a7-9bab-8af3c6ab860e" name="Exists postImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'postImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="518f9564-7d7c-43a7-9bab-8af3c6ab860e" name="Exists postImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'postImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET FP 5.0 pI verifyStatus" id="4111aab6-a533-4c72-99d1-20a48baf7ca0">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="getRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -10253,6 +10702,45 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="18810b69-3a0d-4fc8-9713-e4a221313be9">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkRasterbasis" id="db03d3f8-20d7-4d6a-a243-1d9b161980ed">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="b2bba16f-ae74-46ba-a523-30bc7163b8b2" name="Exists postImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'postImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="b2bba16f-ae74-46ba-a523-30bc7163b8b2" name="Exists postImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'postImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET LP 6.0 pI verifyStatus" id="0331d096-a28c-4f72-b0f9-488aee10a778">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="getRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -10453,6 +10941,45 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="05836811-00ca-46b2-8334-bfe367d551d2">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkRasterbasis" id="59959907-1b2f-4888-b4e8-65c370c52996">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="4e5d61b2-3df0-4601-a9c3-f73bf2304533" name="Exists postImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'postImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="4e5d61b2-3df0-4601-a9c3-f73bf2304533" name="Exists postImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'postImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET RP 5.1 pI verifyStatus" id="b95b01fb-dc5c-4dd2-bc1a-fa909b11e13d">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="getRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -10655,18 +11182,57 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
- <con:testStep type="restrequest" name="GET SO 5.3 pI verifyStatus" id="c6cda071-1520-4844-848e-d8e4d702b631">
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="e4dff86a-93bc-4bfc-88a7-1689099ba04c">
<con:settings/>
- <con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="getRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <con:restRequest name="GET SO 5.3 pI verifyStatus" id="db9a041f-e0a5-40dc-af67-04479f9de7c9" mediaType="application/json">
- <con:settings>
- <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
- </con:settings>
- <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
- <con:request/>
- <con:originalUri>http://localhost/xplan-api-manager/xmanager/api/v1/plan//rasterbasis</con:originalUri>
- <con:assertion type="Valid HTTP Status Codes" id="38a2586d-5ba6-4c6f-a393-cc6c031ece20" name="Valid HTTP Status Codes">
- <con:configuration>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkRasterbasis" id="dfc26d39-9415-4a6d-ba96-cf21c5a025b0">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="403a72b4-1988-4e96-8c5f-5e89d77c0954" name="Exists postImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'postImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="403a72b4-1988-4e96-8c5f-5e89d77c0954" name="Exists postImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'postImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="restrequest" name="GET SO 5.3 pI verifyStatus" id="c6cda071-1520-4844-848e-d8e4d702b631">
+ <con:settings/>
+ <con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis" methodName="getRasterBasis" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:restRequest name="GET SO 5.3 pI verifyStatus" id="db9a041f-e0a5-40dc-af67-04479f9de7c9" mediaType="application/json">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
+ <con:request/>
+ <con:originalUri>http://localhost/xplan-api-manager/xmanager/api/v1/plan//rasterbasis</con:originalUri>
+ <con:assertion type="Valid HTTP Status Codes" id="38a2586d-5ba6-4c6f-a393-cc6c031ece20" name="Valid HTTP Status Codes">
+ <con:configuration>
<codes>200</codes>
</con:configuration>
</con:assertion>
@@ -10949,6 +11515,45 @@ if (documentUrl != "null"){
</con:transfers>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="339d7570-2ef7-4490-bf1f-9dd385ac2c5c">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 5.3 XX checkRasterbasis" id="f8d9f02d-7b56-4e73-93fb-6c5ec8ff7829">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="754f7477-aae0-4c92-b56e-1036ba3316aa" name="Exists putImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="754f7477-aae0-4c92-b56e-1036ba3316aa" name="Exists putImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="PUT BP 5.3 pI,id modifyStatusUnsupportedContentTypeExpectError" id="06ad277f-e481-40e8-8997-613e2f6934f2">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis/{id}" methodName="replaceRasterbasisById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -11716,6 +12321,45 @@ if (documentUrl != "null"){
</con:transfers>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="0e7760e9-9095-4054-8217-1f35cf97ec5c">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkRasterbasis" id="dac8b620-f3c5-437b-8952-bbb5f7f9961e">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="4cf3837a-caf0-41de-b613-bb8739649972" name="Exists putImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="4cf3837a-caf0-41de-b613-bb8739649972" name="Exists putImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET FP 5.0 pI,id currentStatus" id="77b68847-a3db-4465-b8d5-ed9c7eab6185">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis/{id}" methodName="getRasterbasisById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -11933,6 +12577,45 @@ if (documentUrl != "null"){
</con:transfers>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="183e2903-6e45-4983-9bf4-d6d5945adaa9">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkRasterbasis" id="9c6d7b1e-1e22-433e-9a11-e8a23a9f1bc7">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="de22dc85-4185-4b18-a749-9c0dff0b4dbc" name="Exits putImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="de22dc85-4185-4b18-a749-9c0dff0b4dbc" name="Exits putImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET LP 6.0 pI,id currentStatus" id="afa55a91-11f5-4cc8-93bb-e1a4581140f5">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis/{id}" methodName="getRasterbasisById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -12150,6 +12833,45 @@ if (documentUrl != "null"){
</con:transfers>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="7c3d279a-ad84-43c7-9803-b195f8518b2e">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkRasterbasis" id="77d9a25a-ecd6-45b0-a8f5-15dc8e13db1e">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="941a4cb0-3f22-444a-a2ed-96301eee6b43" name="Exists putImg,png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="941a4cb0-3f22-444a-a2ed-96301eee6b43" name="Exists putImg,pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET RP 5.1 pI,id currentStatus" id="e1db8560-afb6-47e4-b787-3cf5ebb46c7d">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis/{id}" methodName="getRasterbasisById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -12367,6 +13089,45 @@ if (documentUrl != "null"){
</con:transfers>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="f4845713-2976-46b4-b357-24c330556796">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkRasterbasis" id="325e0dd9-342f-4059-9534-9dc252568366">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="d096b504-060c-4dd0-9a83-73bf35f534df" name="Exists putImg.png">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d096b504-060c-4dd0-9a83-73bf35f534df" name="Exists putImg.pgw">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET SO 5.3 pI,id currentStatus" id="4e3cec0d-9592-4ce8-a6a9-db3634063c0a">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/rasterbasis/{id}" methodName="getRasterbasisById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -12500,6 +13261,117 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 6" id="1741ae27-39ba-4e12-add4-12cdd44a8fce">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC XX XX XX checkRasterbasisDelete" id="3985d7a3-9b30-46a4-b25b-48ab8bf6b75e">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.png BP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.png SO">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.png FP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.png LP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.png RP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putImg.png'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.pgw BP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML53}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.pgw SO">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.pgw FP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.pgw LP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="d2a6d419-13f7-480d-b2e0-6314f08fe20a" name="NotExists putImg.pgw RP">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putImg.pgw'])</path>
+ <content>false</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="transfer" name="Cleanup" id="24df644f-cd0c-49f4-9604-4d81f35326ea">
<con:settings/>
<con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -12940,6 +13812,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="6e5758e3-25bb-4d8b-872a-430692a5b5a0">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 6.0 XX checkText" id="a05e6055-b88a-455b-af90-de347bad4f97">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="0d23fb86-c692-4c51-8a38-73152973a42c" name="Exists postText.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdXPlanGML60}' and ARTEFACTS.FILENAME = 'postText.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET BP 6.0 pI verifyStatus" id="8e88382d-1d09-451c-a17b-91582419ba7e">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text" methodName="getTexte" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13131,6 +14033,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="23b4c417-57ed-4101-a495-32434b5b62e1">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkText" id="c9d834b7-689d-4509-a5cd-47e1843038b0">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="afd7d46a-e867-4805-ba4c-8d779c9a7229" name="Exists postText.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'postText.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET FP 5.0 pI verifyStatus" id="d9c2e1d8-3cec-462b-a206-01df8b680f0f">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text" methodName="getTexte" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13322,6 +14254,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="959eb733-4986-494c-b023-6a47257d6898">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkText" id="b56f8484-0f51-47e0-b07a-8b8cd439600c">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="6899c8cf-6dc2-4a19-b631-931fdd4d68fe" name="Exists postText.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'postText.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET LP 6.0 pI verifyStatus" id="73df5016-0280-45d6-9264-0b33a392ce91">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text" methodName="getTexte" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13522,6 +14484,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="81c9358f-ffdb-45dd-806e-72870347dc35">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkText" id="195006ca-bef5-4605-8319-bfa6826f5971">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="2d5b09a7-b3f9-4b47-9502-bd1ffb3b47eb" name="Exists postText,pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'postText.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET RP 5.1 pI verifyStatus" id="38f8b3f5-eba7-4653-b3cc-c1bd92bdd549">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text" methodName="getTexte" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13732,6 +14724,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="b8af7942-c1be-4815-9905-8ad73759793a">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkText" id="6e282894-23f1-44eb-9367-cf6ae4b311d5">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="162e3e58-2d66-4abb-adc2-70863dcb69d5" name="Exists postText.pdf">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'postText.pdf'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET SO 5.3 pI verifyStatus" id="6a089ec3-9bfb-49fd-a907-525f6e6f6f91">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text" methodName="getTexte" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -14067,6 +15089,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing" id="788ee9e8-3f6a-4c48-ae39-0181bf286682">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC BP 5.3 XX checkText" id="98b8b497-1eb1-4b6a-9b48-86f91d23c934">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="845302f4-76d2-4a78-9325-9a9b99185a98" name="Exists putText.txt">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdText}' and ARTEFACTS.FILENAME = 'putText.txt'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="POST BP 5.3 pI,id modifyStatusUnsupportedContentTypeExpectError" id="77616f7c-0228-40fa-bebc-a5af9addb62a">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text/{id}" methodName="replaceTextById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -14289,6 +15341,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 2" id="f5e8be0f-3c53-409c-8e37-67aa5a21e90e">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC FP 5.0 XX checkText" id="97373340-0a11-481e-ae96-41feebf7b6c1">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="5a009682-2847-4785-80df-2e7906635f8f" name="Exists putText.txt">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdFPlan}' and ARTEFACTS.FILENAME = 'putText.txt'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET FP 5.0 pI,id currentStatus" id="5d54a967-d99a-4b6f-8227-0a26c30d04a4">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text/{id}" methodName="getTextById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -14437,6 +15519,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 3" id="966e4726-aa51-46c8-9d00-92c3c9b30a4a">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC LP 6.0 XX checkText" id="a64228d0-6079-4071-91ee-5a5d1363d67d">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="2f54d3c3-76e6-46e9-a494-43d3207037b4" name="Exists putText.txt">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdLPlan}' and ARTEFACTS.FILENAME = 'putText.txt'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET LP 6.0 pI,id currentStatus" id="927d3902-cd69-492b-867b-83e3cb7b22cb">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text/{id}" methodName="getTextById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -14585,6 +15697,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 4" id="2f1a48e5-4e98-4fdb-bdea-465632ec4a1a">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC RP 5.1 XX checkText" id="b6e50961-ccf8-4b71-8ea6-548cd5e7bbbc">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="d0eabfd5-9da0-4863-983f-208afbdcce95" name="Exists putText.txt">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdRPlan}' and ARTEFACTS.FILENAME = 'putText.txt'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET RP 5.1 pI,id currentStatus" id="2081edcc-f8e6-42c8-b9f2-b1932feed37b">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text/{id}" methodName="getTextById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -14733,6 +15875,36 @@ if (documentUrl != "null"){
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="groovy" name="skipNextStepIfJdbcUrlMissing 5" id="13c702d1-4b31-4019-b9d9-6ef12826baa8">
+ <con:settings/>
+ <con:config>
+ <script>def jdbcUrl = context.testCase.testSuite.project.getPropertyValue("jdbcUrl");
+
+if (jdbcUrl == ""){
+ def currentStepIndex = context.currentStepIndex;
+ def stepToGo = testRunner.testCase.getTestStepAt(currentStepIndex + 2).getName();
+ testRunner.gotoStepByName(stepToGo);
+}</script>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="jdbc" name="JDBC SO 5.3 XX checkText" id="eff5e3e1-0ac2-4b17-9435-ed8e8d05b483">
+ <con:settings/>
+ <con:config xsi:type="con:JdbcRequestTestStep" convertColumnNamesToUpperCase="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:driver>org.postgresql.Driver</con:driver>
+ <con:connectionString>${#Project#jdbcUrl}</con:connectionString>
+ <con:query>select plan,filename from xplanmgr.artefacts;</con:query>
+ <con:assertion type="XPath Match" id="8ae18008-3585-4173-830b-0fe1f7455a93" name="Exists putText.txt">
+ <con:configuration>
+ <path>exists(/Results/ResultSet/Row[ARTEFACTS.PLAN = '${#TestSuite#currentPlanIdSOPlan}' and ARTEFACTS.FILENAME = 'putText.txt'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:properties/>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="GET SO 5.3 pI,id currentStatus" id="4a8fcfae-6c11-4484-bbbd-e4b51b0980fa">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}/text/{id}" methodName="getTextById" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -17162,7 +18334,7 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
</con:property>
<con:property>
<con:name>baseUrlServices</con:name>
- <con:value>http://localhost:8083/</con:value>
+ <con:value>http://localhost:8083</con:value>
</con:property>
<con:property>
<con:name>username</con:name>
@@ -17172,6 +18344,10 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
<con:name>password</con:name>
<con:value/>
</con:property>
+ <con:property>
+ <con:name>jdbcUrl</con:name>
+ <con:value/>
+ </con:property>
</con:properties>
<con:wssContainer/>
<con:oAuth2ProfileContainer/>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_4.1_MimeTypeV2.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_4.1_MimeTypeV2.zip
deleted file mode 100644
index d3014cdf93e0298f3f04431c7b8f8c0a899c583d..0000000000000000000000000000000000000000
Binary files a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_4.1_MimeTypeV2.zip and /dev/null differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_5.3.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_5.3.zip
index 6e21664802f7713b06ad4815570a26b6984d762a..f43b55cfff5599416a579f6973aecaeb3ca4478b 100644
Binary files a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_5.3.zip and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_5.3.zip differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BPlan004_4-1.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BPlan004_4-1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..939fa16a9a105321578829d9de1fb68c1df5889a
Binary files /dev/null and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BPlan004_4-1.zip differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator-soapui-project.xml
index a0ba6725bc2e831ae8bfb3a95e28907578b65dd9..fffb3bc15024f04c5eff4e8ccf7d860796937f6b 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator-soapui-project.xml
@@ -17,7 +17,7 @@
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%-->
-<con:soapui-project id="45582ef9-4bae-43d8-9226-a378e02ff0b5" activeEnvironment="Default" name="xplan-api-validator" resourceRoot="" soapui-version="5.7.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project id="45582ef9-4bae-43d8-9226-a378e02ff0b5" activeEnvironment="Default" name="xplan-api-validator" resourceRoot="" soapui-version="5.7.2" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config">
<con:settings/>
<con:interface xsi:type="con:RestService" id="85ec4fc3-149e-4a77-a566-194de2899fd3" wadlVersion="http://wadl.dev.java.net/2009/02" name="XPlanValidatorAPI" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:description>XPlanValidator REST API</con:description>
@@ -623,7 +623,7 @@ Validate XPlanGML or XPlanArchive</con:description>
</con:representation>
<con:representation type="FAULT">
<con:mediaType>application/json</con:mediaType>
- <con:status>400 406 415</con:status>
+ <con:status>400 406 415 422</con:status>
<con:params/>
</con:representation>
<con:representation type="RESPONSE">
@@ -656,6 +656,24 @@ Validate XPlanGML or XPlanArchive</con:description>
<con:params/>
<con:element>data</con:element>
</con:representation>
+ <con:representation type="FAULT">
+ <con:mediaType xsi:nil="true"/>
+ <con:status>400</con:status>
+ <con:params/>
+ <con:element>data</con:element>
+ </con:representation>
+ <con:representation type="FAULT">
+ <con:mediaType xsi:nil="true"/>
+ <con:status>400</con:status>
+ <con:params/>
+ <con:element>data</con:element>
+ </con:representation>
+ <con:representation type="FAULT">
+ <con:mediaType xsi:nil="true"/>
+ <con:status>400</con:status>
+ <con:params/>
+ <con:element>data</con:element>
+ </con:representation>
<con:request name="Request 1" id="1e838fd1-d5da-4a94-9638-1e66e478df75" mediaType="application/json" postQueryString="false">
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
@@ -719,7 +737,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="fb838b6f-0eaa-45a1-8a43-f87364021182" name="JsonPath Match path /">
+ <con:assertion type="JsonPath Match" id="fb838b6f-0eaa-45a1-8a43-f87364021182" name="path /">
<con:configuration>
<path>$.paths./</path>
<content>{"get":{"summary":"OpenAPI document","description":"API documentation","operationId":"openApi","responses":{"200":{"description":"successful operation","content":{"application/json":{"schema":{"type":"object"}}}},"406":{"description":"Requested format is not available"}}}}</content>
@@ -728,7 +746,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="fb838b6f-0eaa-45a1-8a43-f87364021182" name="JsonPath Match path /validate X-Filename parameter">
+ <con:assertion type="JsonPath Match" id="fb838b6f-0eaa-45a1-8a43-f87364021182" name="path /validate X-Filename parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'X-Filename')]</path>
<content>[{"name":"X-Filename","in":"header","description":"Name of the file to be uploaded","schema":{"pattern":"^[A-Za-z0-9.()_\\-]*$","type":"string"},"example":"File names such as xplan.gml, xplan.xml, xplan.zip"}]</content>
@@ -737,7 +755,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate name parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate name parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'name')]</path>
<content>[{"name":"name","in":"query","description":"Name of the validation","schema":{"pattern":"^[A-Za-z0-9.()_\\-]*$","type":"string"},"example":"xplan-1Pruefbericht_Torstrasse_10_report-4223"}]</content>
@@ -746,7 +764,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate skipSemantisch parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate skipSemantisch parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'skipSemantisch')]</path>
<content>[{"name":"skipSemantisch","in":"query","description":"skip semantische Validierung","schema":{"type":"boolean","default":false}}]</content>
@@ -755,7 +773,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate skipGeometrisch parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate skipGeometrisch parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'skipGeometrisch')]</path>
<content>[{"name":"skipGeometrisch","in":"query","description":"skip geometrische Validierung","schema":{"type":"boolean","default":false}}]</content>
@@ -764,7 +782,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate skipFlaechenschluss parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate skipFlaechenschluss parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'skipFlaechenschluss')]</path>
<content>[{"name":"skipFlaechenschluss","in":"query","description":"skip Flaechenschluss Ueberpruefung","schema":{"type":"boolean","default":false}}]</content>
@@ -773,7 +791,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate skipGeltungsbereich parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate skipGeltungsbereich parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'skipGeltungsbereich')]</path>
<content>[{"name":"skipGeltungsbereich","in":"query","description":"skip Geltungsbereich Ueberpruefung","schema":{"type":"boolean","default":false}}]</content>
@@ -782,7 +800,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate skipLaufrichtung parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate skipLaufrichtung parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'skipLaufrichtung')]</path>
<content>[{"name":"skipLaufrichtung","in":"query","description":"skip Laufrichtung Ueberpruefung","schema":{"type":"boolean","default":false}}]</content>
@@ -791,7 +809,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="JsonPath Match path /validate profiles parameter">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="path /validate profiles parameter">
<con:configuration>
<path>$.paths./validate.post.parameters.[?(@.name == 'profiles')]</path>
<content>[{"name":"profiles","in":"query","description":"Names of profiles which shall be additionaly used for validation","explode":false,"schema":{"type":"array","items":{"type":"string"}}}]</content>
@@ -800,7 +818,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="jsonPath Match path validationReport externalReferences items type">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="schemas ValidationReport externalReferences items type">
<con:configuration>
<path>$.components.schemas.ValidationReport.properties.externalReferences.items.type</path>
<content>string</content>
@@ -809,7 +827,7 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
- <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="jsonPath Match path validationReport externalReferencesResult items ref">
+ <con:assertion type="JsonPath Match" id="634b1a88-6df2-49f0-9e23-8babb820f690" name="schemas ValidationReport externalReferencesResult items ref">
<con:configuration>
<path>$.components.schemas.ValidationReport.properties.externalReferencesResult.items.$ref</path>
<content>#/components/schemas/ExternalReferenceResult</content>
@@ -818,6 +836,15 @@ Validate XPlanGML or XPlanArchive</con:description>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Existence Match" id="21d4a0ad-da22-4876-8ecc-ce7ebc245f39" name="schemas DocumentSummary">
+ <con:configuration>
+ <path>$.components.schemas.DocumentSummary</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -979,6 +1006,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="095d1eee-73c5-4f78-9331-e60e460cb03a" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="095d1eee-73c5-4f78-9331-e60e460cb03a" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1045,6 +1090,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="7efd3f77-fef5-4f04-adaf-6757b05ba0a7" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="90a36c83-8d76-4b9e-8fff-5c853e68e741" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1112,6 +1175,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="719e3476-4c5c-4534-a694-dd59b602c3b5" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="8942ec5f-811a-4df8-9bf9-485318a3f47e" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1188,6 +1269,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="1f7e0a9a-55fc-4349-a0aa-3a1c960e1eda" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="f3054fcf-2af1-44a9-af41-77132657e9a2" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1255,6 +1354,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="82f7c406-1ea2-4e34-8720-b2e874561587" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="c9852dbd-152a-4d58-8303-d2733e1c969d" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1322,6 +1439,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="e8abbf69-aeae-4f0e-9001-407f44f98057" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="2d5794eb-e016-4904-95c2-e80506d66d7c" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1416,6 +1551,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="a174345e-6fff-4d9d-a768-19a5a9fe8706" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="96192c51-626b-4e76-a3f1-48926a4d0d97" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1487,6 +1640,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="0d923c8c-022a-47f5-bfad-b341416c26b7" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="e2373175-0a4e-4ae1-8c89-76a86b299526" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1554,6 +1725,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="6ee186de-ac30-4215-8340-00973b2cc5ed" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="04fe6449-0a75-4a4b-bbc0-f9b6437185cc" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1620,6 +1809,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="65471d70-7128-4ea6-886e-334469a2a919" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="3eec16de-434c-445a-aef4-e202567df639" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1735,6 +1942,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="422f7ce4-06fc-44aa-9841-6d9d22243113" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="e4c5feeb-c495-487b-8259-43cc40aa24e5" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1783,6 +2008,24 @@ assert json.version != null</scriptText>
<codes>200</codes>
</con:configuration>
</con:assertion>
+ <con:assertion type="XPath Match" id="0bfb6748-239d-45d0-b506-e77992a184c6" name="documentSummary_name">
+ <con:configuration>
+ <path>//validationReport/documentSummary/name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="1140adcc-b4d4-4d1d-9de1-7c5ec5fd6985" name="documentSummary_type">
+ <con:configuration>
+ <path>//validationReport/documentSummary/type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -1831,6 +2074,24 @@ assert json.version != null</scriptText>
<codes>200</codes>
</con:configuration>
</con:assertion>
+ <con:assertion type="XPath Match" id="83337f0b-2d75-49e3-8a1c-e25959aa374f" name="documentSummary_name">
+ <con:configuration>
+ <path>//validationReport/documentSummary/name</path>
+ <content>Heideweg_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="cc508505-df5e-48fd-b0bf-5a114a497ffe" name="documentSummary_type">
+ <con:configuration>
+ <path>//validationReport/documentSummary/type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2009,6 +2270,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="609194b0-700a-4b3d-b278-01eff6f2d0fc" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan003_5-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="9f40b52d-6456-4ddd-904b-003c00290e61" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2084,6 +2363,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="d4d9cbed-3413-4bea-8b5a-175a4a5d6501" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan002_5-3</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="429a212d-1fdf-4d62-835a-82267ac53f18" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2150,6 +2447,42 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="7896af55-1fb4-4bf8-b1fd-87ed12b770c8" name="documentSummary_name_1">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan001_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="3e47ef93-e159-4377-945b-049147f73bf8" name="documentSummary_name_2">
+ <con:configuration>
+ <path>$.documentSummary[1].name</path>
+ <content>BPlan003_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="a1503153-43aa-4f1e-8a3f-e7f46d47a506" name="documentSummary_type_1">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="943ce07c-3dfd-42bb-9d19-a3cf345ab28c" name="documentSummary_type_2">
+ <con:configuration>
+ <path>$.documentSummary[1].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2216,6 +2549,42 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="6a5c3e06-228c-4881-a9a7-30c447cb3ee7" name="documentSummary_name_1">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan003_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="4d840524-cc02-4f0b-ae8d-1b2ae37f6e7e" name="documentSummary_name_2">
+ <con:configuration>
+ <path>$.documentSummary[1].name</path>
+ <content>BPlan001_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="30f0fadc-95b7-4251-93ef-b7a1bfb66d49" name="documentSummary_type_1">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="66938068-003d-4265-91f6-be75b3fb6f86" name="documentSummary_type_2">
+ <con:configuration>
+ <path>$.documentSummary[1].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2282,6 +2651,42 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="4911dc4c-07e2-46cb-977a-4c89f6021e4a" name="documentSummary_name_1">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan003_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="235a52ad-d5be-4f39-b740-4f4c98fe74a1" name="documentSummary_name_2">
+ <con:configuration>
+ <path>$.documentSummary[1].name</path>
+ <content>BPlan001_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="6c161d64-df77-4fc6-a121-3471b66ff5b7" name="documentSummary_type_1">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="731de1cb-983b-4408-bfcf-0174de5fa7a2" name="documentSummary_type_2">
+ <con:configuration>
+ <path>$.documentSummary[1].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2348,6 +2753,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="6a7df2c0-036b-48e1-946c-55f24e5d1f9c" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan003_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="27a0feb1-ec72-4362-a7c1-216c76bfaf29" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2414,6 +2837,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="1801e958-8015-43b2-9918-9627bec17706" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan003_5-3_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="9a8a43c3-acd1-44c2-8c29-aee5c26d3954" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2635,6 +3076,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="72f3251e-e74e-4f91-8daf-0d2d5380be45" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Blankenese29_Testplan_60_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="00d94987-d2f2-4b82-9c66-d7ac5b064e2d" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2739,6 +3198,15 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="9aedecf1-472c-4828-a02d-d7d444a171d2" name="documentSummary">
+ <con:configuration>
+ <path>$.documentSummary</path>
+ <content>[]</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2825,6 +3293,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="a2b28343-3a71-4d2a-8d9d-83c1e1ad3ae1" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>Original60_test(1Aend)_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="c4162720-0cd8-4578-a192-3429d4c8458d" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -2964,6 +3450,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="54106c8e-d509-4d17-9a7a-f9ce81486d3f" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan_SO-Objekte-Test_6-0-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="851df244-575f-444a-a69f-3b67ee239da2" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -3058,6 +3562,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="8b79bb2e-63d6-416e-bb11-8f89ff0bd70f" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan_SO-Objekte-Test_6-0-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="e0b41ef1-2013-4160-9e4d-7600c4347d5b" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -3160,6 +3682,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="87af63ab-3a39-4b39-be34-6ac0c36272fb" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>BPlan_SO-Objekte-Test_6-0-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="128c5519-0fab-4e23-b857-87bd88bc24bc" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>BP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -3245,6 +3785,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="88c3fcba-65bc-44c3-b911-9de7fbb49843" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>FPlan_SO-Objekte-Test_6-0-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="74dafae5-7c00-4d09-a27a-02781ff1d17f" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>FP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
@@ -3339,6 +3897,24 @@ assert json.version != null</scriptText>
<ignoreComments>false</ignoreComments>
</con:configuration>
</con:assertion>
+ <con:assertion type="JsonPath Match" id="b1cb6884-8832-43b8-ae4a-9460f15bfdcd" name="documentSummary_name">
+ <con:configuration>
+ <path>$.documentSummary[0].name</path>
+ <content>FPlan_SO-Objekte-Test_6-0-2_SoapUI-XPlanValidatorAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="f2ad712c-0f8f-4184-8d1d-61cbf9084f6e" name="documentSummary_type">
+ <con:configuration>
+ <path>$.documentSummary[0].type</path>
+ <content>FP_Plan</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
<con:credentials>
<con:username xsi:nil="true"/>
<con:password xsi:nil="true"/>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator/plans/BP_5.3.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator/plans/BP_5.3.zip
index b6ab98a185d2bbbeb82b8abdc970e6ea77f7980c..a7d89135f0231bc8eefdd68fe3c509461bb4cbc3 100644
Binary files a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator/plans/BP_5.3.zip and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-validator/plans/BP_5.3.zip differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-web-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-web-soapui-project.xml
index ae7fe5ba1ff8791ed06ac7000202c0a271bc4103..57b32c74747999ae0e5fa34c8c5ac7c10fb45ef7 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-web-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-web-soapui-project.xml
@@ -17,7 +17,7 @@
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%-->
-<con:soapui-project activeEnvironment="Default" name="xplan-manager-web" resourceRoot="" soapui-version="5.7.1" abortOnError="false" runType="SEQUENTIAL" id="d6b438c5-e36f-447d-97b3-c0ed43c1c1a2" xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project activeEnvironment="Default" name="xplan-manager-web" resourceRoot="" soapui-version="5.7.2" abortOnError="false" runType="SEQUENTIAL" id="d6b438c5-e36f-447d-97b3-c0ed43c1c1a2" xmlns:con="http://eviware.com/soapui/config">
<con:settings/>
<con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="MANAGER" type="rest" basePath="/xplanmgrweb/rest" definitionUrl="" id="e35a1adf-d31f-49f2-8d74-efe2e22f0380" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<con:settings/>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
index 3ca32a5771e99fa1e448b65d3350d05b0c1b7785..0dce7f7fd80b6db2a5c95feb41f60447e38bd7df 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
@@ -17,20 +17,22 @@
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%-->
-<con:soapui-project id="4497dcb6-2c5f-4d87-bcee-3913ada70576" activeEnvironment="Default" name="xplan-webservices" resourceRoot="" soapui-version="5.7.1" abortOnError="false" runType="SEQUENTIAL" defaultScriptLanguage="Groovy" xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project id="4497dcb6-2c5f-4d87-bcee-3913ada70576" activeEnvironment="Default" name="xplan-webservices" resourceRoot="" soapui-version="5.7.2" abortOnError="false" runType="SEQUENTIAL" defaultScriptLanguage="Groovy" xmlns:con="http://eviware.com/soapui/config">
<con:description>For local execution use following property values:
baseUrlServices=http://localhost:8083
baseUrlInspirePlu=http://localhost:8084
baseUrlManagerApi=http://localhost:8086/xplan-api-manager
baseUrlMapServer=http://localhost:8087
+baseUrlMapProxy=http://localhost:8093
For execution against test environment use following property values:
baseUrlServices=https://xplanbox.lat-lon.de
baseUrlInspirePlu=https://xplanbox.lat-lon.de
baseUrlManagerApi=https://xplanbox.lat-lon.de
-baseUrlMapServer=https://xplanbox.lat-lon.de</con:description>
+baseUrlMapServer=https://xplanbox.lat-lon.de
+baseUrlMapProxy=https://xplanbox.lat-lon.de</con:description>
<con:settings/>
<con:testSuite id="ef6a4631-78a1-4c83-b55b-a5a410e4ae47" name="xplan-wms">
<con:settings/>
@@ -11415,6 +11417,892 @@ exists(//wms:Layer[wms:Name='soplanrasterarchive'])</path>
</con:testCase>
<con:properties/>
</con:testSuite>
+ <con:testSuite id="d74ba36d-1a76-41b3-9994-385392715598" name="mapproxy-wms">
+ <con:settings/>
+ <con:runType>SEQUENTIAL</con:runType>
+ <con:testCase id="946bcdd6-2a7b-4fa6-ae14-b4b8776460c9" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="GetCapabilities" searchProperties="true">
+ <con:settings/>
+ <con:testStep type="httprequest" name="GetCapabilities" id="847d6c4f-14ba-491f-b31e-342bedcb5350">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="583d2488-b5af-4e99-bd6c-0780c2db7a8c" name="GetCapabilities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="c5c89b24-24e9-475d-9dc7-d10fbc260ca6" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="XPath Match">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(/wms:WMS_Capabilities)</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer bplan_raster">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='bplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer bplan_vektor">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='bplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer fplan_raster">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='fplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer fplan_vektor">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='fplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer lplan_raster">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='lplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer lplan_vektor">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='lplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer rplan_raster">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='rplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer rplan_vektor">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='rplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer soplan_raster">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='soplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer soplan_vektor">
+ <con:configuration>
+ <path>declare namespace wms='http://www.opengis.net/wms';
+
+exists(//wms:Layer[wms:Name='soplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>service</con:name>
+ <con:value>WMS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMS</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>request</con:name>
+ <con:value>GetCapabilities</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetCapabilities</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:properties/>
+ </con:testCase>
+ <con:testCase id="a5321167-9afd-4e39-ba43-43bc549b52e6" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="GetMap" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
+ <con:settings/>
+ <con:testStep type="httprequest" name="GetMap - Raster" id="3a43e4a9-6065-43f8-83f0-5d1361bc441b">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="c94db636-c152-447a-94e1-768498fbcd21" name="GetMap - Raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="2b2dc1c4-d8c4-4308-8c53-f98536940634" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="2d84ae43-1da4-4670-a19f-09ec1756da30" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>SERVICE</con:name>
+ <con:value>WMS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMS</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>VERSION</con:name>
+ <con:value>1.3.0</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>1.3.0</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>REQUEST</con:name>
+ <con:value>GetMap</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetMap</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>BBOX</con:name>
+ <con:value>559353.370312843821,5938419.563309948891,560301.9464769054903,5939194.931326406077</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>559353.370312843821,5938419.563309948891,560301.9464769054903,5939194.931326406077</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>CRS</con:name>
+ <con:value>EPSG:25832</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>EPSG:25832</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>WIDTH</con:name>
+ <con:value>817</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>817</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>HEIGHT</con:name>
+ <con:value>667</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>667</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>LAYERS</con:name>
+ <con:value>bplan_raster,fplan_raster,lplan_raster,rplan_raster,soplan_raster</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>BP_Planvektor</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>STYLES</con:name>
+ <con:value>,,,,</con:value>
+ <con:style>QUERY</con:style>
+ <con:default/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT</con:name>
+ <con:value>image/png</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>image/png</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>DPI</con:name>
+ <con:value>96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>MAP_RESOLUTION</con:name>
+ <con:value>96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT_OPTIONS</con:name>
+ <con:value>dpi:96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>dpi:96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TRANSPARENT</con:name>
+ <con:value>TRUE</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>TRUE</con:default>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="httprequest" name="GetMap - Vektor" id="ce5ea025-d851-4ff7-bbd2-9c894e290a1d">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="c94db636-c152-447a-94e1-768498fbcd21" name="GetMap - Vektor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="2b2dc1c4-d8c4-4308-8c53-f98536940634" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="2d84ae43-1da4-4670-a19f-09ec1756da30" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>SERVICE</con:name>
+ <con:value>WMS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMS</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>VERSION</con:name>
+ <con:value>1.3.0</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>1.3.0</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>REQUEST</con:name>
+ <con:value>GetMap</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetMap</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>BBOX</con:name>
+ <con:value>559353.370312843821,5938419.563309948891,560301.9464769054903,5939194.931326406077</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>559353.370312843821,5938419.563309948891,560301.9464769054903,5939194.931326406077</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>CRS</con:name>
+ <con:value>EPSG:25832</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>EPSG:25832</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>WIDTH</con:name>
+ <con:value>817</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>817</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>HEIGHT</con:name>
+ <con:value>667</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>667</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>LAYERS</con:name>
+ <con:value>bplan_vektor,fplan_vektor,lplan_vektor,rplan_vektor,soplan_vektor</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>BP_Planvektor</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>STYLES</con:name>
+ <con:value>,,,,</con:value>
+ <con:style>QUERY</con:style>
+ <con:default/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT</con:name>
+ <con:value>image/png</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>image/png</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>DPI</con:name>
+ <con:value>96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>MAP_RESOLUTION</con:name>
+ <con:value>96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT_OPTIONS</con:name>
+ <con:value>dpi:96</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>dpi:96</con:default>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TRANSPARENT</con:name>
+ <con:value>TRUE</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>TRUE</con:default>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:properties/>
+ </con:testCase>
+ <con:properties/>
+ </con:testSuite>
+ <con:testSuite id="ef3d45bf-0b99-410e-b070-6cc92d7a5056" name="mapproxy-wmts">
+ <con:settings/>
+ <con:runType>SEQUENTIAL</con:runType>
+ <con:testCase id="7ba776c8-2f6b-4a8f-81dc-6764b04f26fe" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="GetCapabilities" searchProperties="true">
+ <con:settings/>
+ <con:testStep type="httprequest" name="GetCapabilities" id="08af9ac8-c960-457a-8588-d9824319ca51">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="583d2488-b5af-4e99-bd6c-0780c2db7a8c" name="GetCapabilities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="c5c89b24-24e9-475d-9dc7-d10fbc260ca6" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="XPath Match">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+
+exists(/wmts:Capabilities)</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer bplan_raster">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='bplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer bplan_vektor">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='bplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer fplan_raster">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='fplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer fplan_vektor">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='fplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer lplan_raster">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='lplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer lplan_vektor">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='lplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer rplan_raster">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='rplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer rplan_vektor">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='rplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer soplan_raster">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='soplan_raster'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="XPath Match" id="72194f5a-8b51-4dd6-9d22-94b68289bfb6" name="Layer soplan_vektor">
+ <con:configuration>
+ <path>declare namespace wmts='http://www.opengis.net/wmts/1.0';
+declare namespace ows='http://www.opengis.net/ows/1.1'
+
+exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>service</con:name>
+ <con:value>WMTS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMS</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>request</con:name>
+ <con:value>GetCapabilities</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetCapabilities</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:properties/>
+ </con:testCase>
+ <con:testCase id="0477e58b-8722-454e-9fbc-e71fdb5ae836" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="GetTile" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
+ <con:settings/>
+ <con:testStep type="httprequest" name="GetTile - bplan_raster" id="60bd1a9f-2155-4f75-bd87-8d9fc309edc9">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="2abb02e5-f0c7-4202-9f6f-b760b042f42e" name="GetTile - bplan_raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="0ba4a08c-fb12-45de-8583-78dd90f56b16" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>SERVICE</con:name>
+ <con:value>WMTS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMTS</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>REQUEST</con:name>
+ <con:value>GetTile</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetTile</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>VERSION</con:name>
+ <con:value>1.0.0</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>1.0.0</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>LAYER</con:name>
+ <con:value>bplan_vektor</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>bplan_raster</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>STYLE</con:name>
+ <con:value>default</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>default</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT</con:name>
+ <con:value>image/png</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>image/png</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEMATRIXSET</con:name>
+ <con:value>gdi_de_25832</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>gdi_de_25832</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEMATRIX</con:name>
+ <con:value>14</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>14</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEROW</con:name>
+ <con:value>4592</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>4592</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILECOL</con:name>
+ <con:value>8202</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>8202</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="httprequest" name="GetTile - bplan_vektor" id="4653916d-4d91-4f9c-b453-a2fdc51db108">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="2abb02e5-f0c7-4202-9f6f-b760b042f42e" name="GetTile - bplan_vektor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="0ba4a08c-fb12-45de-8583-78dd90f56b16" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <con:parameter>
+ <con:name>SERVICE</con:name>
+ <con:value>WMTS</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>WMTS</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>REQUEST</con:name>
+ <con:value>GetTile</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>GetTile</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>VERSION</con:name>
+ <con:value>1.0.0</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>1.0.0</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>LAYER</con:name>
+ <con:value>bplan_raster</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>bplan_raster</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>STYLE</con:name>
+ <con:value>default</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>default</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>FORMAT</con:name>
+ <con:value>image/png</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>image/png</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEMATRIXSET</con:name>
+ <con:value>gdi_de_25832</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>gdi_de_25832</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEMATRIX</con:name>
+ <con:value>14</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>14</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILEROW</con:name>
+ <con:value>4592</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>4592</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ <con:parameter>
+ <con:name>TILECOL</con:name>
+ <con:value>8202</con:value>
+ <con:style>QUERY</con:style>
+ <con:default>8202</con:default>
+ <con:path xsi:nil="true"/>
+ <con:description xsi:nil="true"/>
+ </con:parameter>
+ </con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="httprequest" name="REST GetTile - bplan_raster" id="f0ebbf6d-8143-430b-aa7f-bf7831e55115">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="2abb02e5-f0c7-4202-9f6f-b760b042f42e" name="REST GetTile - bplan_raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_raster/gdi_de_25832/14/8202/4592.png</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="0ba4a08c-fb12-45de-8583-78dd90f56b16" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters></con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="httprequest" name="REST GetTile - bplan_vektor" id="16fa6248-6d25-4906-92ca-12b79fa8e63c">
+ <con:settings/>
+ <con:config method="GET" xsi:type="con:HttpRequest" id="2abb02e5-f0c7-4202-9f6f-b760b042f42e" name="REST GetTile - bplan_vektor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_vektor/gdi_de_25832/14/8202/4592.png</con:endpoint>
+ <con:request/>
+ <con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>200</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="Simple Contains" id="0ba4a08c-fb12-45de-8583-78dd90f56b16" name="Contains">
+ <con:configuration>
+ <token>PNG</token>
+ <ignoreCase>false</ignoreCase>
+ <useRegEx>false</useRegEx>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:authType>Global HTTP Settings</con:authType>
+ </con:credentials>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters></con:parameters>
+ </con:config>
+ </con:testStep>
+ <con:properties/>
+ </con:testCase>
+ <con:properties/>
+ </con:testSuite>
<con:properties>
<con:property>
<con:name>baseUrlServices</con:name>
@@ -11432,6 +12320,10 @@ exists(//wms:Layer[wms:Name='soplanrasterarchive'])</path>
<con:name>baseUrlMapServer</con:name>
<con:value>http://localhost:8087</con:value>
</con:property>
+ <con:property>
+ <con:name>baseUrlMapProxy</con:name>
+ <con:value>http://localhost:8093</con:value>
+ </con:property>
<con:property>
<con:name>username</con:name>
<con:value/>
diff --git a/xplan-webapps/pom.xml b/xplan-webapps/pom.xml
index 2b0133ea95324361248a9cce85101ffd4a7c285b..8308ea75acc9922202719c2638a0652ce7c3da49 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/xplan-webapps/xplan-commons-web/pom.xml b/xplan-webapps/xplan-commons-web/pom.xml
index f64cf28f9d2787fb50aa4b62c67d09db628899eb..b9179e85c18b6e2148dba2347b2663f02eccdafb 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-manager-web/pom.xml b/xplan-webapps/xplan-manager-web/pom.xml
index e31f665d1419e2c5dabc8a3327878c00bfe73e4f..55875f7a31ebdb7aa7537fe06d1b21c3115373d7 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
index 0be1b6a265a41c5026d3b55adda0d319b4b20996..e3c4d0cf3a98c398ea0765e22ce1786464426362 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
@@ -25,14 +25,11 @@ import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FileUpload;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
import de.latlon.xplan.manager.web.client.gui.widget.Validable;
import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages;
@@ -102,14 +99,6 @@ public class PreserveExistingFileUpload extends VerticalPanel implements Validab
return filename != null && filename.length() > 0;
}
- /**
- * @param isEnabled true if enable, false otherwise
- */
- public void setEnabled(boolean isEnabled) {
- selectedFile.setEnabled(isEnabled);
- removeButton.setEnabled(isEnabled);
- }
-
/**
* @param changeHandler the ChangeHandler to add
*/
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
index 2822dde2ee724507224b93ddb9f0bae70c2c7819..beb7b9bfce586470883fa07430857f819825865b 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
@@ -100,13 +100,22 @@ public class TextDialog extends EditDialogBoxWithRasterUpload {
if (rechtscharakterType != null) {
editedText.setRechtscharakter(rechtscharakterType.getValueAsEnum());
}
- if (XPLAN_60.equals(version) && (textToEdit == null || textToEdit.getReferenzName() == null)) {
- String referenzName = parseReferenzNameFromReferenzUrl();
- editedText.setReferenzName(referenzName);
+ if (XPLAN_60.equals(version)) {
+ String referenceName = getReferenceName(text.getValue());
+ editedText.setReferenzName(referenceName);
}
return editedText;
}
+ private String getReferenceName(String textValue) {
+ if (textValue != null && !textValue.isEmpty())
+ return null;
+ if (textToEdit != null && textToEdit.getReferenzName() != null) {
+ return textToEdit.getReferenzName();
+ }
+ return parseReferenzNameFromReferenzUrl();
+ }
+
@Override
protected boolean isReferenceUrlMandatory() {
return false;
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
index bb22a682e91af3c98e5bf4ec12423c2ad4a092e6..c7de5ce4519d9670172b2cf944a57628e80843e4 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
@@ -18,7 +18,7 @@ public final class ReferenceNameUtils {
public static String extractFilenameFromUrl(String url) {
if (url == null || url.isEmpty()) {
- return UNKNOWN;
+ return null;
}
url = removeTrailingQuestionmark(url);
if (url.contains("?")) {
diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java b/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
index 8fc98d7512ea3c5b6f41463005199d83f0be6dd8..de0fe7cc2127a641dd9da7757d78226dac2f9271 100644
--- a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
+++ b/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
@@ -3,6 +3,7 @@ package de.latlon.xplan.manager.web.client.utils;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
public class ReferenceNameUtilsTest {
@@ -89,7 +90,7 @@ public class ReferenceNameUtilsTest {
public void testThatParseFilenameFromUrlWithEmptyString() {
String url = "";
String filename = ReferenceNameUtils.extractFilenameFromUrl(url);
- assertThat(filename, is("Unbekannt"));
+ assertThat(filename, nullValue());
}
@Test
diff --git a/xplan-webapps/xplan-root/Dockerfile b/xplan-webapps/xplan-root/Dockerfile
index 2bbc0dde13287e1c92a48bbbd04b1eb434840670..b226f9790cdb2956d72d211386385ff2eb1feed2 100644
--- a/xplan-webapps/xplan-root/Dockerfile
+++ b/xplan-webapps/xplan-root/Dockerfile
@@ -1,3 +1,5 @@
FROM httpd:2.4
+ENV TZ=Europe/Berlin
+
COPY target/xplan-root-*-default /usr/local/apache2/htdocs/
\ No newline at end of file
diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-webapps/xplan-root/pom.xml
index 0ca2161781f5bd90a1b68b8a38a3b8557f050e6d..3ef23cc357fb2e54ff1b083f9028cacfc7ba7b35 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web-commons/pom.xml b/xplan-webapps/xplan-validator-web-commons/pom.xml
index 29f8b793fdbe08db690cffb1a1a8d9c910ded118..863138c2c5812d98b3d04a9847cd18cedee66b35 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web/pom.xml b/xplan-webapps/xplan-validator-web/pom.xml
index 0af765f31eca27c89df6f60080a9c96c99f52039..667443e3ce771d692ae3112bc3ca92c950d937c6 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml
index b67d0f8ca586ef4376695bd71c3d0b926766fab2..f6a7a6adc918a3417703b2d7683e5e4f76bbdebe 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/xplan-webservices/xplan-commons-webservices/pom.xml b/xplan-webservices/xplan-commons-webservices/pom.xml
index c31b552fab8fb84be1ed964d68513a42a2ef4577..f23647662ed7a15cf79131da185263ea0499be1b 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-webservices/xplan-inspireplu/Dockerfile b/xplan-webservices/xplan-inspireplu/Dockerfile
index f8bc2ba5d4baeaa68c6eb6f2da35c949f6f3f7d3..a0a295bc1275b5d22383754f79ef2bcd62325011 100644
--- a/xplan-webservices/xplan-inspireplu/Dockerfile
+++ b/xplan-webservices/xplan-inspireplu/Dockerfile
@@ -16,6 +16,10 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.vendor"="lat/lon GmbH" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION"
+ENV TZ=Europe/Berlin \
+ LC_TIME=en_US \
+ LC_ALL=
+
# set environment variables
ENV TOMCAT_ADDITIONAL_ARG_APP="-Dlog4j2.configurationFile=classpath:/log4j2.yaml -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Duser.timezone=Europe/Berlin"
diff --git a/xplan-webservices/xplan-inspireplu/pom.xml b/xplan-webservices/xplan-inspireplu/pom.xml
index cd31ab8bcec939d221cccece8a00a212c15a2378..858aebf92af322c35f4563bac92b3cfe498188d8 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-services-docker/pom.xml b/xplan-webservices/xplan-services-docker/pom.xml
index c78d3672b2df7c81dac506bd22d120b7fdc0980d..5bf8e3a0acfb6fb19280024248a0f1d04cbd2235 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/xplan-webservices/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-validator-wms/pom.xml
index 7aa51b5d967cf3ea06c9e094a367a39d2e03553a..3481214593298ae6c4b52da57b36ae589bdf8704 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wfs/pom.xml b/xplan-webservices/xplan-wfs/pom.xml
index bdc51b1954b6e6fe44a8027c85b528ac6f368bcd..c158ed6f6fba1285f0ea223ee094f76db4f21e47 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wms/pom.xml b/xplan-webservices/xplan-wms/pom.xml
index 870d58ba45fb3aa937854e00211b61b9cfdfedf9..6e05326b384bd94293926402fdc947e83ea3f9ce 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-webservices/xplansyn-wfs/pom.xml b/xplan-webservices/xplansyn-wfs/pom.xml
index 7a40fc2ae24f92050b7c79509e1d601f120cb84a..b822b7b09100896925d76b5f570ed464b1d25a38 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/xplan-workspaces/pom.xml b/xplan-workspaces/pom.xml
index e61b0adf454a356c1b3c92602f8894d4aef42d9a..42c37041e22a4966b758b6b654b8102aacb578f7 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.0.2</version>
+ <version>7.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties b/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties
index 45ae43919eca5acda2de611947ad235e424b351e..a455b1e6398708807f559664ff3ddb3efa33f220 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties
@@ -7,17 +7,17 @@
# 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/>.
+#
+# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
-#Wed Mar 15 10:58:04 CET 2023
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
+#Thu Nov 02 10:41:42 CET 2023
{http\://www.opengis.net/gml/3.2}AbstractCoverage=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.opengis.net/gml/3.2}AbstractDiscreteCoverage=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.opengis.net/gml/3.2}AbstractFeature=epsg\:4326,5.7,47.2,15.1,55.1
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties b/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties
index a997fe365b959f51ad1309085f7a29e0ec8037f0..adfa61259020c210bf5f3f3eeacc6110e18d0ebe 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties
@@ -7,17 +7,17 @@
# 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/>.
+#
+# 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%
-#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
-#Wed Mar 15 10:58:04 CET 2023
+#Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
+#Thu Nov 02 10:41:42 CET 2023
{http\://www.deegree.org/xplanung/1/0}BP_AbgrabungsFlaeche=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.deegree.org/xplanung/1/0}BP_AbstandsFlaeche=epsg\:4326,5.7,47.2,15.1,55.1
{http\://www.deegree.org/xplanung/1/0}BP_AbstandsMass=epsg\:4326,5.7,47.2,15.1,55.1
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml b/xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml
index 4c64cb044971403618179e2cd883f84c6859c3d6..801321f0a05942949410dd9d371c03974361acf5 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml
@@ -1,23 +1,23 @@
<!-- #%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58-->
-<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql https://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
+<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
<JDBCConnId>xplan</JDBCConnId>
<StorageCRS srid="25832" dim="2D">EPSG:25832</StorageCRS>
<GMLSchema>../../appschemas/XPlanGML_Syn/XPlanSyn.xsd</GMLSchema>
@@ -14521,4 +14521,4 @@
<Primitive path="xplan:rechtscharakter" mapping="xplan_rechtscharakter"/>
<Primitive path="xplan:rechtscharakterWert" mapping="xplan_rechtscharakterwert"/>
</FeatureTypeMapping>
-</SQLFeatureStore>
+</SQLFeatureStore>
\ No newline at end of file
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml b/xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml
index 8483652ac62bd54d4cdbe2754503e18e2d957220..8b62efbed6749c0168c334d5518c824d4d87b398 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml
@@ -1,23 +1,23 @@
<!-- #%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58-->
-<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql https://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
+<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
<JDBCConnId>xplan</JDBCConnId>
<StorageCRS srid="25832" dim="2D">EPSG:25832</StorageCRS>
<GMLSchema>../../appschemas/XPlanGML_Syn/XPlanSyn.xsd</GMLSchema>
@@ -14521,4 +14521,4 @@
<Primitive path="xplan:rechtscharakter" mapping="xplan_rechtscharakter"/>
<Primitive path="xplan:rechtscharakterWert" mapping="xplan_rechtscharakterwert"/>
</FeatureTypeMapping>
-</SQLFeatureStore>
+</SQLFeatureStore>
\ No newline at end of file
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml b/xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml
index 3a4d2a4ebe849c701a54f65bde44d3cb07706f07..56a5cd06bb941e9b9a9abe7772001160571f8368 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml
@@ -1,23 +1,23 @@
<!-- #%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58-->
-<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql https://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
+<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
<JDBCConnId>xplan</JDBCConnId>
<StorageCRS srid="25832" dim="2D">EPSG:25832</StorageCRS>
<GMLSchema>../../appschemas/XPlanGML_Syn/XPlanSyn.xsd</GMLSchema>
@@ -14521,4 +14521,4 @@
<Primitive path="xplan:rechtscharakter" mapping="xplan_rechtscharakter"/>
<Primitive path="xplan:rechtscharakterWert" mapping="xplan_rechtscharakterwert"/>
</FeatureTypeMapping>
-</SQLFeatureStore>
+</SQLFeatureStore>
\ No newline at end of file
diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml b/xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml
index 916e254bfc60e3cd00375e1387fd69e3fa9f6fb2..70f08b2562b8621beeceeac8d41dedb01414df6a 100644
--- a/xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml
+++ b/xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml
@@ -1,23 +1,23 @@
<!-- #%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51-->
-<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql https://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
+<SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd" xmlns:xplan="http://www.deegree.org/xplanung/1/0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
<JDBCConnId>xplan</JDBCConnId>
<StorageCRS srid="25832" dim="2D">EPSG:25832</StorageCRS>
<GMLSchema>../../appschemas/XPlanGML_Syn/XPlanSyn.xsd</GMLSchema>
@@ -7976,6 +7976,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:nordwinkel" mapping="xplan_nordwinkel"/>
<Primitive path="xplan:nordwinkelUOM" mapping="xplan_nordwinkeluom"/>
@@ -8181,6 +8182,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:nordwinkel" mapping="xplan_nordwinkel"/>
<Primitive path="xplan:nordwinkelUOM" mapping="xplan_nordwinkeluom"/>
@@ -8345,6 +8347,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:konkretisierung" mapping="xplan_konkretisierung"/>
<Primitive path="xplan:rechtscharakter" mapping="xplan_rechtscharakter"/>
@@ -8739,6 +8742,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:nordwinkel" mapping="xplan_nordwinkel"/>
<Primitive path="xplan:nordwinkelUOM" mapping="xplan_nordwinkeluom"/>
@@ -9051,6 +9055,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:nordwinkel" mapping="xplan_nordwinkel"/>
<Primitive path="xplan:nordwinkelUOM" mapping="xplan_nordwinkeluom"/>
@@ -9358,6 +9363,7 @@
<Primitive path="xplan:referenziertLPObjekt" mapping="xplan_referenziertlpobjekt"/>
<Primitive path="xplan:wirdReferenziertVon" mapping="xplan_wirdreferenziertvon"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
+ <Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
<Primitive path="xplan:nordwinkel" mapping="xplan_nordwinkel"/>
<Primitive path="xplan:nordwinkelUOM" mapping="xplan_nordwinkeluom"/>
@@ -12592,6 +12598,19 @@
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
<Primitive path="xplan:sonstRechtscharakter" mapping="xplan_sonstrechtscharakter"/>
<Primitive path="xplan:sonstRechtscharakterWert" mapping="xplan_sonstrechtscharakterwert"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -12724,6 +12743,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -12781,6 +12813,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -12838,6 +12883,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -12898,6 +12956,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:gemeinde" mapping="xplan_gemeinde"/>
@@ -12958,6 +13029,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13008,6 +13092,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13058,6 +13155,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:textSchluessel" mapping="xplan_textschluessel"/>
<Primitive path="xplan:textSchluesselBegruendung" mapping="xplan_textschluesselbegruendung"/>
@@ -13108,6 +13218,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:textSchluessel" mapping="xplan_textschluessel"/>
<Primitive path="xplan:textSchluesselBegruendung" mapping="xplan_textschluesselbegruendung"/>
@@ -13154,6 +13277,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13212,6 +13348,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Primitive path="xplan:textSchluessel" mapping="xplan_textschluessel"/>
<Primitive path="xplan:textSchluesselBegruendung" mapping="xplan_textschluesselbegruendung"/>
<Primitive path="xplan:rechtsverbindlich" mapping="xplan_rechtsverbindlich"/>
@@ -13344,6 +13493,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13518,6 +13680,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13583,6 +13758,19 @@
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
<Primitive path="xplan:sonstRechtscharakter" mapping="xplan_sonstrechtscharakter"/>
<Primitive path="xplan:sonstRechtscharakterWert" mapping="xplan_sonstrechtscharakterwert"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:art" mapping="xplan_art"/>
@@ -13623,6 +13811,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13686,6 +13887,19 @@
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
<Primitive path="xplan:sonstRechtscharakter" mapping="xplan_sonstrechtscharakter"/>
<Primitive path="xplan:sonstRechtscharakterWert" mapping="xplan_sonstrechtscharakterwert"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13879,6 +14093,19 @@
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
<Primitive path="xplan:sonstRechtscharakter" mapping="xplan_sonstrechtscharakter"/>
<Primitive path="xplan:sonstRechtscharakterWert" mapping="xplan_sonstrechtscharakterwert"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
</FeatureTypeMapping>
@@ -13912,6 +14139,19 @@
<Primitive path="xplan:endeBedingung" mapping="xplan_endebedingung"/>
<Primitive path="xplan:aufschrift" mapping="xplan_aufschrift"/>
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -13976,6 +14216,19 @@
<Primitive path="xplan:refTextInhalt" mapping="xplan_reftextinhalt"/>
<Primitive path="xplan:sonstRechtscharakter" mapping="xplan_sonstrechtscharakter"/>
<Primitive path="xplan:sonstRechtscharakterWert" mapping="xplan_sonstrechtscharakterwert"/>
+ <Primitive path="xplan:vonGenehmigungAusgenommen" mapping="xplan_vongenehmigungausgenommen"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPFlaeche" mapping="xplan_wirdausgeglichendurchfpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchFPSPE" mapping="xplan_wirdausgeglichendurchfpspe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPFlaeche" mapping="xplan_wirdausgeglichendurchbpflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPABE" mapping="xplan_wirdausgeglichendurchbpabe"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEMassnahme" mapping="xplan_wirdausgeglichendurchbpspemassnahme"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPSPEFlaeche" mapping="xplan_wirdausgeglichendurchbpspeflaeche"/>
+ <Primitive path="xplan:wirdAusgeglichenDurchBPMassnahme" mapping="xplan_wirdausgeglichendurchbpmassnahme"/>
+ <Primitive path="xplan:laermkontingent" mapping="xplan_laermkontingent"/>
+ <Primitive path="xplan:laermkontingentGebiet" mapping="xplan_laermkontingentgebiet"/>
+ <Primitive path="xplan:zusatzkontingent" mapping="xplan_zusatzkontingent"/>
+ <Primitive path="xplan:zusatzkontingentFlaeche" mapping="xplan_zusatzkontingentflaeche"/>
+ <Primitive path="xplan:richtungssektorGrenze" mapping="xplan_richtungssektorgrenze"/>
<Geometry path="xplan:position" mapping="xplan_position"/>
<Primitive path="xplan:flaechenschluss" mapping="xplan_flaechenschluss"/>
<Primitive path="xplan:flussrichtung" mapping="xplan_flussrichtung"/>
@@ -14268,4 +14521,4 @@
<Primitive path="xplan:rechtscharakter" mapping="xplan_rechtscharakter"/>
<Primitive path="xplan:rechtscharakterWert" mapping="xplan_rechtscharakterwert"/>
</FeatureTypeMapping>
-</SQLFeatureStore>
+</SQLFeatureStore>
\ No newline at end of file
diff --git a/xplan-workspaces/src/main/workspace/layers/bplan.xml b/xplan-workspaces/src/main/workspace/layers/bplan.xml
index 7c3e7c36abeb74ba68b407fdb865a70422c70639..b129b8d8dc5a9da35d3535aa70a548b5c185bb80 100644
--- a/xplan-workspaces/src/main/workspace/layers/bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/bplanarchive.xml
index 95b8e979a397b2f718d0438f864bd8c3265b0fd3..116a17ef7dc980bf561721f95499b458e5fb58bf 100644
--- a/xplan-workspaces/src/main/workspace/layers/bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/bplanpre.xml
index 17a4fb48461fa74037133511b667f497b795dd90..5c16bb25ac7c04c02e28bbeb9fff678ba450987d 100644
--- a/xplan-workspaces/src/main/workspace/layers/bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/bplanpre.xml
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ #L%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/fplan.xml b/xplan-workspaces/src/main/workspace/layers/fplan.xml
index 4618714db18cba2e25fc1db1484280d9efe0a4c9..50af195fba481c679a572def4cc872dc5294b3c3 100644
--- a/xplan-workspaces/src/main/workspace/layers/fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/fplanarchive.xml
index 4ac2c8eba8be6ec8bf41747492f667a287a3be10..12b13eb372d9cf140ff7bd8a8836ded93518e445 100644
--- a/xplan-workspaces/src/main/workspace/layers/fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/fplanpre.xml
index ad4eaeb8ace975686ced9aa6801da96fa55e51a2..1c63837fd7573beb56d44e6732d8b37b18de9843 100644
--- a/xplan-workspaces/src/main/workspace/layers/fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/lplan.xml b/xplan-workspaces/src/main/workspace/layers/lplan.xml
index ce95867d2e6b0749bf33cc55526e8370cdd27c46..b215f676f52cab0a0319a25cf1677884a89b31bf 100644
--- a/xplan-workspaces/src/main/workspace/layers/lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/lplanarchive.xml
index 117f35a174c9da5fa480d88fb19f9e48afae49ea..bc562d0fc6ce593fe216097a9f1994857d0bedf8 100644
--- a/xplan-workspaces/src/main/workspace/layers/lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/lplanpre.xml
index 4b85effc10cf448afeafc03034e874d2ca87e215..0b3bcf9a125169a06d52ea053a40b12887643b01 100644
--- a/xplan-workspaces/src/main/workspace/layers/lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml
index e927abc9babd05b455a205649f5efa281a9fdbce..0411e668b212030f481c924d3aa2b7513a809ea8 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml
index 71a81748de20b1a7ea98cdd4e2911741cde96301..c459d71657cd8bc31d0181cb43efb9f955dee440 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml
index 368cc9df551e6630970d03ed86e5b6c5a5f99bc0..8f3a743d4c5d8558dc1a680d4dab9e987f0a82be 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml
index 667f80b7e433944b2efe31c81431390ab383347e..ffaacf30c87b2cffa3a6c294461e28cac7b52d31 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml
index d4237c9a6c56512d6f45526b1e0a26ebdf37b3a4..019c04f0a94fd18a0b043d757124f012144c815a 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml
index 185d12a32411632d4b022eb0cd08cca98bd3477d..0ba4d0119be6713059978b2d4480b2f90ebd5bca 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml
index 83e1c50d883853b274d3ec1f39dc061a1dfbb4a0..223333a05b9c6c8c4fc404dd1696f8a95b1c8f98 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml
index a090d60524fd62866a9b4492d348e36215ba0600..9e8fc1215fe6d07ca53b41b1bfadbba801367e6a 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml
index 88d48bee5ca5d0e7aec688a86ebbbcc514b4d104..f4d80d6fde034b2087aed58816151a6c39e1b4f4 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml
index 191f09a69092c09b21273e42d5b739c1c5fde3c9..61c9a89c79785e664f0a19b350bc099607796050 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml
index 1945fb513b51fce22b6a6257ca75685149cba2e2..03bd3c8f6117e749e965d6f22c65efc710006b67 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml
index 2ffd0cca60f194985c3e2572e425b057c64f9431..0f3bd2072a94fb56b24430a4116400491d7253b2 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml
index 15f34c47d3977cd1bee8dc83b783953d3cdfe6ee..9a2e4ed755d48214b95aee5348b4f833d87a73ea 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml
index 8a4d675fac6345793aa09c776a5394c4d37896d2..489b7b3db88e856ea686f1c04b3355000c24014c 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml
index 377f5c4fec00a609e447d2eb53316e763a3df842..b66fe320c3591ac50baf24dca8c47437b6b671b6 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml
index 123ffee6bc4626f2b67b876cefcd06adaf8c8544..5e5a3532f3a8b14bca12dcfcc4b748a236dab57f 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml
index d9f67abf69033961c039f692ee4bfe1adc53e18e..5c4b4df774311c2a23220eaa60af20b52bbd5c07 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml
index e3125b399d1364c8b4af7c004a9bef67bdd55c99..cf906fedd1421a473e424b39671307bae00b1ca6 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml
index 2d67a1df3e04fac3fa95e690c00ab4f38676d358..5c4c5f8239aff722a83838185337abc2fa9a37e7 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml
index e8baeccf921b873786c03a77c773a64d3895e355..35b61cacb79c7b52edd85b50fc24a2fedc9aa9a5 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml
index 8fa3903665d30b135142d3f31138f22f8616a28d..38b830c61c413f02099ac61ace8d7fb189284eaf 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml
index b5f710f8ebfa6be3e288e7da10879d566dd933c8..04fa1834b3b30c7eb1bd141f9eb404e65055534b 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml
index 4c5ae01d1b88cc2e71736ac1ee845ca509074de2..13c6dae121fe3e31a436640011ea3776de76ebde 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml
index a3e365704dd9ff813e1900fbb17ad796fc8fdd51..dc04bfc529bb7db33ea78a199f8ba6dd07147935 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml
index 47342782fbfc8c62408e5ca587c90b5c7bdbf45e..2c575ce0ca97bb382bb99c754e167ec3b3518ca6 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml
index 64c160178c760de563f3b9de439d7f022fe30053..8a57b44097cf3c5b883bdfe5425e0145b5c35df8 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml
index f99bd6a82b72c9fc562755162c3bff38b436db0b..d17efdb907114515d1179bdab52429c51fae1367 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml
index 8346108cd48fcc8b26ab57994bf008928481bf6e..afd8f728abb3e394ae9b82b76da88f2895ab481f 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml
index 6519c31b98c3e796055112588d6b16f46575c081..f9a82983893ee26b6c53da455d1e0fe015738f94 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml
index 4ec6834c910d3af1f333be322014c61d894b2142..65bf0a8c07c0e4d7321750ed03fb02050c848f98 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml
index 71a634992b6acf53bd064b358a4e511052f63049..2fca054dbe3ba781cab10a3418443ccdd27c40cf 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml
index 7f408e4e94e711de8da522260864fda15d16229b..6acd069140eac8cc277674167d3cd88ab021c02d 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml
index 6162bdf7c99874050854b5e4a63edc85f72dd176..051f39fab04fde873bbbd004c8d8e029666a428f 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml
index 58495a8e87662214059eb6c98666911ac86ceb6c..f80c4eea3098492b15fbf8c34bc46cde88d38db2 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml
index 75395d9e656a80663a8bac17fb2028a03a194cbc..a158e634602194c2fca884b278aa2685313ba839 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml
index 5f6d5c47f0cd3c26857eb3644181b64e28ad9de1..6059028d97b6d905693c82e9ad02ecf42889840a 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml
index 0f0709bc75240f40433af76828844ba4df514056..e7f3d2f128b63a2e08463ce54e72ff45d896dd85 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml
index b6f82378c70e2c2a49482cfd08a2a88249d15a15..d85be79c7a05f06f97cee222a418f1430fab6ad0 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml
index 2261948cdeacebca20133153b3e4a1029639a7fa..7ac2c8a74e82d0595a2b7b1f38330e9cf2176361 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml
index f3c724908d69dc92dfc77095933425b86d340bc6..77988760cb50448b69de284a44706e464d52c211 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml
index f48e7078cca45de39f179f19f8025ec9ca1150a6..91d69bda2057b72aa297c6a14185d1a374e902cc 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml
index c873d96c4d4c2ccbc7ae2dfcc44080cc8761e5ef..298638e7592f44716d761f478484a8acc4b0a6b5 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml
index 537910c8c9e184c7a33e89a3f3c233743e220ddc..f57ebacb742c863e5a8acff56cdc5f00015624d9 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml
index 1fd66eaea4c437875492cc7827307875a561bd33..fde658eb4789eef52abb1b3fd8936157f15a5b2a 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml
index 8e3401877455acea5831e1e29d86c83b42965ac3..31c46146f8c2eb9514173fcd298b615535fd0398 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml
index 08b43966a300966581207882ec71d3c18977870d..e0c178108d9cfda31e5b4bbf51557e631158733c 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml
index 12d812767de4d43b1e1ef1e6abd01477f50dee60..cb0b8031782cbca374182b5d7818cd2245dd317c 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml
index b5c9ab3f50618070d25ade8cd8aec135aa13db9a..57b4966255efe718c11f6b5028201ef041423ec8 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml
index 9201d9f699fa53a0793f20cc41c5bd1bc90a0417..cbc1e586039cd6915c900e539bf451511b1fc0d6 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml
index 363167a2836e0cfa90287b8d9e6d6579366f7a9b..ddfa5ce6a9e6520313da9cfe2d83f9e9de93b6ea 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml
index 489cf98812b9e69a819238b17a1ddba4648535be..48a3401074c831c7af9a9b081f5c64858a474958 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml
index ab0576b1d7dd517fe1f2f78cb8600e61e5707ddf..d14578794a814f30339f16fba98e287a8e003e19 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml
index 9b5fe08368a1b1cedc108adfb27de419b83ce265..c0000b13e83533df8f6def25b94e541077027b6f 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml
index 9740cae60969ee613be012aa59e7b0e2a6fdc076..d4c11d6bb1c98fc0c3efdde37b52e149ae0dbd09 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml
index 01edaf99834efa7e27df92dddb3a1f1eb71f97e9..9d898e678c106284271dd8fcd1ccd6687861206e 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml
index 78dc731af5de4deccf8793273fcd1cc67ce1129f..b990742523aef0340ec417c3968b57e2caaea95c 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml
index 929cc9abeb38c152ff7bc441f09034deb86f4fc5..90dad480b7d69faa2809bdd99349e5ac5895d309 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml
index bdc2ccf4bba4e3023443b77a9b3277720b87a0f1..82ab210791ad8fb039a55bb20a3a4f1cde2796f3 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml
index 6d6e85df15f80e73bab029960ee07a2c7da7081b..3386fe996fccc64a96ff75439b41fb32d029ab80 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml
index 683b7679ed417ec81e43a75912fc0903dbb277b0..49206601ac38d6584497b797abd07709b5fc1bd9 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml
index f9d902ad6ade4889aae6e628d7e4c520fcce6278..67379c255c321cd4988cb90a44ce7c447b698ed0 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml
index 871f7f3a49d9d4827d3ae271f4ce2ea6353f42ac..4f260533761d3d9d33d9ee5d2ddaa63b632b58a7 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml
index ccf79b7c2de5bd4aabd733efb53d1fac7405380c..78bd042b6d01f55e673c1cbb62c8d680be3a2ce0 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml
index 482f0ddad7448227fd504c39c3638e781d5b8e89..99cf9849724c2a667efc109649a50224f70a8a7e 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml
index 04a44b29356b9e8b5b2ef585cbc630a28643f34b..1f37a7e150c9f0e42ee067d1e71e0a955a284c6f 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml
index 38593924527a524870cd57fc5436e38653baa752..db3f541b3a7fc99c623c4b7311625a824f9e654d 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml
index c75d866c70d2935a6f4e02993c42a22d511a9a9f..a933e2bc84a3c79dfe6bead8de81546019d5cfe1 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml
index 79ce6881c4ccd54834cc26855e54d3a2a58ebfd4..abe42da2022c0acf5e82c7c22137f2d4ee9bafb7 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml
index d197ef87a2debd6b730f24f1ae6a6e605934c0bd..5cad0068cfbb742fcf023c49824531b2cc97be32 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml
index 28f768a375a83452b0bafea51f3ebf80405c17b3..2a9892e050aa6735f003241323dcf7ec9e723688 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml
index f92fd6292830a9ee17bd98ccebd870663674b4e2..207d80f0b1ee11fd68101ecbb0be8497d5acf984 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml
index 50dbad0f5dbbeb13d80780f93598a777de33e560..b43d2801fed19ae1847748767292ef79a4cc8326 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml
index e9e8e85704aca72d34a376ec3a6baf4570508872..8619fc18f159095647343825acf22a078a8bd9c8 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml
index 0bcbd4fcb8318bb9487aa7dbade3444a9afbfcec..10226875899486ab2f415e63d10712d623b80a8d 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml
index eaadf360fd6287a94c2a089b8d4d68a1aa6113cf..83edcf86046cb5d92070ae12255bd67f9a525f62 100644
--- a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/rplan.xml b/xplan-workspaces/src/main/workspace/layers/rplan.xml
index f2836ef0a6fb234e43590720fb836c64446cf00b..9001d8608f32c87e8c2cffd53b73ac917a0d1d05 100644
--- a/xplan-workspaces/src/main/workspace/layers/rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/rplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/rplanarchive.xml
index fbafc059f8bb2119b400e3a935db6d2583754362..f358f251156d34e9d2bccbe336d227829b42f402 100644
--- a/xplan-workspaces/src/main/workspace/layers/rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/rplanpre.xml b/xplan-workspaces/src/main/workspace/layers/rplanpre.xml
index cfdb527a8f754239057f966217515feead76a938..3f4fce554a23c98a38454ab955ae85422b82bf9e 100644
--- a/xplan-workspaces/src/main/workspace/layers/rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/soplan.xml b/xplan-workspaces/src/main/workspace/layers/soplan.xml
index 3bf255b01a9727f307a45fa3f76bec5776e2b07b..44d18c37a7b61e8de6620a1779d77a6fbed152f5 100644
--- a/xplan-workspaces/src/main/workspace/layers/soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansyn</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/soplanarchive.xml b/xplan-workspaces/src/main/workspace/layers/soplanarchive.xml
index aeb5126f4690f093125b08447f2d45dac1e5f299..e4fb9ba7e16904fd4e65dc7b1e6b41aa7f245f92 100644
--- a/xplan-workspaces/src/main/workspace/layers/soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/layers/soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynarchive</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/soplanpre.xml b/xplan-workspaces/src/main/workspace/layers/soplanpre.xml
index 3186fcb46ee9963d9c99eec117abcbc46f9a3992..480acb593f3566a59293ac1dfd02019ad974cfc7 100644
--- a/xplan-workspaces/src/main/workspace/layers/soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/layers/soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplansynpre</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml
index 5f4652221203babd2034f7bd28efbe5a25ab2c83..a4e9f19851d324bf8ce7eb26138ed4914ddba0bd 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml
index 041f9396eb53918c7ca7197150a8fd596bd9602d..f574f4fa345827bbed7fe8bc4bbfe688928839b3 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml
index accec0b71090eab058b44953ba4b8343ae123dd5..d76d4fa280d230906d7eaa6673be764b1793a30f 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml
index 2089509f1213acfe7fb33b3d4b3254a97453c9f8..a9ae13420acd818d04ac8b1df2581d20a4727ac6 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml
index 80592ca5ea538e1a33583f2174ca2e278b7f591e..879d835dcefbe400c1e7c299cfd12457aa371f64 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml
index df05ec1b8d4b82b8c29f9ea0400911e13593f035..085863c068ecd438695392ac9ec0510491a8c7be 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml
index c5a57b3d0048f2275d91e412d093abb6cae625be..a07a0cb831760ae57479a75429a16040aaf38348 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml
index 56d641f1dcc39b348cbf79fc9478ee70c63d241b..10a794c43cddc0220fa870f6751fa4bcab62dfb9 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml
index b40d73a5b1c674ecbb57e81804fd2c3bd0f13dc6..b11050846cc99f69f465dddcb211998560a00a14 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml
index 81f9fbc4bee5d0391b8ca1eb56fa5e569e386876..0a410c207ed7e2686167b8a2479a4226a246cd49 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml
index 5322af04e02bcf7bf014bea25d47bdf1a9d2b6f1..61d4dc8a8cee091631101500015c4309c078e513 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml
index f3e3ef82e21fce3858a02afe26a933ef679e357f..fd535d156f9f5f1084f2b5794d1525bcd4be49a3 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml
index d37fbd718d0868148217998889e0df63673b2d9f..17fc5829ed3cbca4b4b36a9e7f560ba41220f303 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml
index a9a3f45f725c127b9b178fb3733147d03a711289..dcb523920457861f14e46e9fed17dd0641fd1c6b 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml
index d91bef571798858ea47352dddb9c29d5ee59c34f..6e06134ca4066b8f59b07e655cf790d23b98a476 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml
index 8f85a07194f832d4a6c1a64e05d96d9455b51b6d..d1e5859d591359c4e929354bc9b5a13a3291fe11 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml
index 25b468ec8f6b370528bbc650bf5edc75437288b2..e4ca23fd1e0718a59c2f4bffa6ded16650c5ba48 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml
index a341c69f8d667a36edf0a79f52a24ceb9c17aeeb..01e51a6a1ec7228253fdc5ee141fd71dc2d7f508 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml
index 4820ac5cd5c7bd5ba153557040a0c6dd03f728b9..b6965965a65c13fe8e4776fa32bc42fff0bcd692 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml
index 48f7313efb4e1a0db6b80fade47da73cdacaf8a7..d53ff8580a2bf0c7070b42289033b3bb8c548289 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml
index 2d2b7b1b3c7a7266c21c0a7ef0e48c02500b801c..2b63c7c05cf7f0d813aa6369ee067da2906ed3b5 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml
index ddd14129b9e682fdf6259c30775475a5b65dfd04..acaebd517180f933ec021408f69712e33617c091 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml
index 12b80ec0789ae8a913871b3d1e45df4df16bd74f..a330db2eabcaf24f65e6d508370f64cdec25caf0 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml
index 49188eb4228d2740b7279f3c41fd4fb0c51e9950..a0c40b1dc05e1679f72984c95a61a610a12c4259 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml
index 6e62d3988cf47679131f200326fd98d71d583a58..6dbadf247d4e29316954acd1da0ada9a5991a32b 100644
--- a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml
+++ b/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<FeatureStoreId>xplanvalidator</FeatureStoreId>
diff --git a/xplan-workspaces/src/main/workspace/services/html.gfi b/xplan-workspaces/src/main/workspace/services/html.gfi
index 23cc7c98992aedc90e9394a2292797d757608021..19eefa64ccc5e46e5f6b6ef3394af5358fecff05 100644
--- a/xplan-workspaces/src/main/workspace/services/html.gfi
+++ b/xplan-workspaces/src/main/workspace/services/html.gfi
@@ -9,17 +9,17 @@
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%
-->
-<!-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58 -->
+<!-- Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35 -->
<html>
<head>
<title>XPlanWMS Sachdatenanzeige</title>
diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml b/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml
index 2664780557747dd3781f7ab05f1cab33fc35a4cf..6540d4dc1ee2bca2bda03505f96d5bcf2fe539a9 100644
--- a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml
+++ b/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml
@@ -1,22 +1,22 @@
<!-- #%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%-->
-<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58-->
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%-->
+<!--Diese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35-->
<wfs:StoredQueryDefinition xmlns:wfs="http://www.opengis.net/wfs/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd" id="urn:ogc:def:query:OGC-WFS::PlanName">
<wfs:Title>planName</wfs:Title>
<wfs:Abstract>Es koennen alle zu dem PlanNamen gehoerenden Features im XPlanSyn-Schema heruntergeladen werden.</wfs:Abstract>
@@ -6941,4 +6941,4 @@
</fes:Filter>
</wfs:Query>
</wfs:QueryExpressionText>
-</wfs:StoredQueryDefinition>
+</wfs:StoredQueryDefinition>
\ No newline at end of file
diff --git a/xplan-workspaces/src/main/workspace/themes/bplan.xml b/xplan-workspaces/src/main/workspace/themes/bplan.xml
index f089d96c13c7af2761581ba11faa5f924eb5e24f..5ab4594230f5f45b80546bd6eef78412165b4cf1 100644
--- a/xplan-workspaces/src/main/workspace/themes/bplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>bplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/bplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/bplanarchive.xml
index aa92ddbc8cb1160142714a6c7fc6052c5287b722..3f311238bebf1f1589f416957fb36436e2b5ff97 100644
--- a/xplan-workspaces/src/main/workspace/themes/bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>bplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/bplanpre.xml b/xplan-workspaces/src/main/workspace/themes/bplanpre.xml
index f7675da4aa0e1e263d5bdeefa8bc61d71ddce780..71ec1664409cbbd353729545bcc0b7825dd8f78a 100644
--- a/xplan-workspaces/src/main/workspace/themes/bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>bplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/fplan.xml b/xplan-workspaces/src/main/workspace/themes/fplan.xml
index b3b711657b7696446aff2b3be20a71f71623d66e..c8ae7c8005d6b7d5b7ebb2b8e585de18b614b9a1 100644
--- a/xplan-workspaces/src/main/workspace/themes/fplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>fplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/fplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/fplanarchive.xml
index 14ccecfd3acf6e209a66dfcb5d5a1e30f0903b75..9bcba2c0c4e7c880f99c15282d5bf9b7754bfe3c 100644
--- a/xplan-workspaces/src/main/workspace/themes/fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>fplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/fplanpre.xml b/xplan-workspaces/src/main/workspace/themes/fplanpre.xml
index 6de87305dcc46c47b597c50b05ea02834998d0b8..b0a3757d972b0545fc8ff2efc29b47afba560652 100644
--- a/xplan-workspaces/src/main/workspace/themes/fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>fplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/lplan.xml b/xplan-workspaces/src/main/workspace/themes/lplan.xml
index 29f6febc543b8e66b787c4dafae07995025ef2d7..8bb082cb27224fa58f2d72bcb4a66e8045232b83 100644
--- a/xplan-workspaces/src/main/workspace/themes/lplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>lplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/lplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/lplanarchive.xml
index 10572cd254b46ef272eed0d2fdee81b1c758d755..518fc72ab1ac89b62bcd5682874a5494df83b0eb 100644
--- a/xplan-workspaces/src/main/workspace/themes/lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>lplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/lplanpre.xml b/xplan-workspaces/src/main/workspace/themes/lplanpre.xml
index de8f0f0fbef35d2c94d3b9f6dd0b7dd0238c123d..6913c17903f7c0b52e4178d26b456e9ef133f40e 100644
--- a/xplan-workspaces/src/main/workspace/themes/lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>lplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml
index 514e206739592cefa3ca13162b2ba728bb919999..83ed3321bff5479e5310b3f0ff23d964a79d139a 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/bp-soplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml
index f37b458f6f20e1a5eeb72731aa93cd37f55a33d7..d0691e8069075d881d93ba9f6ebd8c045256e34d 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/bp-bplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml
index 0db4b973db474b06c4aa7d02a024e42e31785fb2..61301a1bde114f8f2b3158406391d92785c519ef 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/bp-soplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml
index 92117cfa8975c46128a741dd6ff88f89a5f06529..3d198f49eebbda3c56d2801d05790b35686fde3f 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/fp-lplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml
index 6d89b0447fc719058c12e65d96e218d53a9251d5..a842932fd5d4c20a6c69e27eb8f2ef9bf1806330 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/fp-fplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml
index f738fc8f5d4319e6750d73d517e2df11e7b2cf9a..7f806f1a662af6607636f25c97a8c94900f19af6 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/fp-bplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml
index a941a86ef28f710d13127f209bd438773a85d00c..ea14a4d2e57dc432cf8e7de3c49ff03ba27df3db 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/lp-fplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml
index cc447542c909de77715cde1fefa990018035c53a..b4c2a3580d3427dd6d0677aa4d15193fed5b6911 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/lp-lplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml
index 02906a638ce5ec75c5f5ef020eb7b162c701b942..cb561711ef44a6ef4dc0a9a01c9c937c94371be6 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/lp-fplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml
index 7bcfcc9c9c6c7589361cfc586e95769a0ee80da2..1b813322dac77331f6914e786f82b30e1579405a 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/rp-lplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml
index 0a7dc2dc372b506eb2b436a751dade80d5b7dab4..7414eb48c875243953ce39975a244bb0b9264dd7 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/rp-lplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml
index 877142f927040bc75017ba89cd01ed36258a9e03..383cefb952f0c12851fd70d3ae126c4588a2f505 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/rp-rplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml
index d52de4af9c9ccc0245c1bf6b9daba4d20a9c1a93..1c3ffd6fe79381e126ab0fe7aca7ea21bb90302a 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/so-soplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml
index 324ac00ec429a35f2c6db62450539aece21b2b69..bfa800f99763b38640ee5247a8c2eae929f65888 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/so-soplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml
index cfca89bcb466271985306c53a057116eee533258..ab757404d8a4e36a8be03fe267a57e5e544c539e 100644
--- a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>planart-wms/so-soplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/rplan.xml b/xplan-workspaces/src/main/workspace/themes/rplan.xml
index 590d0ccc891dc70cad5973d03a1d782a5e9b5ad2..ce028236170f01d49b6571aa8a743b4c2947bb3a 100644
--- a/xplan-workspaces/src/main/workspace/themes/rplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>rplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/rplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/rplanarchive.xml
index 725bfc05ad091e4abb33c0456a8754e57d29e976..c4eff3df0a59a348d60886a962b615c89cbd45af 100644
--- a/xplan-workspaces/src/main/workspace/themes/rplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/rplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>rplanarchive</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/rplanpre.xml b/xplan-workspaces/src/main/workspace/themes/rplanpre.xml
index 7d9fbcce7d926bfa65b5c26d084f3eeb3a4e7305..fceb9ddba323e7b4cb226b42e280594fc4f82eb2 100644
--- a/xplan-workspaces/src/main/workspace/themes/rplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/rplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>rplanpre</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/soplan.xml b/xplan-workspaces/src/main/workspace/themes/soplan.xml
index f5cf531302aba85adb29c8ef0e97308215c422d2..78b267971fb339173ab78600c9af29a587f802e4 100644
--- a/xplan-workspaces/src/main/workspace/themes/soplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>soplan</LayerStoreId>
@@ -218,13 +218,13 @@
<s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
<Layer>so_xp_pto</Layer>
</Theme>
- <Theme>
- <Identifier>so_plan</Identifier>
- <d:Title>SO Plan</d:Title>
- <d:Abstract>SO_Plan</d:Abstract>
- <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
- <Layer>so_plan</Layer>
- </Theme>
+ </Theme>
+ <Theme>
+ <Identifier>so_plan</Identifier>
+ <d:Title>SO Plan</d:Title>
+ <d:Abstract>SO_Plan</d:Abstract>
+ <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
+ <Layer>so_plan</Layer>
</Theme>
</Theme>
</Themes>
diff --git a/xplan-workspaces/src/main/workspace/themes/soplanarchive.xml b/xplan-workspaces/src/main/workspace/themes/soplanarchive.xml
index d3c344f62e53360a8d608b1297565f53940736e0..6a136911dffc974f2b0f38eb2236ceac317b5ca4 100644
--- a/xplan-workspaces/src/main/workspace/themes/soplanarchive.xml
+++ b/xplan-workspaces/src/main/workspace/themes/soplanarchive.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>soplanarchive</LayerStoreId>
@@ -218,13 +218,13 @@
<s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
<Layer>so_xp_pto</Layer>
</Theme>
- <Theme>
- <Identifier>so_plan</Identifier>
- <d:Title>SO Plan</d:Title>
- <d:Abstract>SO_Plan</d:Abstract>
- <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
- <Layer>so_plan</Layer>
- </Theme>
+ </Theme>
+ <Theme>
+ <Identifier>so_plan</Identifier>
+ <d:Title>SO Plan</d:Title>
+ <d:Abstract>SO_Plan</d:Abstract>
+ <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
+ <Layer>so_plan</Layer>
</Theme>
</Theme>
</Themes>
diff --git a/xplan-workspaces/src/main/workspace/themes/soplanpre.xml b/xplan-workspaces/src/main/workspace/themes/soplanpre.xml
index c5fdf527584137fc0cce461514b9bb3efcf489a8..00ae753f2e75bd6f413551178dffb7e88718a2b8 100644
--- a/xplan-workspaces/src/main/workspace/themes/soplanpre.xml
+++ b/xplan-workspaces/src/main/workspace/themes/soplanpre.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>soplanpre</LayerStoreId>
@@ -218,13 +218,13 @@
<s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
<Layer>so_xp_pto</Layer>
</Theme>
- <Theme>
- <Identifier>so_plan</Identifier>
- <d:Title>SO Plan</d:Title>
- <d:Abstract>SO_Plan</d:Abstract>
- <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
- <Layer>so_plan</Layer>
- </Theme>
+ </Theme>
+ <Theme>
+ <Identifier>so_plan</Identifier>
+ <d:Title>SO Plan</d:Title>
+ <d:Abstract>SO_Plan</d:Abstract>
+ <s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839</s:CRS>
+ <Layer>so_plan</Layer>
</Theme>
</Theme>
</Themes>
diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml
index ada69fcc70ad47a9e0a4dad86d9c94dca41d9dec..68b3003377948cbcce1ae3c1471b498f6a49f219 100644
--- a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 13.03.2023, 06:24:51
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>bplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml
index 66c07405590a3a84f98728c5c519a4c132743e43..32f7fef4c1ab9b70bae72e9868aed90a508b94a9 100644
--- a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>rplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml
index 6633e1fcd6e8ffc9379120b5132af5588f50c032..a5f224a8c6c6386ac1d2700f41458729ae397f47 100644
--- a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>lplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml
index aae805b0e055815134aad361f34ff174a10faf42..626bea4553bc0f6ca9cfc164b0a3adf1785b045c 100644
--- a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>rplan</LayerStoreId>
diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml
index c9e74029d4ad2d6223a2abb31787b8f17fc599c1..d426c24d96a3041b921e30ce4f44b05cba1eb089 100644
--- a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml
+++ b/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
#%L
- xplanbox-syn - Automatisiert erzeugte Konfiguration
- %%
- Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
- %%
- This program is free software: you can redistribute it and/or modify
- 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 15.03.2023, 10:57:58
+ xplanbox-syn - Automatisiert erzeugte Konfiguration
+ %%
+ Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH
+ %%
+ This program is free software: you can redistribute it and/or modify
+ 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%/nDiese Datei wird automatisiert generiert! Aenderungen sollten nicht manuell vorgenommen werden! Datei wurde generiert am 02.11.2023, 10:41:35
-->
<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial">
<LayerStoreId>soplan</LayerStoreId>